Change map view controller. Bug fixes.