diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04ab285..682132f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,14 +31,17 @@ find_package(CaskServer REQUIRED)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR})
+    ${CMAKE_CURRENT_SOURCE_DIR}/code)
 
 set(cask_SRCS
     main.cpp
     code/models/zpacesmodel.cpp
     code/models/surfacesmodel.cpp
     code/controllers/zpaces.cpp
+
     code/controllers/zpace.cpp
+    code/controllers/zpace.h
+
     code/models/tasksmodel.cpp
     code/controllers/task.cpp
     code/controllers/abstractwindow.cpp
diff --git a/src/code/models/tasksmodel.cpp b/src/code/models/tasksmodel.cpp
index a984ad8..8783ebc 100644
--- a/src/code/models/tasksmodel.cpp
+++ b/src/code/models/tasksmodel.cpp
@@ -168,7 +168,7 @@ void TasksModel::addTask(Task *task)
     connect(task, &Task::closed, this, [this, task]()
     {
         this->removeTask(indexOf(task));
-    }, Qt::UniqueConnection);
+    });
 }
 
 Task *TasksModel::findTask(const QString &id)
diff --git a/src/code/models/zpacesmodel.cpp b/src/code/models/zpacesmodel.cpp
index 322ae35..fb46301 100644
--- a/src/code/models/zpacesmodel.cpp
+++ b/src/code/models/zpacesmodel.cpp
@@ -164,7 +164,7 @@ Zpace *ZpacesModel::createZpace()
     connect(newZpace, &Zpace::closed, this, [this, newZpace]
     {
        this->removeZpace(indexOf(newZpace));
-    }, Qt::UniqueConnection);
+    });
 
     return newZpace;
 }
diff --git a/src/qml/CaskScreen.qml b/src/qml/CaskScreen.qml
index 327138b..b9b0ed3 100644
--- a/src/qml/CaskScreen.qml
+++ b/src/qml/CaskScreen.qml
@@ -230,22 +230,23 @@ WaylandOutput
                 ]
 
                 Keys.enabled: true
-                Keys.onPressed: {
-                    if (event.key == Qt.Key_Left) {
-                        console.log("move left");
-                        dock.launcher.toggle()
-
-                        event.accepted = true;
-                    }
-
-                    if((event.key === Qt.Key_Meta))
-                    {
-                        console.log("move meta");
-
-                        dock.launcher.toggle()
-                        event.accepted = true
-                    }
-                }
+                Keys.onPressed: (event) =>
+                                {
+                                    if (event.key == Qt.Key_Left) {
+                                        console.log("move left");
+                                        dock.launcher.toggle()
+
+                                        event.accepted = true;
+                                    }
+
+                                    if((event.key === Qt.Key_Meta))
+                                    {
+                                        console.log("move meta");
+
+                                        dock.launcher.toggle()
+                                        event.accepted = true
+                                    }
+                                }
 
                 Shortcut
                 {