Added button support from joystick