Improved mapa view