diff --git a/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt b/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
index ea40ccf..44e252f 100644
--- a/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
+++ b/composeApp/src/androidMain/kotlin/moe/lava/banksia/native/maps/Maps.android.kt
@@ -43,7 +43,7 @@ import com.google.maps.android.compose.rememberMarkerState
 import kotlinx.coroutines.flow.Flow
 import moe.lava.banksia.R
 import moe.lava.banksia.native.BanksiaTheme
-import moe.lava.banksia.ui.BoxedValue
+import moe.lava.banksia.util.BoxedValue
 import com.google.android.gms.maps.model.CameraPosition as GoogleCameraPosition
 
 fun Point.toLatLng(): LatLng = LatLng(this.lat, this.lng)
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt b/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
index 31e2137..5d71557 100644
--- a/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
+++ b/composeApp/src/commonMain/kotlin/moe/lava/banksia/native/maps/Maps.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import kotlinx.coroutines.flow.Flow
-import moe.lava.banksia.ui.BoxedValue
+import moe.lava.banksia.util.BoxedValue
 
 enum class MarkerType {
     GENERIC_STOP,
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/BanksiaViewModel.kt b/composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/BanksiaViewModel.kt
index 1a86745..69c2199 100644
--- a/composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/BanksiaViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/BanksiaViewModel.kt
@@ -27,7 +27,8 @@ import moe.lava.banksia.native.maps.Marker
 import moe.lava.banksia.native.maps.MarkerType
 import moe.lava.banksia.native.maps.Point
 import moe.lava.banksia.native.maps.Polyline
-import moe.lava.banksia.ui.BoxedValue.Companion.box
+import moe.lava.banksia.util.BoxedValue
+import moe.lava.banksia.util.BoxedValue.Companion.box
 
 data class RouteState(
     val route: PtvRoute,
@@ -50,14 +51,6 @@ data class BanksiaViewState(
     val polylines: List<Polyline> = listOf(),
 )
 
-class BoxedValue<T>(val value: T) {
-    operator fun component1() = value
-
-    companion object {
-        fun <T> T.box() = BoxedValue(this)
-    }
-}
-
 class BanksiaViewModel : ViewModel() {
     private val iState = MutableStateFlow(BanksiaViewState())
     val state: StateFlow<BanksiaViewState> = iState.asStateFlow()
@@ -113,6 +106,7 @@ class BanksiaViewModel : ViewModel() {
         iState.update {
             it.copy(
                 routeState = routeState,
+                stopState = null,
                 markers = listOf(),
                 polylines = listOf(),
             )
diff --git a/composeApp/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt b/composeApp/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt
new file mode 100644
index 0000000..0d6896d
--- /dev/null
+++ b/composeApp/src/commonMain/kotlin/moe/lava/banksia/util/BoxedValue.kt
@@ -0,0 +1,9 @@
+package moe.lava.banksia.util
+
+class BoxedValue<T>(val value: T) {
+    operator fun component1() = value
+
+    companion object {
+        fun <T> T.box() = BoxedValue(this)
+    }
+}
diff --git a/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt b/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
index f79a722..c197e43 100644
--- a/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
+++ b/composeApp/src/iosMain/kotlin/moe/lava/banksia/native/maps/Maps.ios.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalWindowInfo
 import kotlinx.coroutines.flow.Flow
-import moe.lava.banksia.ui.BoxedValue
+import moe.lava.banksia.util.BoxedValue
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable