diff --git a/src/mpv/mpvobject.cpp b/src/mpv/mpvobject.cpp
index 53f5fe0..ea30d22 100644
--- a/src/mpv/mpvobject.cpp
+++ b/src/mpv/mpvobject.cpp
@@ -502,7 +502,7 @@ void MpvObject::playPause()
 
 void MpvObject::stop()
 {
-  command(QVariantList() << "stop" << "keep-playlist");
+  command(QVariantList() << "stop");
 }
 
 void MpvObject::stepBackward()
diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml
index 62762c6..0a8fc33 100644
--- a/src/qml/presenter/Library.qml
+++ b/src/qml/presenter/Library.qml
@@ -110,7 +110,7 @@ Item {
                     Kirigami.ActionToolBar {
                         height: 40
                         width: parent.width
-                        display: Button.IconOnly
+                        display: Controls.Button.IconOnly
                         visible: selectedLibrary == "songs"
                         actions: [
                             Kirigami.Action {
@@ -455,7 +455,6 @@ Item {
                                     else{
                                         videoLibraryList.currentIndex = index
                                         const video = videosqlmodel.getVideo(videoLibraryList.currentIndex);
-                                        /* showPassiveNotification("selected video: " + video); */
                                         if (!editMode)
                                             editMode = true;
                                         editSwitch("video", video);
@@ -673,6 +672,7 @@ Item {
                     editMode = true;
                 editSwitch("video", video);
             }
+
         }
 
         Rectangle {
diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index 851568f..82306a1 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -84,6 +84,7 @@ Controls.Page {
         id: videoEditorComp
         Presenter.VideoEditor {
             id: videoEditor
+            Controls.StackView.onDeactivating: prePop()
         }
     }
 
@@ -226,12 +227,15 @@ Controls.Page {
         if (editMode) {
             switch (editType) {
             case "song" :
+                mainPageArea.pop(Controls.StackView.Immediate);
                 mainPageArea.push(songEditorComp, Controls.StackView.Immediate);
                 break;
             case "video" :
+                mainPageArea.pop(Controls.StackView.Immediate);
                 mainPageArea.push(videoEditorComp, {"video": item}, Controls.StackView.Immediate);
                 break;
             case "image" :
+                mainPageArea.pop(Controls.StackView.Immediate);
                 mainPageArea.push(imageEditorComp, Controls.StackView.Immediate);
                 break;
             default:
diff --git a/src/qml/presenter/VideoEditor.qml b/src/qml/presenter/VideoEditor.qml
index a5a6fe1..d27515f 100644
--- a/src/qml/presenter/VideoEditor.qml
+++ b/src/qml/presenter/VideoEditor.qml
@@ -87,7 +87,7 @@ Item {
                         border.color: Kirigami.Theme.activeBackgroundColor
                         border.width: 2
                     }
-                    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+                    closePolicy: Controls.Popup.CloseOnEscape | Controls.Popup.CloseOnPressOutsideParent
                     ColumnLayout {
                         anchors.fill: parent
                         Controls.ToolButton {
@@ -171,7 +171,6 @@ Item {
                     onFileLoaded: {
                         showPassiveNotification(video.title + " has been loaded");
                         videoPreview.pause();
-                        /* showPassiveNotification(mpv.getProperty("loop")); */
                     }
                 }
                 Rectangle {
@@ -202,7 +201,7 @@ Item {
                             from: 0
                             to: videoPreview.duration
                             /* value: videoPreview.postion */
-                            live: false
+                            live: true
                             onMoved: videoPreview.seek(value);
                         }
                     }
@@ -224,4 +223,6 @@ Item {
             /* showPassiveNotification(video[0]); */
         }
     }
+
+    function prePop() { videoPreview.stop() }
 }
diff --git a/src/videosqlmodel.cpp b/src/videosqlmodel.cpp
index 20c247b..a503af1 100644
--- a/src/videosqlmodel.cpp
+++ b/src/videosqlmodel.cpp
@@ -159,7 +159,7 @@ void VideoSqlModel::updateFilePath(const int &row, const QUrl &filePath) {
 QVariantList VideoSqlModel::getVideo(const int &row) {
   qDebug() << "Row we are getting is " << row;
   QVariantList video;
-  QSqlRecord rec = record(row - 1);
+  QSqlRecord rec = record(row);
   qDebug() << rec.value("title");
   video.append(rec.value("title"));
   video.append(rec.value("filePath"));