cleaned up map view, added transitions to/from map view