Added map view and segmented control functionality