Minor improvments to keybinding locations