Improved UI and restored old style joystick