Added Locations, map reset and my location