Hotkeys improved