Re-arranged some keybindings for consistency.