Fixed layouts and added info
Fixed joystick crash - bug still exists