Vim hotkeys improvements