Added map view
Integrating Virginia's code (1)