Fix Joystick mapping.
Improve demo app.