Joystick removed and ugly rebase

Removed joystick from control_panel because users are not going to have it. Apologies for ugly rebase.