Added map view and user location