Fixed some issues with map view