Move keybindings around to better places