Improved Keyboard and mouse controls