diff --git a/android/app/build.gradle b/android/app/build.gradle
index dbf733f1..334526e2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -141,7 +141,7 @@ android {
         applicationId "com.betterrail"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
+        versionCode 26
         versionName "1.7.0"
         multiDexEnabled true
     }
diff --git a/app/navigators/main-navigator.tsx b/app/navigators/main-navigator.tsx
index 5e29f67b..be38262c 100644
--- a/app/navigators/main-navigator.tsx
+++ b/app/navigators/main-navigator.tsx
@@ -71,7 +71,7 @@ export function MainNavigator() {
         name="routeDetails"
         component={RouteDetailsScreen}
         options={{ headerTransparent: true, headerTintColor: "lightgrey", ...TransitionPresets.SlideFromRightIOS }}
-        sharedElements={() => ["route-header"]}
+        sharedElements={() => Platform.select({ ios: ["route-header"], android: [] })}
       />
     </Stack.Navigator>
   )
diff --git a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme
index 4d251d32..7ee13601 100644
--- a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme	
+++ b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail (Complication).xcscheme	
@@ -55,10 +55,8 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
@@ -66,7 +64,7 @@
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -75,10 +73,8 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
@@ -86,16 +82,7 @@
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
-            BuildableName = "WatchBetterRail.app"
-            BlueprintName = "WatchBetterRail"
-            ReferencedContainer = "container:BetterRail.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme
index e26afa21..7c0d3860 100644
--- a/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme
+++ b/ios/BetterRail.xcodeproj/xcshareddata/xcschemes/WatchBetterRail.xcscheme
@@ -54,10 +54,8 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
@@ -65,7 +63,7 @@
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,10 +71,8 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/Better Rail">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
@@ -84,16 +80,7 @@
             BlueprintName = "WatchBetterRail"
             ReferencedContainer = "container:BetterRail.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C17FA4B62709EFBB003797D9"
-            BuildableName = "WatchBetterRail.app"
-            BlueprintName = "WatchBetterRail"
-            ReferencedContainer = "container:BetterRail.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/ios/WatchBetterRail Extension/Models/FavoritesModel.swift b/ios/WatchBetterRail Extension/Models/FavoritesModel.swift
index 7db79e66..238ebbe0 100644
--- a/ios/WatchBetterRail Extension/Models/FavoritesModel.swift	
+++ b/ios/WatchBetterRail Extension/Models/FavoritesModel.swift	
@@ -8,8 +8,8 @@ struct FavoriteRoute: Identifiable {
 }
 
 #if DEBUG
-let fav = FavoriteRoute(id: 0, origin: stations[2], destination: stations[65])
-let fav2 = FavoriteRoute(id: 1, origin: stations[6], destination: stations[8])
+let fav = FavoriteRoute(id: 0, origin: stations[21], destination: stations[65])
+let fav2 = FavoriteRoute(id: 1, origin: stations[65], destination: stations[8])
 #endif
 
 struct FavoritesModel {