vim: nagivation improvements