diff --git a/Modules/Bar/Widgets/KeyboardLayout.qml b/Modules/Bar/Widgets/KeyboardLayout.qml
index db9dc0a..e304b7e 100644
--- a/Modules/Bar/Widgets/KeyboardLayout.qml
+++ b/Modules/Bar/Widgets/KeyboardLayout.qml
@@ -39,8 +39,9 @@ RowLayout {
     tooltipText: "Keyboard layout: " + currentLayout
 
     onClicked: {
+
       // You could open keyboard settings here if needed
       // For now, just show the current layout
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml
index f29d7b7..06de40f 100644
--- a/Modules/Bar/Widgets/Tray.qml
+++ b/Modules/Bar/Widgets/Tray.qml
@@ -26,26 +26,26 @@ Rectangle {
   }
 
   visible: SystemTray.items.values.length > 0
-  implicitWidth: tray.width + Style.marginM * scaling * 2
+  implicitWidth: trayLayout.implicitWidth + Style.marginM * scaling * 2
   implicitHeight: Math.round(Style.capsuleHeight * scaling)
   radius: Math.round(Style.radiusM * scaling)
   color: Color.mSurfaceVariant
 
   Layout.alignment: Qt.AlignVCenter
 
-  Row {
-    id: tray
-
-    anchors.verticalCenter: parent.verticalCenter
-    anchors.horizontalCenter: parent.horizontalCenter
+  RowLayout {
+    id: trayLayout
+    anchors.centerIn: parent
     spacing: Style.marginS * scaling
 
     Repeater {
       id: repeater
       model: SystemTray.items
+
       delegate: Item {
-        width: itemSize
-        height: itemSize
+        Layout.preferredWidth: itemSize
+        Layout.preferredHeight: itemSize
+        Layout.alignment: Qt.AlignCenter
         visible: modelData
 
         IconImage {
@@ -146,13 +146,14 @@ Rectangle {
 
     function open() {
       visible = true
-
       PanelService.willOpenPanel(trayPanel)
     }
 
     function close() {
       visible = false
-      trayMenu.item.hideMenu()
+      if (trayMenu.item) {
+        trayMenu.item.hideMenu()
+      }
     }
 
     // Clicking outside of the rectangle to close
diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml
index 757549c..fdbe0d2 100644
--- a/Modules/Notification/Notification.qml
+++ b/Modules/Notification/Notification.qml
@@ -185,7 +185,6 @@ Variants {
                         || "Unknown App"} · ${NotificationService.formatTimestamp(model.timestamp)}`
                   color: Color.mSecondary
                   font.pointSize: Style.fontSizeXS * scaling
-                  
                 }
 
                 Rectangle {
diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml
index f6c1b40..e16cb12 100644
--- a/Widgets/NCircleStat.qml
+++ b/Widgets/NCircleStat.qml
@@ -108,4 +108,4 @@ Rectangle {
       }
     }
   }
-}
\ No newline at end of file
+}