diff --git a/Bar/Bar.qml b/Bar/Bar.qml
index 86f52f4..5b127b6 100644
--- a/Bar/Bar.qml
+++ b/Bar/Bar.qml
@@ -128,20 +128,21 @@ Scope {
                 }
 
                 PanelWindow {
-                    id: topCornerPanel
+                    id: topLeftPanel
                     anchors.top: true
                     anchors.left: true
-                    anchors.right: true
                     color: "transparent"
                     screen: modelData
                     margins.top: 36
                     WlrLayershell.exclusionMode: ExclusionMode.Ignore
                     visible: true
-
+                    WlrLayershell.layer: WlrLayer.Background
+                    aboveWindows: false
+                    WlrLayershell.namespace: "swww-daemon"
                     implicitHeight: 24
 
                     Corners {
-                        id: topleftCorner
+                        id: topLeftCorner
                         position: "bottomleft"
                         size: 1.3
                         fillColor: (Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222"
@@ -149,9 +150,25 @@ Scope {
                         offsetY: 0
                         anchors.top: parent.top
                     }
+                }
+                
+                PanelWindow {
+                    id: topRightPanel
+                    anchors.top: true
+                    anchors.right: true
+                    color: "transparent"
+                    screen: modelData
+                    margins.top: 36
+                    WlrLayershell.exclusionMode: ExclusionMode.Ignore
+                    visible: true
+                    WlrLayershell.layer: WlrLayer.Background
+                    aboveWindows: false
+                    WlrLayershell.namespace: "swww-daemon"
+
+                    implicitHeight: 24
 
                     Corners {
-                        id: toprightCorner
+                        id: topRightCorner
                         position: "bottomright"
                         size: 1.3
                         fillColor: (Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222"
@@ -169,6 +186,9 @@ Scope {
                     screen: modelData
                     WlrLayershell.exclusionMode: ExclusionMode.Ignore
                     visible: true
+                    WlrLayershell.layer: WlrLayer.Background
+                    aboveWindows: false
+                    WlrLayershell.namespace: "swww-daemon"
 
                     implicitHeight: 24
 
@@ -184,14 +204,17 @@ Scope {
                 }
 
                 PanelWindow {
-                    id: bottomRightCornerPanel
+                    id: bottomRightPanel
                     anchors.bottom: true
                     anchors.right: true
                     color: "transparent"
                     screen: modelData
                     WlrLayershell.exclusionMode: ExclusionMode.Ignore
                     visible: true
-
+                    WlrLayershell.layer: WlrLayer.Background
+                    aboveWindows: false
+                    WlrLayershell.namespace: "swww-daemon"
+                    
                     implicitHeight: 24
 
                     Corners {
@@ -211,4 +234,4 @@ Scope {
 
     // This alias exposes the visual bar's visibility to the outside world
     property alias visible: barRootItem.visible
-}
+}
\ No newline at end of file
diff --git a/Services/WorkspaceManager.qml b/Services/WorkspaceManager.qml
index 80f6ab2..f2f7bcb 100644
--- a/Services/WorkspaceManager.qml
+++ b/Services/WorkspaceManager.qml
@@ -89,7 +89,7 @@ Singleton {
                     id: i,
                     idx: ws.id,
                     name: ws.name || "",
-                    output: ws.monitor.name || "",
+                    output: ws.monitor?.name || "",
                     isActive: ws.active === true,
                     isFocused: ws.focused === true,
                     isUrgent: ws.urgent === true