Added more functionality to the Map View