diff --git a/modules/Bar.qml b/modules/Bar.qml
index 671a453..443e807 100644
--- a/modules/Bar.qml
+++ b/modules/Bar.qml
@@ -10,7 +10,6 @@ PanelWindow {
     required property var screen
 
     color: "transparent"
-    layer: WlrLayer.Bottom
 
     anchors {
         top: true
@@ -34,45 +33,54 @@ PanelWindow {
         spacing: 0
 
         // ---- left ----
-        RowLayout {
+        Item {
             Layout.fillWidth: true
-            spacing: 8
+            Layout.fillHeight: true
 
-            M.Workspaces {}
-            M.Tray { bar: bar }
-            M.WindowTitle { Layout.maximumWidth: 400 }
-            Item { Layout.fillWidth: true }
+            RowLayout {
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: 8
+
+                // M.Workspaces {}
+                M.Tray { bar: bar }
+                M.WindowTitle { Layout.maximumWidth: 400 }
+            }
         }
 
         // ---- center ----
         RowLayout {
             spacing: 8
-            Layout.alignment: Qt.AlignVCenter
 
             M.Clock {}
             M.Notifications {}
         }
 
         // ---- right ----
-        RowLayout {
+        Item {
             Layout.fillWidth: true
-            spacing: 12
+            Layout.fillHeight: true
 
-            Item { Layout.fillWidth: true }
-            M.Mpris {}
-            M.Volume {}
-            M.Bluetooth {}
-            M.Backlight {}
-            M.Network {}
-            M.PowerProfile {}
-            M.IdleInhibitor {}
-            M.Weather {}
-            M.Temperature {}
-            M.Cpu {}
-            M.Memory {}
-            M.Disk {}
-            M.Battery {}
-            M.Wlogout {}
+            RowLayout {
+                anchors.right: parent.right
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: 12
+
+                M.Mpris {}
+                M.Volume {}
+                M.Bluetooth {}
+                M.Backlight {}
+                M.Network {}
+                M.PowerProfile {}
+                M.IdleInhibitor {}
+                M.Weather {}
+                M.Temperature {}
+                M.Cpu {}
+                M.Memory {}
+                M.Disk {}
+                M.Battery {}
+                M.Wlogout {}
+            }
         }
     }
 }
diff --git a/modules/Workspaces.qml b/modules/Workspaces.qml
index 97ff721..5240ce8 100644
--- a/modules/Workspaces.qml
+++ b/modules/Workspaces.qml
@@ -1,14 +1,7 @@
 import QtQuick
 import QtQuick.Layouts
 
+// Niri workspace support disabled — Quickshell.Services.Niri not available
 RowLayout {
     spacing: 4
-
-    Loader {
-        source: "WorkspacesInner.qml"
-        onStatusChanged: {
-            if (status === Loader.Error)
-                source = "";
-        }
-    }
 }
diff --git a/modules/WorkspacesInner.qml b/modules/WorkspacesInner.qml
deleted file mode 100644
index 1cc1b12..0000000
--- a/modules/WorkspacesInner.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import Quickshell.Services.Niri
-import "." as M
-
-RowLayout {
-    spacing: 4
-
-    Repeater {
-        model: Niri.workspaces
-
-        delegate: Rectangle {
-            required property var modelData
-
-            implicitWidth: 24
-            implicitHeight: 20
-            radius: 4
-            color: modelData.isFocused
-                ? M.Theme.base0D
-                : (modelData.isActive ? M.Theme.base03 : M.Theme.base02)
-
-            Text {
-                anchors.centerIn: parent
-                text: modelData.idx ?? modelData.id
-                color: modelData.isFocused ? M.Theme.base00 : M.Theme.base05
-                font.pixelSize: M.Theme.fontSize
-                font.family: M.Theme.fontFamily
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: Niri.dispatch(["action", "focus-workspace", String(modelData.id)])
-            }
-        }
-    }
-}