Improved controls for both desktop and android