Removed vi-mode
Added comfortable menu complete (as in vi-mode)