some adaptions on the map view stuff