diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml
index 191790f..54c30dc 100644
--- a/src/qml/presenter/MainWindow.qml
+++ b/src/qml/presenter/MainWindow.qml
@@ -181,6 +181,25 @@ Controls.Page {
         console.log("Slide changed to: " + item.name);
     }
 
+    function changeSlide(index) {
+        console.log("index grabbed: " + index);
+        const item = SlideModel.getItem(index);
+        currentSlide = index;
+        currentServiceItem = item.serviceItemId;
+        console.log("index grabbed: " + index);
+        console.log(item);
+
+        presentation.stopVideo();
+        pWindow.stopVideo();
+        /* presentation.itemType = item.type; */
+        console.log("Time to start changing");
+
+        ServiceItemModel.activate(currentServiceItem);
+        SlideObject.changeSlide(item);
+        presentation.textIndex = 0;
+        console.log("Slide changed to: " + index);
+    }
+
     function loopVideo() {
         presentation.loopVideo();
         pWindow.loopVideo();
diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml
index 69dc0f9..b24ea90 100644
--- a/src/qml/presenter/Presentation.qml
+++ b/src/qml/presenter/Presentation.qml
@@ -286,25 +286,10 @@ FocusScope {
         const nextSlideIdx = currentSlide + 1;
         if (nextSlideIdx > totalSlides || nextSlideIdx < 0)
             return;
-        const nextItem = SlideModel.getItem(nextSlideIdx);
         console.log("currentServiceItem " + currentServiceItem);
         console.log("currentSlide " + currentSlide);
         console.log("nextSlideIdx " + nextSlideIdx);
-        console.log(nextItem.index);
-        SlideObject.changeSlide(nextItem);
-        currentSlide = nextSlideIdx;
-        currentServiceItem = nextItem.serviceItemId;
-        changeServiceItem(currentServiceItem);
-        /* const change = SlideObject.next(nextItem); */
-        /* console.log(change); */
-        /* if (currentServiceItem === totalServiceItems - 1 & change) */
-        /*     return; */
-        /* if (change) { */
-        /*     SlideObject.changeSlide(nextItem); */
-        /*     currentServiceItem++; */
-        /*     changeServiceItem(currentServiceItem); */
-        /*     leftDock.changeItem(); */
-        /* } */
+        changeSlide(nextSlideIdx);
     }
 
     function nextSlide() {
@@ -317,26 +302,10 @@ FocusScope {
         const prevSlideIdx = currentSlide - 1;
         if (prevSlideIdx > totalSlides || prevSlideIdx < 0)
             return;
-        const prevItem = SlideModel.getItem(prevSlideIdx);
         console.log("currentServiceItem " + currentServiceItem);
         console.log("currentSlide " + currentSlide);
         console.log("prevSlideIdx " + prevSlideIdx);
-        console.log(prevItem.index);
-        SlideObject.changeSlide(prevItem);
-        currentSlide = prevSlideIdx;
-        currentServiceItem = prevItem.serviceItemId;
-        changeServiceItem(currentServiceItem);
-        /* const change = SlideObject.previous(prevItem); */
-        /* console.log(change); */
-        /* if (currentServiceItem === 0 & change) { */
-        /*     return; */
-        /* }; */
-        /* if (change) { */
-        /*     SlideObject.changeSlide(prevItem); */
-        /*     currentServiceItem--; */
-        /*     changeServiceItem(currentServiceItem); */
-        /*     leftDock.changeItem(); */
-        /* } */
+        changeSlide(prevSlideIdx);
     }
 
     function previousSlide() {
@@ -344,19 +313,6 @@ FocusScope {
         console.log(slideItem);
     }
 
-    function changeSlide() {
-        if (itemType === "song") {
-            SlideObject.setText(root.text[textIndex]);
-            console.log(root.text[textIndex]);
-            textIndex++;
-        } else if (itemType === "video") {
-            clearText();
-        }
-        else if (itemType === "image") {
-            clearText();
-        }
-    }
-
     function clearText() {
         SlideObject.setText("");
     }
diff --git a/src/qml/presenter/PreviewSlideListDelegate.qml b/src/qml/presenter/PreviewSlideListDelegate.qml
index fe167bd..8b48de6 100644
--- a/src/qml/presenter/PreviewSlideListDelegate.qml
+++ b/src/qml/presenter/PreviewSlideListDelegate.qml
@@ -44,7 +44,7 @@ Item {
 
     Controls.Label {
         id: slidesTitle
-        width: parent.width * 7
+        width: previewHighlight.width
         anchors.top: previewHighlight.bottom
         /* anchors.leftMargin: Kirigami.Units.smallSpacing * 8 */
         anchors.topMargin: Kirigami.Units.smallSpacing * 3
@@ -57,7 +57,7 @@ Item {
         id: previewerMouse
         anchors.fill: parent
         hoverEnabled: true
-        onClicked: SlideObject.changeSlide(SlideModel.getItem(index))
+        onClicked: changeSlide(index)
         cursorShape: Qt.PointingHandCursor
         propagateComposedEvents: true
     }
@@ -70,18 +70,4 @@ Item {
                 previewSlidesList.positionViewAtIndex(index, ListView.Contain);
         }
     }
-
-    function changeSlideAndIndex(serviceItem, index) {
-        // TODO
-        console.log("Item: " + serviceItem.index + " is " + serviceItem.active);
-        if (!serviceItem.active) {
-            changeServiceItem(serviceItem.index)
-            previewSlidesList.currentIndex = serviceItem.index;
-        }
-        console.log("Slide Index is: " + index);
-        if (outerModelData.slideNumber === 0)
-            return;
-        SlideObject.changeSlideIndex(index);
-        console.log("New slide index is: " + SlideObject.slideIndex);
-    }
 }