Refactor Joystick to MVC
Fixed merge conflicts