Keybindings

Changed some keybindings and removed not working code.