New portion of fixes(again hotkeys)