Some joystick updates
Refactoring for joystick