diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp
new file mode 100644
index 0000000..bc94aed
Binary files /dev/null and b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.Task.qml.kate-swp differ
diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp
new file mode 100644
index 0000000..b36ba37
Binary files /dev/null and b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/.main.qml.kate-swp differ
diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml
index a4593b5..7337907 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/MouseHandler.qml	
@@ -18,6 +18,7 @@ Item {
     property Item target
     property Item ignoredItem
     property bool moved: false
+    property bool isGroupDialog: false
 
     property alias hoveredItem: dropHandler.hoveredItem
     property alias handleWheelEvents: wheelHandler.active
@@ -65,12 +66,17 @@ Item {
                 return;
             }
 
-            var above = target.childAt(event.x, event.y);
+            //var above = target.childAt(event.x, event.y);
+            let above;
+            if (isGroupDialog) {
+                above = target.itemAt(event.x, event.y);
+            } else {
+                above = target.childAt(event.x, event.y);
+            }
 
             if (!above) {
                 hoveredItem = null;
                 activationTimer.stop();
-
                 return;
             }
 
@@ -101,9 +107,9 @@ Item {
                 var insertAt = TaskTools.insertIndexAt(above, event.x, event.y);
 
                 if (tasks.dragSource !== above && tasks.dragSource.itemIndex !== insertAt) {
-                    if (groupDialog.visible && groupDialog.visualParent) {
+                    if (!!tasks.groupDialog) {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt,
-                            tasksModel.makeModelIndex(groupDialog.visualParent.itemIndex));
+                            tasksModel.makeModelIndex(tasks.groupDialog.visualParent.itemIndex));
                     } else {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt);
                     }
@@ -115,6 +121,7 @@ Item {
                 hoveredItem = above;
                 activationTimer.restart();
             }
+            tasksModel.syncLaunchers();
         }
 
         onDragLeave: {
diff --git a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml
index 526bb09..9ce7aa0 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/org.kde.plasma.seventasks/contents/ui/Task.qml	
@@ -151,9 +151,10 @@ MouseArea {
             }
         } else {
             pressed = false;
+            //if(!ma.pressed) tasks.dragSource = null;
         }
 	hoverEnabled = true;
-        
+
     }
 
     onPressed: {
@@ -216,13 +217,14 @@ MouseArea {
         pressX = -1;
         pressY = -1;
 	hoverEnabled = true;
+
     }
     
     onPressAndHold: {
     }
     onPositionChanged: { //hoverEnabled: true, but this event still doesn't fire at all
                          //unless i am pressing the left mouse button for a short period of time
-        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) { 
+        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
             
             tasks.dragSource = task;
             dragHelper.startDrag(task, model.MimeType, model.MimeData,
@@ -231,6 +233,10 @@ MouseArea {
             pressY = -1;
             return;
         }
+        else
+        {
+            tasks.dragSource = null;
+        }
         
         //code for dragging the task around
         
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt
index 378479c..04380cb 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/build/install_manifest.txt	
@@ -23,8 +23,6 @@
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ToolTipInstance.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ToolTipWindowMouseArea.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/main.qml
-/usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/MenuBackend.qml
-/usr/share/plasma/plasmoids/org.kde.plasma.seventasks/contents/ui/ContextMenuBackend.qml
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/metadata.desktop
 /usr/share/plasma/plasmoids/org.kde.plasma.seventasks/metadata.json
 /usr/share/metainfo/org.kde.plasma.seventasks.appdata.xml
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml
index a4593b5..7337907 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/MouseHandler.qml	
@@ -18,6 +18,7 @@ Item {
     property Item target
     property Item ignoredItem
     property bool moved: false
+    property bool isGroupDialog: false
 
     property alias hoveredItem: dropHandler.hoveredItem
     property alias handleWheelEvents: wheelHandler.active
@@ -65,12 +66,17 @@ Item {
                 return;
             }
 
-            var above = target.childAt(event.x, event.y);
+            //var above = target.childAt(event.x, event.y);
+            let above;
+            if (isGroupDialog) {
+                above = target.itemAt(event.x, event.y);
+            } else {
+                above = target.childAt(event.x, event.y);
+            }
 
             if (!above) {
                 hoveredItem = null;
                 activationTimer.stop();
-
                 return;
             }
 
@@ -101,9 +107,9 @@ Item {
                 var insertAt = TaskTools.insertIndexAt(above, event.x, event.y);
 
                 if (tasks.dragSource !== above && tasks.dragSource.itemIndex !== insertAt) {
-                    if (groupDialog.visible && groupDialog.visualParent) {
+                    if (!!tasks.groupDialog) {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt,
-                            tasksModel.makeModelIndex(groupDialog.visualParent.itemIndex));
+                            tasksModel.makeModelIndex(tasks.groupDialog.visualParent.itemIndex));
                     } else {
                         tasksModel.move(tasks.dragSource.itemIndex, insertAt);
                     }
@@ -115,6 +121,7 @@ Item {
                 hoveredItem = above;
                 activationTimer.restart();
             }
+            tasksModel.syncLaunchers();
         }
 
         onDragLeave: {
diff --git a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml
index 526bb09..9ce7aa0 100644
--- a/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml	
+++ b/Plasma/Plasma Widgets/User/Task Icons/seventasks_src/src/package/contents/ui/Task.qml	
@@ -151,9 +151,10 @@ MouseArea {
             }
         } else {
             pressed = false;
+            //if(!ma.pressed) tasks.dragSource = null;
         }
 	hoverEnabled = true;
-        
+
     }
 
     onPressed: {
@@ -216,13 +217,14 @@ MouseArea {
         pressX = -1;
         pressY = -1;
 	hoverEnabled = true;
+
     }
     
     onPressAndHold: {
     }
     onPositionChanged: { //hoverEnabled: true, but this event still doesn't fire at all
                          //unless i am pressing the left mouse button for a short period of time
-        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) { 
+        if (pressX != -1 && mouse.buttons == Qt.LeftButton && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
             
             tasks.dragSource = task;
             dragHelper.startDrag(task, model.MimeType, model.MimeData,
@@ -231,6 +233,10 @@ MouseArea {
             pressY = -1;
             return;
         }
+        else
+        {
+            tasks.dragSource = null;
+        }
         
         //code for dragging the task around