Improved some keybindings in esc-mode-map