diff --git a/src/qml/main.qml b/src/qml/main.qml
index d8a4d20..0d2225e 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -21,10 +21,6 @@ Kirigami.ApplicationWindow {
     width: 1800
     height: 900
 
-    Rectangle {
-
-    }
-
     Presenter.MainWindow {
         id: mainPage
     }
diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index a107a3f..cdf8f27 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -22,6 +22,8 @@ Controls.Page {
 
     property string dragSongTitle: ""
 
+    property bool editing: true
+
     property Item slideItem
     property var song
     property var draggedLibraryItem
@@ -56,22 +58,16 @@ Controls.Page {
                 Controls.SplitView.maximumWidth: 300
             }
             
-            Presenter.SongEditor {
-                id: songEditor
+            Controls.StackView {
+                id: mainPageArea
                 Controls.SplitView.fillHeight: true
                 Controls.SplitView.fillWidth: true
                 Controls.SplitView.preferredWidth: 700
                 Controls.SplitView.minimumWidth: 500
+                initialItem: presenterComp
+                
             }
 
-            /* Presenter.Presentation { */
-            /*     id: presentation */
-            /*     Controls.SplitView.fillHeight: true */
-            /*     Controls.SplitView.fillWidth: true */
-            /*     Controls.SplitView.preferredWidth: 700 */
-            /*     Controls.SplitView.minimumWidth: 500 */
-            /* } */
-
             Presenter.Library {
                 id: library
                 Controls.SplitView.fillHeight: true
@@ -82,6 +78,21 @@ Controls.Page {
         }
     }
 
+    Component {
+        id: songEditorComp
+        Presenter.SongEditor {
+            id: songEditor
+        }
+    }
+
+    Component {
+        id: presenterComp
+        Presenter.Presentation {
+            id: presentation
+        }
+    }
+
+
     Loader {
         id: presentLoader
         active: presenting
diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml
index 3ca05e6..56711e2 100644
--- a/src/qml/presenter/Presentation.qml
+++ b/src/qml/presenter/Presentation.qml
@@ -46,22 +46,39 @@ Item {
             }
         }
 
-        Kirigami.Icon {
-            source: "arrow-left"
+        Item {
+            /* Layout.preferredHeight: 200 */
             Layout.fillHeight: true
             Layout.fillWidth: true
-            Layout.preferredWidth: 25
+            Layout.columnSpan: 3
+        }
+
+        Kirigami.Icon {
+            source: "arrow-left"
+            Layout.preferredWidth: 200
+            Layout.preferredHeight: 200
+            Layout.alignment: Qt.AlignRight
         }
 
         Presenter.Slide {
-            Layout.preferredWidth: 50
+            Layout.preferredWidth: 700
+            Layout.preferredHeight: 500
+            Layout.alignment: Qt.AlignCenter
         }
 
         Kirigami.Icon {
             source: "arrow-right"
+            Layout.preferredWidth: 200
+            Layout.preferredHeight: 200
+            Layout.alignment: Qt.AlignLeft
+        }
+
+        Item {
+            /* Layout.preferredHeight: 200 */
             Layout.fillHeight: true
             Layout.fillWidth: true
-            Layout.preferredWidth: 25
+            Layout.columnSpan: 3
         }
+
     }
 }
diff --git a/src/qml/presenter/Slide.qml b/src/qml/presenter/Slide.qml
index 8fc7d26..ca79bbb 100644
--- a/src/qml/presenter/Slide.qml
+++ b/src/qml/presenter/Slide.qml
@@ -10,7 +10,6 @@ import mpv 1.0
 
 Item {
     id: root
-    anchors.fill: parent
 
     // Let's make this slide editable
     property bool editMode: false
diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml
index 07d6fda..20c8aa0 100644
--- a/src/qml/presenter/SongEditor.qml
+++ b/src/qml/presenter/SongEditor.qml
@@ -26,7 +26,7 @@ Item {
                     model: Qt.fontFamilies()
                     implicitWidth: 300
                     editable: true
-                    onCurrentIndexChanged: showPassiveNotification(currentText)
+                    onCurrentTextChanged: showPassiveNotification(currentText)
                 }
                 Controls.SpinBox {
                     editable: true