diff --git a/src/Bar.qml b/src/Bar.qml
deleted file mode 100644
index 760b0ca..0000000
--- a/src/Bar.qml
+++ /dev/null
@@ -1,165 +0,0 @@
-import Quickshell // for ShellRoot and PanelWindow
-import QtQuick // for Text
-import QtQuick.Layouts
-import "widgets/systray"
-import "widgets/workspaces"
-import "widgets/battery"
-import "widgets/network"
-import "widgets/notifcenter"
-import "widgets/caffeine"
-import "windows/notificationtoast"
-import "windows/workspace-view"
-import "base"
-import QtQuick.Controls
-import Quickshell.Io
-
-Scope {
-    Variants {
-        model: Quickshell.screens
-    }
-
-    Variants {
-        model: Quickshell.screens
-        delegate: Item {
-            id: root
-
-            property var modelData
-            property bool enabled: false
-
-            PanelWindow {
-                id: lbar
-                screen: root.modelData
-
-                anchors {
-                    top: true
-                    left: true
-                    bottom: true
-                }
-                margins.left: 2
-                margins.top: 2
-                margins.bottom: 2
-
-                width: 30
-                color: "transparent"
-
-                NotificationToasts {
-                    win: lbar
-                }
-
-                WorkspaceView {}
-
-                Rectangle {
-                    color: "transparent"
-                    anchors.margins: 5
-
-                    height: parent.height
-                    width: parent.width
-
-                    ColumnLayout {
-                        width: 30
-                        Layout.maximumWidth: 30
-
-                        // TODO: on click open a calendar view
-                        ClockWidget {}
-
-                        AudioOutput {}
-
-                        SysTray {}
-
-                        Workspaces {}
-
-                        Battery {}
-
-                        //Privacy {}
-
-                        Network {}
-
-                        Notifcenter {}
-
-                        Caffeine {}
-
-                        Item {
-                            Layout.fillHeight: true
-                        }
-                    }
-                    MouseArea {
-                        id: mouse
-                        onClicked: () => root.enabled = !root.enabled
-                        height: width
-                        width: 30
-                        anchors.bottom: parent.bottom
-                        cursorShape: Qt.PointingHandCursor
-                        BRectangle {
-                            anchors.fill: parent
-                            Rectangle {
-                                visible: mouse.containsMouse
-                                anchors.fill: parent
-                                radius: parent.radius
-                                color: "#9F9F9FC8"
-                            }
-                        }
-                    }
-                }
-            }
-
-            PanelWindow {
-                id: homeWindow
-
-                property bool animRunning: false
-
-                screen: root.modelData
-
-                IpcHandler {
-                    target: "dash"
-
-                    function toggle() {
-                        root.enabled = !root.enabled;
-                    }
-                }
-
-                color: "transparent"
-                anchors {
-                    top: true
-                    left: true
-                    bottom: true
-                    right: true
-                }
-
-                visible: animRunning || root.enabled
-                focusable: true
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: () => root.enabled = false
-
-                    BRectangle {
-                        id: home
-
-                        property var maxSize: 0
-
-                        bottomRightRadius: 10
-                        topRightRadius: 10
-                        border.color: "transparent"
-                        height: parent.height
-                        width: root.enabled ? maxSize : 0
-
-                        MouseArea {
-                            anchors.fill: parent
-                        }
-
-                        Component.onCompleted: () => maxSize = homeWindow.screen.width * (2 / 7)
-
-                        Behavior on width {
-                            PropertyAnimation {
-                                id: anim
-                                duration: 100
-                                Component.onCompleted: () => {
-                                    homeWindow.animRunning = Qt.binding(() => anim.running);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Dashboard.qml b/src/Dashboard.qml
new file mode 100644
index 0000000..6fcadae
--- /dev/null
+++ b/src/Dashboard.qml
@@ -0,0 +1,96 @@
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import QtQml
+import "base"
+
+PanelWindow {
+    id: homeWindow
+
+    required property var root
+    property bool animRunning: false
+
+    color: "transparent"
+    visible: animRunning || homeWindow.root.enabled
+    focusable: true
+
+    anchors {
+        top: true
+        left: true
+        bottom: true
+        right: true
+    }
+
+    MouseArea {
+        id: mouse
+        anchors.fill: parent
+
+        onClicked: homeWindow.root.enabled = false
+
+        BRectangle {
+            id: home
+
+            property var maxSize: 0
+
+            bottomRightRadius: 10
+            topRightRadius: 10
+            border.color: "transparent"
+            height: parent.height
+            width: homeWindow.root.enabled ? maxSize : 0
+            clip: true
+            MouseArea {
+                anchors.fill: parent
+            }
+
+            Component.onCompleted: () => maxSize = homeWindow.screen.width * (2 / 7)
+
+            Behavior on width {
+                PropertyAnimation {
+                    id: anim
+                    duration: 200
+                    Component.onCompleted: () => {
+                        homeWindow.animRunning = Qt.binding(() => anim.running);
+                    }
+                }
+            }
+
+            RowLayout {
+                anchors.fill: parent
+
+                Item {
+                    width: 30
+                    Layout.fillHeight: true
+                }
+
+                ColumnLayout {
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
+                    height: parent.height
+                    Layout.margins: 15
+                    Layout.alignment: Qt.AlignBottom
+
+                    BRectangle {
+                        Layout.fillWidth: true
+                        Layout.preferredHeight: 200
+                        radius: 15
+
+                        RowLayout {
+                            anchors.fill: parent
+                            clip: true
+                            Rectangle {
+                                Layout.margins: 20
+                                Layout.preferredWidth: parent.height - (Layout.margins * 2)
+                                Layout.preferredHeight: parent.height - (Layout.margins * 2)
+                                Layout.maximumWidth: {
+                                    const mWidth = parent.width - (Layout.margins * 2);
+                                    return mWidth > 0 ? mWidth : 0;
+                                }
+                                Layout.fillHeight: true
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/MainBar.qml b/src/MainBar.qml
new file mode 100644
index 0000000..a6df037
--- /dev/null
+++ b/src/MainBar.qml
@@ -0,0 +1,89 @@
+import "widgets/systray"
+import "widgets/workspaces"
+import "widgets/battery"
+import "widgets/network"
+import "widgets/notifcenter"
+import "widgets/caffeine"
+import "windows/notificationtoast"
+import "windows/workspace-view"
+import "base"
+import Quickshell // for ShellRoot and PanelWindow
+import QtQuick
+import QtQuick.Layouts
+
+PanelWindow {
+    id: lbar
+
+    required property var root
+
+    anchors {
+        top: true
+        left: true
+        bottom: true
+    }
+    margins.left: 2
+    margins.top: 2
+    margins.bottom: 2
+
+    width: 30
+    color: "transparent"
+
+    NotificationToasts {
+        win: lbar
+    }
+
+    WorkspaceView {}
+
+    Rectangle {
+        color: "transparent"
+        anchors.margins: 5
+
+        height: parent.height
+        width: parent.width
+
+        ColumnLayout {
+            width: 30
+            Layout.maximumWidth: 30
+
+            // TODO: on click open a calendar view
+            ClockWidget {}
+
+            AudioOutput {}
+
+            SysTray {}
+
+            Workspaces {}
+
+            Battery {}
+
+            //Privacy {}
+
+            Network {}
+
+            Notifcenter {}
+
+            Caffeine {}
+
+            Item {
+                Layout.fillHeight: true
+            }
+        }
+        MouseArea {
+            id: mouse
+            onClicked: lbar.root.enabled = !lbar.root.enabled
+            height: width
+            width: 30
+            anchors.bottom: parent.bottom
+            cursorShape: Qt.PointingHandCursor
+            BRectangle {
+                anchors.fill: parent
+                Rectangle {
+                    visible: mouse.containsMouse
+                    anchors.fill: parent
+                    radius: parent.radius
+                    color: "#9F9F9FC8"
+                }
+            }
+        }
+    }
+}
diff --git a/src/Nysh.qml b/src/Nysh.qml
new file mode 100644
index 0000000..9095f8c
--- /dev/null
+++ b/src/Nysh.qml
@@ -0,0 +1,28 @@
+import Quickshell.Io
+import QtQuick
+import Quickshell
+
+Item {
+    id: root
+
+    required property ShellScreen screen
+    property bool enabled: false
+
+    property IpcHandler ipc: IpcHandler {
+        target: "dash"
+
+        function toggle() {
+            root.enabled = !root.enabled;
+        }
+    }
+
+    property MainBar mainBar: MainBar {
+        screen: root.screen
+        root: root
+    }
+
+    property Dashboard dash: Dashboard {
+        screen: root.screen
+        root: root
+    }
+}
diff --git a/src/shell.qml b/src/shell.qml
index 94125a3..e25ad07 100644
--- a/src/shell.qml
+++ b/src/shell.qml
@@ -1,8 +1,15 @@
 //@ pragma UseQApplication
 import Quickshell
+import QtQuick
 
-// for ShellRoot and PanelWindow
 ShellRoot {
-    Bar {}
-    LinuxActivation {}
+    Scope {
+        Variants {
+            model: Quickshell.screens
+            delegate: Nysh {
+                required property var modelData
+                screen: modelData
+            }
+        }
+    }
 }