Some changes for map view