removing mapView cruft, fixing bug of moving map when layout changes