diff --git a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
index a205bdf..5852c60 100644
--- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
@@ -8,10 +8,10 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
-local width = hs.screen.mainScreen():fullFrame().w
+local screen = hs.screen.primaryScreen()
 local switcherWidth = 500
 obj.canvas = hs.canvas.new({
-    x = width / 2 - switcherWidth / 2,
+    x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
     y = 1,
     h = 3,
     w = switcherWidth,
diff --git a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
index 089e0cc..a58da39 100644
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua
@@ -56,7 +56,7 @@ function obj:init()
         local frame = win:frame()
         -- maximize if possible
         local max = win:screen():fullFrame()
-        frame.x = max.w / 2
+        frame.x = (max.x * 2 + max.w) / 2
         frame.y = max.y
         frame.w = max.w / 2
         frame.h = max.h
diff --git a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
index 4a0f1e6..c398457 100644
--- a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
+++ b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua
@@ -51,6 +51,7 @@ local function worklayout()
         local laptop = {
             { "Firefox",  nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
             { "Obsidian", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            { "Calendar", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
         }
         local layout = concat(left, right, laptop)
         hs.layout.apply(layout)