Add better functionality for map view.