Further improving the keybindings