More hotkeys refactoring