diff --git a/app/components/map/BusMapIcon.tsx b/app/components/map/BusMapIcon.tsx
index d946284..97584bd 100644
--- a/app/components/map/BusMapIcon.tsx
+++ b/app/components/map/BusMapIcon.tsx
@@ -30,7 +30,9 @@ const BusMapIcon: React.FC<Props> = ({ heading, tintColor, active }) => {
       backgroundColor: active ? tintColor : tintColor + "70",
       borderColor: borderColor,
       borderWidth: borderColor ? 2 : 0,
-      transform: getRotationProp(heading)
+      transform: getRotationProp(heading),
+      zIndex: active ? 800 : 500,
+      elevation: active ? 800 : 500
     }}>
       <MaterialCommunityIcons name="bus" size={18} color={active ? "white" : "#ffffffcc"} style={{transform: getRotationProp(-heading-90)}} />
     </View>
diff --git a/app/components/map/MapView.tsx b/app/components/map/MapView.tsx
index c35a34c..608a1af 100644
--- a/app/components/map/MapView.tsx
+++ b/app/components/map/MapView.tsx
@@ -133,7 +133,7 @@ const Map: React.FC = () => {
         <>
             <MapView
                 showsUserLocation={true}
-                style={{ width: "100%", height: "100%" }}
+                style={{ width: "100%", height: "100%", zIndex: 100, elevation: 100 }}
                 ref={mapViewRef} rotateEnabled={false}
                 initialRegion={defaultMapRegion}
                 onPanDrag={() => setIsViewCenteredOnUser(false)}
@@ -168,7 +168,9 @@ const Map: React.FC = () => {
                                     strokeColor={active ? lineColor : lineColor + "60"}
                                     strokeWidth={5}
                                     tappable={true}
-                                    onPress={() => selectRoute(drawnRoute, directionId)}
+                                    onPress={() => selectRoute(drawnRoute)}
+                                    style={{ zIndex: active ? 600 : 300,
+                                             elevation: active ? 600 : 300 }}
                                 />
                             )
                         })
@@ -222,7 +224,7 @@ const Map: React.FC = () => {
                     overflow: 'hidden', 
                     borderRadius: 8, 
                     backgroundColor: theme.background, 
-                    padding: 12 
+                    padding: 12, 
                 }} 
                 onPress={() => recenterView()}
             >
diff --git a/app/components/map/markers/StopMarker.tsx b/app/components/map/markers/StopMarker.tsx
index 6d6dd8d..9ce858c 100644
--- a/app/components/map/markers/StopMarker.tsx
+++ b/app/components/map/markers/StopMarker.tsx
@@ -44,6 +44,8 @@ const StopMarker: React.FC<Props> = ({ point, tintColor, route, direction, isCal
                     borderRadius: 9999,
                     backgroundColor: active ? tintColor : tintColor + "60",
                     borderColor: active ? getLighterColor(tintColor) : getLighterColor(tintColor) + "60",
+                    zIndex: active ? 700 : 400,
+                    elevation: active ? 700 : 400,
                 }}
             />
             <StopCallout