Improved map view a bit