Update some keybindings to vim-style