Refactoring hotkeys and actions - PART I