diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml
index ec9f1e3..4a413f3 100644
--- a/Modules/SettingsPanel/Tabs/AudioTab.qml
+++ b/Modules/SettingsPanel/Tabs/AudioTab.qml
@@ -10,7 +10,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Audio Settings"
+    label: "Audio Settings"
     description: "Configure system audio, devices, and media player preferences."
   }
 
@@ -164,7 +164,7 @@ ColumnLayout {
     spacing: Style.marginS * scaling
 
     NHeader {
-      title: "Audio Devices"
+      label: "Audio Devices"
     }
 
     // -------------------------------
@@ -236,7 +236,7 @@ ColumnLayout {
     spacing: Style.marginL * scaling
 
     NHeader {
-      title: "Media Player"
+      label: "Media Player"
     }
 
     // Preferred player
@@ -358,7 +358,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Audio Visualizer"
+      label: "Audio Visualizer"
     }
 
     // AudioService Visualizer section
diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml
index 88f096d..aa61a9b 100644
--- a/Modules/SettingsPanel/Tabs/BarTab.qml
+++ b/Modules/SettingsPanel/Tabs/BarTab.qml
@@ -11,7 +11,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Bar Settings"
+    label: "Bar Settings"
     description: "Configure bar appearance, positioning, and monitor settings."
   }
 
@@ -86,7 +86,7 @@ ColumnLayout {
       Layout.fillWidth: true
 
       NHeader {
-        title: "Background Opacity"
+        label: "Background Opacity"
         description: "Adjust the background opacity of the bar."
       }
 
@@ -210,7 +210,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Monitor Configuration"
+      label: "Monitor Configuration"
       description: "Choose which monitors should display the bar."
     }
 
@@ -244,9 +244,8 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Widgets Positioning"
+      label: "Widgets Positioning"
       description: "Drag and drop widgets to reorder them within each section, or use the add/remove buttons to manage widgets."
-      bottomMargin: 0
     }
 
     // Bar Sections
diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
index 76c54c8..2cc0112 100644
--- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
@@ -11,7 +11,7 @@ ColumnLayout {
   spacing: 0
 
   NHeader {
-    title: "Color Schemes"
+    label: "Color Schemes"
     description: "Choose and customize color schemes for your interface."
   }
 
@@ -157,7 +157,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Predefined Color Schemes"
+      label: "Predefined Color Schemes"
       description: "To use these color schemes, you must turn off Matugen. With Matugen enabled, colors are automatically generated from your wallpaper."
     }
 
diff --git a/Modules/SettingsPanel/Tabs/DisplayTab.qml b/Modules/SettingsPanel/Tabs/DisplayTab.qml
index e1aa12d..9c75fb5 100644
--- a/Modules/SettingsPanel/Tabs/DisplayTab.qml
+++ b/Modules/SettingsPanel/Tabs/DisplayTab.qml
@@ -219,11 +219,8 @@ ColumnLayout {
     spacing: Style.marginS * scaling
     Layout.fillWidth: true
 
-    NText {
-      text: "Brightness"
-      font.pointSize: Style.fontSizeXXL * scaling
-      font.weight: Style.fontWeightBold
-      color: Color.mSecondary
+    NHeader {
+      label: "Brightness"
     }
 
     // Brightness Step Section
@@ -258,19 +255,9 @@ ColumnLayout {
     spacing: Style.marginXS * scaling
     Layout.fillWidth: true
 
-    NText {
-      text: "Night Light"
-      font.pointSize: Style.fontSizeXXL * scaling
-      font.weight: Style.fontWeightBold
-      color: Color.mSecondary
-    }
-
-    NText {
-      text: "Reduce blue light emission to help you sleep better and reduce eye strain."
-      font.pointSize: Style.fontSizeM * scaling
-      color: Color.mOnSurfaceVariant
-      wrapMode: Text.WordWrap
-      Layout.fillWidth: true
+NHeader {
+      label: "Night Light"
+      description: "Reduce blue light emission to help you sleep better and reduce eye strain."
     }
   }
 
diff --git a/Modules/SettingsPanel/Tabs/DockTab.qml b/Modules/SettingsPanel/Tabs/DockTab.qml
index 6019589..7adcb1a 100644
--- a/Modules/SettingsPanel/Tabs/DockTab.qml
+++ b/Modules/SettingsPanel/Tabs/DockTab.qml
@@ -12,7 +12,7 @@ ColumnLayout {
   width: root.width
 
   NHeader {
-    title: "Dock Settings"
+    label: "Dock Settings"
     description: "Configure dock behavior, appearance, and monitor settings."
   }
 
@@ -55,7 +55,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Monitor Configuration"
+      label: "Monitor Configuration"
       description: "Choose which monitors should display the dock."
     }
 
@@ -88,7 +88,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Background Opacity"
+      label: "Background Opacity"
       description: "Adjust the background opacity."
     }
 
@@ -123,7 +123,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Dock Floating Distance"
+      label: "Dock Floating Distance"
       description: "Adjust the floating distance from the screen edge."
     }
 
diff --git a/Modules/SettingsPanel/Tabs/GeneralTab.qml b/Modules/SettingsPanel/Tabs/GeneralTab.qml
index e3ef3ba..03b19cf 100644
--- a/Modules/SettingsPanel/Tabs/GeneralTab.qml
+++ b/Modules/SettingsPanel/Tabs/GeneralTab.qml
@@ -10,7 +10,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Profile"
+    label: "Profile"
     description: "Configure your user profile and avatar settings."
   }
 
