new map view
merging elton's changes
fixing mapa view