More progress on map view