Fixed keybindings to be more logical