More work on reworking keybindings into nav