Added better mode switching with Keyboard