Improved hotkeys, added toggle button