Improve map view