New Maps + fixes in gamepad