Changed layout.
Removed unused SDL joystick management as it's not used by this version