Added padding to the map
Changed names of some state params
Various small fixes and adjustments