diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix
index fed2ac1..a005a60 100644
--- a/modules/user/hyprland.nix
+++ b/modules/user/hyprland.nix
@@ -90,7 +90,7 @@ in {
       ];
 
       workspace = [
-        "w[t1], gapsout:10 0 0, gapsin:0"
+        "w[t1], gapsout:0"
       ];
 
       windowrule = [
@@ -127,7 +127,7 @@ in {
         "$mainMod, F, togglefloating,"
         "$mainMod, D, exec, fuzzel"
         "$mainMod, P, pseudo, # dwindle"
-        "$mainMod, J, togglesplit, # dwindle"
+        "$mainMod, J, layoutmsg, togglesplit, # dwindle"
 
         # Move focus with mainMod + arrow keys
         "$mainMod, left,  movefocus, l"
diff --git a/modules/user/yazi.nix b/modules/user/yazi.nix
index 7d538f4..a26004d 100644
--- a/modules/user/yazi.nix
+++ b/modules/user/yazi.nix
@@ -4,7 +4,7 @@
 	];
 
 	wayland.windowManager.hyprland.settings.windowrule = [
-		"match:class dragon-drop, move onscreen cursor -50% -50%"
+		"match:class dragon-drop, move cursor_x-window_w/2 cursor_y-window_h/2"
 	];
 
 	programs.yazi = {
diff --git a/user/common.nix b/user/common.nix
index 224ec42..e9f0abb 100644
--- a/user/common.nix
+++ b/user/common.nix
@@ -57,7 +57,7 @@
 
   services.greetd = let
     tuigreet = lib.getExe pkgs.tuigreet;
-    session = lib.getExe inputs.hyprland.packages.${pkgs.system}.default;
+    session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland";
   in {
     enable = true;
     settings = {