Improvments to Keybinds