Keybinding for switch-window
Minor changes