Changed the map display

Changed the map and geolocation implementation.