Combined mapViews and refactored locations to use collectionViews