Keybindings improvement and minor changes