Improve add some keybindings