diff --git a/flake.lock b/flake.lock
index 69353a8..633b2dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,11 +16,24 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1741851582,
+        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
     "quickshell": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1738200090,
diff --git a/flake.nix b/flake.nix
index 0e462cd..323eaf2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
 
     quickshell = {
       url = "git+https://git.outfoxxed.me/quickshell/quickshell";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
diff --git a/src/MainBar.qml b/src/MainBar.qml
index 046a192..27d41e0 100644
--- a/src/MainBar.qml
+++ b/src/MainBar.qml
@@ -21,7 +21,7 @@ PanelWindow {
         bottom: true
     }
 
-    width: 40
+    width: 35
     color: "transparent"
 
     NotificationToasts {
@@ -29,18 +29,13 @@ PanelWindow {
     }
 
     Rectangle {
-        color: "transparent"
-        anchors.alignWhenCentered: true
-        anchors.centerIn: parent
+        color: "#282828"
+        anchors.fill: parent
 
-        height: parent.height
-        width: parent.width
-
-        ColumnLayout {
-            width: 30
-            anchors.horizontalCenter: parent.horizontalCenter
-
-            Layout.maximumWidth: 30
+        Column{
+            anchors.fill:parent
+            anchors.margins : 2
+            spacing: 2
 
             // TODO: on click open a calendar view
             ClockWidget {}
@@ -65,9 +60,13 @@ PanelWindow {
                 width: parent.width
                 height: parent.width
             }
-        }
 
-        BButton {
+
+            Item {
+
+            }
+
+            BButton {
             id: mouse
             onClicked: NyshState.toggleDash()
 
@@ -84,11 +83,11 @@ PanelWindow {
                 anchors.fill: parent
             }
 
-            anchors.horizontalCenter: parent.horizontalCenter
-
+            width: parent.width
             height: width
-            width: 30
-            anchors.bottom: parent.bottom
         }
+
+        }
+
     }
 }
diff --git a/src/widgets/systray/SysTray.qml b/src/widgets/systray/SysTray.qml
index 3b7ac60..4c99e2c 100644
--- a/src/widgets/systray/SysTray.qml
+++ b/src/widgets/systray/SysTray.qml
@@ -1,31 +1,22 @@
+import "../../base"
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Controls
-import Quickshell
 import Quickshell.Services.SystemTray
-import "../../base"
 
 BRectangle {
-    height: 112
+    width: parent.width
+    height: childrenRect.height + margins * 2
+    property int margins: 2;
 
-    ScrollView {
-        anchors.fill: parent
-        contentWidth: availableWidth
-        padding: parent.border.width * 2
-
-        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
-        ScrollBar.vertical.policy: ScrollBar.AlwaysOff
-
-        ColumnLayout {
-            anchors.fill: parent
-
-            Repeater {
-                model: SystemTray.items
-
-                SysTrayItem {
-                    required property SystemTrayItem modelData
-                    item: modelData
-                }
+    ColumnLayout {
+        anchors.centerIn: parent
+        anchors.margins: parent.margins
+        width: parent.width - anchors.margins * 2
+        Repeater {
+            model: SystemTray.items
+            SysTrayItem {
+                required property SystemTrayItem modelData
+                item: modelData
             }
         }
     }
diff --git a/src/widgets/systray/SysTrayItem.qml b/src/widgets/systray/SysTrayItem.qml
index a09c039..46be640 100644
--- a/src/widgets/systray/SysTrayItem.qml
+++ b/src/widgets/systray/SysTrayItem.qml
@@ -7,10 +7,13 @@ import Quickshell.Widgets
 MouseArea {
     id: root
     required property SystemTrayItem item
+    width: parent.width
+    height: parent.width
     Layout.fillWidth: true
     Layout.preferredHeight: parent.width
     acceptedButtons: Qt.LeftButton | Qt.RightButton
 
+    anchors.horizontalCenter: parent.horizontalCenter
     onClicked: event => {
         switch (event.button) {
         case Qt.LeftButton:
@@ -28,11 +31,15 @@ MouseArea {
         id: menu
         menu: root.item.menu
         anchor.window: lbar
+        anchor.rect.x: root.x + lbar.width
+        anchor.rect.y: root.y
+        anchor.rect.height: root.height * 3
+        anchor.edges: Edges.Left | Edges.Bottom
     }
 
     IconImage {
         source: root.item.icon
-
+        anchors.centerIn:parent
         width: parent.width
         height: parent.height
     }
diff --git a/src/windows/notificationtoast/NotificationToasts.qml b/src/windows/notificationtoast/NotificationToasts.qml
index 4a6c36f..af3d03c 100644
--- a/src/windows/notificationtoast/NotificationToasts.qml
+++ b/src/windows/notificationtoast/NotificationToasts.qml
@@ -21,8 +21,6 @@ PanelWindow {
         width: popups.width
     }
 
-    focusable: true
-
     color: "transparent"
     width: 500