Keyboard shortcut refactoring and visuals