diff --git a/niri/cfg/keybinds.kdl b/niri/cfg/keybinds.kdl
index edd20a4..2d8bb74 100644
--- a/niri/cfg/keybinds.kdl
+++ b/niri/cfg/keybinds.kdl
@@ -6,15 +6,17 @@ binds {
     // ─── noctalia-shell keybinds ───
     // https://docs.noctalia.dev/getting-started/keybinds/
 
-    Mod+Shift+ESCAPE                     { show-hotkey-overlay; }
+    //Mod+Shift+ESCAPE    { show-hotkey-overlay; }
+
+    Mod+h               { show-hotkey-overlay; }
     Mod+Shift+S	{ spawn-sh "flameshot gui"; }
 
     // ─── Applications ───
-    Mod+Return                          hotkey-overlay-title="Open Terminal: Alacritty" { spawn "alacritty"; }
-    Mod+CTRL+Return                     hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
-    Mod+Space                     hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
-    Mod+B                               hotkey-overlay-title="Open Browser: helium" { spawn "helium-browser"; }
-    Mod+ALT+L                           hotkey-overlay-title="Lock Screen: noctalia lock" { spawn-sh "qs -c noctalia-shell ipc call lockScreen lock"; }
+    Mod+Return                         hotkey-overlay-title="Open Terminal: Alacritty" { spawn "alacritty"; }
+    //Mod+CTRL+Return                     hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
+    Mod+Space                          hotkey-overlay-title="Open App Launcher: noctalia launcher" { spawn-sh "qs -c noctalia-shell ipc call launcher toggle"; }
+    Mod+B                              hotkey-overlay-title="Open Browser: helium" { spawn "helium-browser"; }
+    Mod+ALT+L                          hotkey-overlay-title="Lock Screen: noctalia lock" { spawn-sh "qs -c noctalia-shell ipc call lockScreen lock"; }
     Mod+Shift+Q                        hotkey-overlay-title="Session Menu: noctalia sessionMenu" { spawn-sh "qs -c noctalia-shell ipc call sessionMenu toggle"; }
 
     // Please choose your own file manager.
@@ -35,25 +37,35 @@ binds {
     XF86MonBrightnessDown               allow-when-locked=true { spawn-sh "qs -c noctalia-shell ipc call brightness decrease"; }
 
     // ─── Window Movement and Focus ───
+    Alt+H                               { focus-column-left; }
+    Alt+L                               { focus-column-right; }
+    Alt+J				{ focus-workspace-down; }
+    Alt+K				{ focus-workspace-up; }
+
+    Alt+Shift+H                         { move-column-left; }
+    Alt+Shift+L                         { move-column-right; }
+    Alt+Shift+J                         { move-column-to-workspace-down; }
+    Alt+Shift+K                         { move-column-to-workspace-up; }
+
     Mod+Q                               { close-window; }
 
-    Mod+Left                            { focus-column-left; }
-    Mod+H                               { focus-column-left; }
-    Mod+Right                           { focus-column-right; }
-    Mod+L                               { focus-column-right; }
-    Mod+Up                              { focus-window-up; }
-    Mod+K                               { focus-window-up; }
-    Mod+Down                            { focus-window-down; }
-    Mod+J                               { focus-window-down; }
+    // Mod+Left                            { focus-column-left; }
+    // Mod+H                               { focus-column-left; }
+    // Mod+Right                           { focus-column-right; }
+    // Mod+L                               { focus-column-right; }
+    // Mod+Up                              { focus-window-up; }
+    // Mod+K                               { focus-window-up; }
+    // Mod+Down                            { focus-window-down; }
+    // Mod+J                               { focus-window-down; }
 
-    Mod+CTRL+Left                       { move-column-left; }
-    Mod+CTRL+H                          { move-column-left; }
-    Mod+CTRL+Right                      { move-column-right; }
-    Mod+CTRL+L                          { move-column-right; }
-    Mod+CTRL+UP                         { move-window-up; }
-    Mod+CTRL+K                          { move-window-up; }
-    Mod+CTRL+Down                       { move-window-down; }
-    Mod+CTRL+J                          { move-window-down; }
+    // Mod+CTRL+Left                       { move-column-left; }
+    // Mod+CTRL+H                          { move-column-left; }
+    // Mod+CTRL+Right                      { move-column-right; }
+    // Mod+CTRL+L                          { move-column-right; }
+    // Mod+CTRL+UP                         { move-window-up; }
+    // Mod+CTRL+K                          { move-window-up; }
+    // Mod+CTRL+Down                       { move-window-down; }
+    // Mod+CTRL+J                          { move-window-down; }
 
     Mod+Home                            { focus-column-first; }
     Mod+End                             { focus-column-last; }
@@ -62,29 +74,29 @@ binds {
 
     Mod+Shift+Left                      { focus-monitor-left; }
     Mod+Shift+Right                     { focus-monitor-right; }
-    Mod+Shift+UP                        { focus-monitor-up; }
+    Mod+Shift+Up                        { focus-monitor-up; }
     Mod+Shift+Down                      { focus-monitor-down; }
 
-    Mod+Shift+CTRL+Left                 { move-column-to-monitor-left; }
-    Mod+Shift+CTRL+Right                { move-column-to-monitor-right; }
-    Mod+Shift+CTRL+UP                   { move-column-to-monitor-up; }
-    Mod+Shift+CTRL+Down                 { move-column-to-monitor-down; }
+    // Mod+Shift+CTRL+Left                 { move-column-to-monitor-left; }
+    // Mod+Shift+CTRL+Right                { move-column-to-monitor-right; }
+    // Mod+Shift+CTRL+UP                   { move-column-to-monitor-up; }
+    // Mod+Shift+CTRL+Down                 { move-column-to-monitor-down; }
 
     // ─── Workspace Switching ───
-    Mod+WheelScrollDown                 cooldown-ms=150 { focus-workspace-down; }
-    Mod+WheelScrollUp                   cooldown-ms=150 { focus-workspace-up; }
-    Mod+CTRL+WheelScrollDown            cooldown-ms=150 { move-column-to-workspace-down; }
-    Mod+CTRL+WheelScrollUp              cooldown-ms=150 { move-column-to-workspace-up; }
+    // Mod+WheelScrollDown                 cooldown-ms=150 { focus-workspace-down; }
+    // Mod+WheelScrollUp                   cooldown-ms=150 { focus-workspace-up; }
+    // Mod+CTRL+WheelScrollDown            cooldown-ms=150 { move-column-to-workspace-down; }
+    // Mod+CTRL+WheelScrollUp              cooldown-ms=150 { move-column-to-workspace-up; }
 
-    Mod+WheelScrollRight                { focus-column-right; }
-    Mod+WheelScrollLeft                 { focus-column-left; }
-    Mod+CTRL+WheelScrollRight           { move-column-right; }
-    Mod+CTRL+WheelScrollLeft            { move-column-left; }
+    // Mod+WheelScrollRight                { focus-column-right; }
+    // Mod+WheelScrollLeft                 { focus-column-left; }
+    // Mod+CTRL+WheelScrollRight           { move-column-right; }
+    // Mod+CTRL+WheelScrollLeft            { move-column-left; }
 
-    Mod+Shift+WheelScrollDown           { focus-column-right; }
-    Mod+Shift+WheelScrollUp             { focus-column-left; }
-    Mod+CTRL+Shift+WheelScrollDown      { move-column-right; }
-    Mod+CTRL+Shift+WheelScrollUp        { move-column-left; }
+    // Mod+Shift+WheelScrollDown           { focus-column-right; }
+    // Mod+Shift+WheelScrollUp             { focus-column-left; }
+    // Mod+CTRL+Shift+WheelScrollDown      { move-column-right; }
+    // Mod+CTRL+Shift+WheelScrollUp        { move-column-left; }
 
     Alt+1                               { focus-workspace 1; }
     Alt+2                               { focus-workspace 2; }
diff --git a/niri/cfg/layout.kdl b/niri/cfg/layout.kdl
index b66d29a..67c79d2 100644
--- a/niri/cfg/layout.kdl
+++ b/niri/cfg/layout.kdl
@@ -1,6 +1,6 @@
     layout {
         gaps 16 // Gap between windows
-        center-focused-column "always" // Don’t auto-center focused column
+        center-focused-column "on-overflow" // Don’t auto-center focused column
 
         background-color "transparent" // <- needed for noctalia-shell to set wallpaper
 
diff --git a/noctalia/settings.json b/noctalia/settings.json
index 3416b91..ae82579 100644
--- a/noctalia/settings.json
+++ b/noctalia/settings.json
@@ -25,7 +25,7 @@
         "showIconBackground": false,
         "sortByMostUsed": true,
         "terminalCommand": "alacritty -e",
-        "viewMode": "list"
+        "viewMode": "grid"
     },
     "audio": {
         "mprisBlacklist": [