@@ -54,7 +54,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "User Interface"
+      label: "User Interface"
     }
 
     NToggle {
@@ -135,7 +135,7 @@ ColumnLayout {
     spacing: Style.marginL * scaling
     Layout.fillWidth: true
     NHeader {
-      title: "Screen Corners"
+      label: "Screen Corners"
     }
 
     NToggle {
@@ -184,8 +184,9 @@ ColumnLayout {
   ColumnLayout {
     spacing: Style.marginL * scaling
     Layout.fillWidth: true
+    
     NHeader {
-      title: "Fonts"
+      label: "Fonts"
     }
 
     // Font configuration section
diff --git a/Modules/SettingsPanel/Tabs/HooksTab.qml b/Modules/SettingsPanel/Tabs/HooksTab.qml
index de4309a..b3c789d 100644
--- a/Modules/SettingsPanel/Tabs/HooksTab.qml
+++ b/Modules/SettingsPanel/Tabs/HooksTab.qml
@@ -11,7 +11,7 @@ ColumnLayout {
   width: root.width
 
   NHeader {
-    title: "System Hooks"
+    label: "System Hooks"
     description: "Configure commands to be executed when system events occur."
   }
 
diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/SettingsPanel/Tabs/LauncherTab.qml
index d1259aa..067ff94 100644
--- a/Modules/SettingsPanel/Tabs/LauncherTab.qml
+++ b/Modules/SettingsPanel/Tabs/LauncherTab.qml
@@ -9,7 +9,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Launcher Settings"
+    label: "Launcher Settings"
     description: "Configure the application launcher panel behavior and appearance."
   }
 
diff --git a/Modules/SettingsPanel/Tabs/NetworkTab.qml b/Modules/SettingsPanel/Tabs/NetworkTab.qml
index 8e70525..5feb6fa 100644
--- a/Modules/SettingsPanel/Tabs/NetworkTab.qml
+++ b/Modules/SettingsPanel/Tabs/NetworkTab.qml
@@ -12,7 +12,7 @@ ColumnLayout {
   spacing: Style.marginL * scaling
 
   NHeader {
-    title: "Network Settings"
+    label: "Network Settings"
     description: "Configure Wi-Fi and Bluetooth connectivity options."
   }
 
diff --git a/Modules/SettingsPanel/Tabs/NotificationTab.qml b/Modules/SettingsPanel/Tabs/NotificationTab.qml
index b0e123a..920cf10 100644
--- a/Modules/SettingsPanel/Tabs/NotificationTab.qml
+++ b/Modules/SettingsPanel/Tabs/NotificationTab.qml
@@ -28,7 +28,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "General Settings"
+      label: "General Settings"
     }
 
     NToggle {
@@ -51,7 +51,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Monitor Configuration"
+      label: "Monitor Configuration"
       description: "Choose which monitors should display notifications."
     }
 
@@ -85,7 +85,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Notification Duration"
+      label: "Notification Duration"
       description: "Configure how long notifications stay visible based on their urgency level."
     }
 
diff --git a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
index 7493fd1..e2cae07 100644
--- a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
+++ b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml
@@ -11,7 +11,7 @@ ColumnLayout {
   spacing: Style.marginL * scaling
 
   NHeader {
-    title: "Screen Recorder"
+    label: "Screen Recorder"
     description: "Configure screen recording settings and output options."
   }
 
@@ -59,7 +59,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Video Settings"
+      label: "Video Settings"
     }
 
     // Source
@@ -205,7 +205,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Audio Settings"
+      label: "Audio Settings"
     }
 
     // Audio Source
diff --git a/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml b/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
index 01f8420..a56a2d2 100644
--- a/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
@@ -13,7 +13,7 @@ ColumnLayout {
   spacing: Style.marginL * scaling
 
   NHeader {
-    title: "Wallpaper Selector"
+    label: "Wallpaper Selector"
     description: "Browse and select wallpapers from your configured directory."
   }
 
@@ -48,7 +48,7 @@ ColumnLayout {
 
   // Current wallpaper display
   NHeader {
-    title: "Current Wallpaper"
+    label: "Current Wallpaper"
   }
 
   Rectangle {
@@ -83,7 +83,7 @@ ColumnLayout {
 
       // Wallpaper grid
       NHeader {
-        title: "Wallpaper Selector"
+        label: "Wallpaper Selector"
         description: "Click on a wallpaper to set it as your current wallpaper."
       }
     }
diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
index a0019d4..95ac775 100644
--- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
@@ -11,7 +11,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Wallpaper Management"
+    label: "Wallpaper Management"
     description: "Configure wallpaper settings, automation, and appearance options."
   }
 
@@ -95,7 +95,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Look & Feel"
+      label: "Look & Feel"
     }
 
     // Fill Mode
@@ -192,7 +192,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Automation"
+      label: "Automation"
     }
 
     // Random Wallpaper
diff --git a/Modules/SettingsPanel/Tabs/WeatherTab.qml b/Modules/SettingsPanel/Tabs/WeatherTab.qml
index 9f3858a..d55c1f7 100644
--- a/Modules/SettingsPanel/Tabs/WeatherTab.qml
+++ b/Modules/SettingsPanel/Tabs/WeatherTab.qml
@@ -9,7 +9,7 @@ ColumnLayout {
   id: root
 
   NHeader {
-    title: "Weather & Location"
+    label: "Weather & Location"
     description: "Configure weather display and location settings."
   }
 
@@ -63,7 +63,7 @@ ColumnLayout {
     Layout.fillWidth: true
 
     NHeader {
-      title: "Weather"
+      label: "Weather"
     }
 
     NToggle {
diff --git a/Widgets/NHeader.qml b/Widgets/NHeader.qml
index e077c7b..b482a12 100644
--- a/Widgets/NHeader.qml
+++ b/Widgets/NHeader.qml
@@ -5,19 +5,17 @@ import qs.Commons
 ColumnLayout {
   id: root
 
-  property string title: ""
+  property string label: ""
   property string description: ""
-  property real bottomMargin: Style.marginL * scaling
 
   spacing: Style.marginXXS * scaling
   Layout.fillWidth: true
 
   NText {
-    text: root.title
+    text: root.label
     font.pointSize: Style.fontSizeXXL * scaling
     font.weight: Style.fontWeightBold
     color: Color.mSecondary
-    Layout.bottomMargin: Style.marginS * scaling
     visible: root.title !== ""
   }
 
@@ -27,7 +25,6 @@ ColumnLayout {
     color: Color.mOnSurfaceVariant
     wrapMode: Text.WordWrap
     Layout.fillWidth: true
-    Layout.bottomMargin: root.bottomMargin
     visible: root.description !== ""
   }
 }