Small changes to Map View
Merge