correcting some bugs on map view