diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml
index 3fe205d..793ae46 100644
--- a/Modules/Settings/SettingsPanel.qml
+++ b/Modules/Settings/SettingsPanel.qml
@@ -10,11 +10,11 @@ import qs.Widgets
 NLoader {
   id: root
 
-  readonly property real scaling: Scaling.scale(screen)
-
   content: Component {
     NPanel {
       id: panel
+      
+      readonly property real scaling: Scaling.scale(screen)
 
       WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
 
diff --git a/Modules/Settings/Tabs/Misc.qml b/Modules/Settings/Tabs/Misc.qml
index f99cdfa..6b98781 100644
--- a/Modules/Settings/Tabs/Misc.qml
+++ b/Modules/Settings/Tabs/Misc.qml
@@ -14,8 +14,7 @@ ColumnLayout {
 
     Layout.fillWidth: true
     Layout.fillHeight: true
-    padding: 16
-    rightPadding: 12
+    padding: Style.marginMedium * scaling
     clip: true
     ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
     ScrollBar.vertical.policy: ScrollBar.AsNeeded
@@ -30,37 +29,26 @@ ColumnLayout {
       }
 
       ColumnLayout {
-        spacing: 4
+        spacing: Style.marginLarge * scaling
         Layout.fillWidth: true
 
         NText {
           text: "Miscellaneous Settings"
-          font.pointSize: 18
+          font.pointSize: Style.fontSizeXL * scaling
           font.weight: Style.fontWeightBold
           color: Colors.textPrimary
-          Layout.bottomMargin: 8
+          Layout.bottomMargin: Style.marginSmall * scaling
         }
 
         // Audio Visualizer section
-        ColumnLayout {
-          spacing: 8
-          Layout.fillWidth: true
-          Layout.topMargin: 8
-
-          NText {
-            text: "Audio Visualizer"
-            font.pointSize: 13
-            font.weight: Style.fontWeightBold
-            color: Colors.textPrimary
-          }
-
-          NComboBox {
-            optionsKeys: ["radial", "bars", "wave"]
-            optionsLabels: ["Radial", "Bars", "Wave"]
-            currentKey: Settings.data.audioVisualizer.type
-            onSelected: function (key) {
-              Settings.data.audioVisualizer.type = key
-            }
+        NComboBox {
+          label: "Audio Visualizer"
+          description: "Choose a visualization type"
+          optionsKeys: ["radial", "bars", "wave"]
+          optionsLabels: ["Radial", "Bars", "Wave"]
+          currentKey: Settings.data.audioVisualizer.type
+          onSelected: function (key) {
+            Settings.data.audioVisualizer.type = key
           }
         }
       }
diff --git a/Modules/Settings/Tabs/Wallpaper.qml b/Modules/Settings/Tabs/Wallpaper.qml
index 7b57eb7..f5f92d2 100644
--- a/Modules/Settings/Tabs/Wallpaper.qml
+++ b/Modules/Settings/Tabs/Wallpaper.qml
@@ -29,7 +29,7 @@ ColumnLayout {
       }
 
       ColumnLayout {
-        spacing: Style.marginTiny * scaling
+        spacing: Style.marginLarge * scaling
         Layout.fillWidth: true
 
         NText {
@@ -42,7 +42,7 @@ ColumnLayout {
 
         // Wallpaper Settings Category
         ColumnLayout {
-          spacing: 8
+          spacing: Style.marginSmall * scaling
           Layout.fillWidth: true
           Layout.topMargin: Style.marginSmall * scaling
 
@@ -76,10 +76,10 @@ ColumnLayout {
 
         NText {
           text: "Automation"
-          font.pointSize: 18
+          font.pointSize: Style.fontSizeXL * scaling
           font.weight: Style.fontWeightBold
           color: Colors.textPrimary
-          Layout.bottomMargin: 8
+          Layout.bottomMargin: Style.marginSmall * scaling
         }
 
         // Random Wallpaper
@@ -151,12 +151,12 @@ ColumnLayout {
       // -------------------------------
       // SWWW
       ColumnLayout {
-        spacing: 4
+        spacing: Style.marginLarge * scaling
         Layout.fillWidth: true
 
         NText {
           text: "SWWW"
-          font.pointSize: 18
+          font.pointSize: Style.fontSizeXL * scaling
           font.weight: Style.fontWeightBold
           color: Colors.textPrimary
           Layout.bottomMargin: 8
@@ -174,9 +174,9 @@ ColumnLayout {
 
         // SWWW Settings (only visible when useSWWW is enabled)
         ColumnLayout {
-          spacing: 8
+          spacing: Style.marginSmall * scaling
           Layout.fillWidth: true
-          Layout.topMargin: 8
+          Layout.topMargin: Style.marginSmall * scaling
           visible: Settings.data.wallpaper.swww.enabled
 
           // Resize Mode
diff --git a/Modules/Settings/Tabs/WallpaperSelector.qml b/Modules/Settings/Tabs/WallpaperSelector.qml
index 2f743d0..7a6204e 100644
--- a/Modules/Settings/Tabs/WallpaperSelector.qml
+++ b/Modules/Settings/Tabs/WallpaperSelector.qml
@@ -69,31 +69,34 @@ Item {
         Layout.fillWidth: true
       }
 
-      // Wallpaper grid
-      NText {
-        text: "Available Wallpapers"
-        font.weight: Style.fontWeightBold
-        color: Colors.textPrimary
-      }
-
-      NText {
-        text: "Click on a wallpaper to set it as your current wallpaper"
-        color: Colors.textSecondary
-        wrapMode: Text.WordWrap
-      }
-
-      NText {
-        text: Settings.data.wallpaper.swww.enabled ? "Wallpapers will change with " + Settings.data.wallpaper.swww.transitionType
-                                                     + " transition" : "Wallpapers will change instantly"
-        color: Colors.textSecondary
-        font.pointSize: Style.fontSizeSmall * scaling
-        visible: Settings.data.wallpaper.swww.enabled
-      }
-
-      // Refresh button and status
       RowLayout {
         Layout.fillWidth: true
-        spacing: Style.marginSmall * scaling
+
+        ColumnLayout {
+          Layout.fillWidth: true
+
+          // Wallpaper grid
+          NText {
+            text: "Available Wallpapers"
+            font.weight: Style.fontWeightBold
+            color: Colors.textPrimary
+          }
+
+          NText {
+            text: "Click on a wallpaper to set it as your current wallpaper"
+            color: Colors.textSecondary
+            wrapMode: Text.WordWrap
+            Layout.fillWidth: true
+          }
+
+          NText {
+            text: Settings.data.wallpaper.swww.enabled ? "Wallpapers will change with " + Settings.data.wallpaper.swww.transitionType
+                                                        + " transition" : "Wallpapers will change instantly"
+            color: Colors.textSecondary
+            font.pointSize: Style.fontSizeSmall * scaling
+            visible: Settings.data.wallpaper.swww.enabled
+          }
+        }
 
         NIconButton {
           icon: "refresh"
@@ -101,12 +104,16 @@ Item {
           onClicked: {
             Wallpapers.loadWallpapers()
           }
+          Layout.alignment: Qt.AlignTop | Qt.AlignRight
         }
+      }
+
+      // Refresh button and status
+      RowLayout {
+        Layout.fillWidth: true
+        spacing: Style.marginSmall * scaling
+
 
-        NText {
-          text: "Refresh"
-          color: Colors.textSecondary
-        }
       }
 
       // Wallpaper grid container