diff --git a/app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherScreen.kt b/app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherScreen.kt
index 0ba20a7bd..8f34b60bd 100644
--- a/app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherScreen.kt
+++ b/app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherScreen.kt
@@ -76,10 +76,10 @@ internal fun LauncherScreen(
             items(state.entries) { entry ->
                 LauncherItem(
                     item = entry,
-                    modifier = Modifier.padding(24.dp),
                     onClick = OnClick("launcher_goto", mapOf("screen" to entry.screen)) {
                         eventSink(NavEvent.GoTo(entry.screen))
                     },
+                    modifier = Modifier.padding(24.dp),
                 )
             }
         }
@@ -116,8 +116,8 @@ private fun LauncherTopAppBar(modifier: Modifier = Modifier) {
 @ExperimentalMaterial3Api
 private fun LauncherItem(
     item: LauncherScreen.State.Item,
-    modifier: Modifier = Modifier,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Card(
         modifier = modifier.clickable(
diff --git a/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/BoxSetListScreen.kt b/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/BoxSetListScreen.kt
index 73416df80..543a5697e 100644
--- a/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/BoxSetListScreen.kt
+++ b/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/BoxSetListScreen.kt
@@ -77,17 +77,20 @@ internal fun BoxSetListScreen(
 private fun BoxSetListScreen(
     boxSetList: ImmutableList<BoxSet>,
     contentPadding: PaddingValues,
+    onClick: (BoxSet) -> Unit,
     modifier: Modifier = Modifier,
     columnCount: Int = DEFAULT_COLUMN_COUNT,
-    onClick: (BoxSet) -> Unit,
 ) {
     LazyVerticalGrid(
         columns = GridCells.Fixed(columnCount),
         modifier = modifier.padding(4.dp),
         contentPadding = contentPadding,
     ) {
-        items(boxSetList) {
-            BoxSetCard(it) { onClick(it) }
+        items(boxSetList) { boxSet ->
+            BoxSetCard(
+                boxSet = boxSet,
+                onClick = { onClick(boxSet) },
+            )
         }
     }
 }
@@ -96,8 +99,8 @@ private fun BoxSetListScreen(
 @ExperimentalMaterial3Api
 private fun BoxSetCard(
     boxSet: BoxSet,
-    modifier: Modifier = Modifier,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
         modifier = modifier
diff --git a/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/DetailsScreen.kt b/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/DetailsScreen.kt
index 93f517d7c..aba7af9dc 100644
--- a/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/DetailsScreen.kt
+++ b/dominion-app/src/commonMain/kotlin/io/ashdavies/dominion/DetailsScreen.kt
@@ -133,9 +133,9 @@ private fun BackIconButton(onClick: () -> Unit) {
 private fun DetailsScreen(
     cards: ImmutableList<Card>,
     contentPadding: PaddingValues,
+    onClick: (Card) -> Unit,
     modifier: Modifier = Modifier,
     columnCount: Int = DEFAULT_COLUMN_COUNT,
-    onClick: (Card) -> Unit,
 ) {
     LazyVerticalGrid(
         columns = GridCells.Fixed(columnCount),
diff --git a/map-routes/src/androidMain/kotlin/io/ashdavies/routes/RouteMap.android.kt b/map-routes/src/androidMain/kotlin/io/ashdavies/routes/RouteMap.android.kt
index 00912c954..2bf367091 100644
--- a/map-routes/src/androidMain/kotlin/io/ashdavies/routes/RouteMap.android.kt
+++ b/map-routes/src/androidMain/kotlin/io/ashdavies/routes/RouteMap.android.kt
@@ -22,8 +22,8 @@ private const val CAMERA_ANIMATE_DURATION = 2_000
 @Composable
 internal actual fun RouteMap(
     state: RouteMapState,
-    modifier: Modifier,
     onEndPosition: (LatLng) -> Unit,
+    modifier: Modifier,
 ) {
     val cameraPositionState = rememberCameraPositionState()
 
diff --git a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteFactory.kt b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteFactory.kt
index 314281244..e172b82dc 100644
--- a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteFactory.kt
+++ b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteFactory.kt
@@ -13,6 +13,10 @@ public fun Circuit.Builder.addRoutePresenter(context: PlatformContext): Circuit.
 
 public fun Circuit.Builder.addRouteUi(): Circuit.Builder {
     return addUi<RouteScreen, RouteScreen.State> { state, modifier ->
-        RouteScreen(state, modifier) { state.eventSink(RouteScreen.Event.OnEndPosition(it)) }
+        RouteScreen(
+            state = state,
+            onEndPosition = { state.eventSink(RouteScreen.Event.OnEndPosition(it)) },
+            modifier = modifier,
+        )
     }
 }
diff --git a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteMap.kt b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteMap.kt
index 2b4b271d0..5a4fe521e 100644
--- a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteMap.kt
+++ b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteMap.kt
@@ -19,8 +19,8 @@ internal data class RouteMapState(
 @Composable
 internal expect fun RouteMap(
     state: RouteMapState,
-    modifier: Modifier = Modifier,
     onEndPosition: (LatLng) -> Unit,
+    modifier: Modifier = Modifier,
 )
 
 internal data class LatLng(
diff --git a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteScreen.kt b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteScreen.kt
index dea00813a..8ee98410e 100644
--- a/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteScreen.kt
+++ b/map-routes/src/commonMain/kotlin/io/ashdavies/routes/RouteScreen.kt
@@ -25,12 +25,12 @@ internal object RouteScreen : Screen {
 @Composable
 internal fun RouteScreen(
     state: RouteScreen.State,
-    modifier: Modifier = Modifier,
     onEndPosition: (LatLng) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     RouteMap(
         state = state.mapState,
-        modifier = modifier,
         onEndPosition = onEndPosition,
+        modifier = modifier,
     )
 }
diff --git a/map-routes/src/jvmMain/kotlin/io/ashdavies/routes/RouteMap.jvm.kt b/map-routes/src/jvmMain/kotlin/io/ashdavies/routes/RouteMap.jvm.kt
index c5f605fbd..7f0dc5f06 100644
--- a/map-routes/src/jvmMain/kotlin/io/ashdavies/routes/RouteMap.jvm.kt
+++ b/map-routes/src/jvmMain/kotlin/io/ashdavies/routes/RouteMap.jvm.kt
@@ -7,8 +7,8 @@ import androidx.compose.ui.Modifier
 @Composable
 internal actual fun RouteMap(
     state: RouteMapState,
-    modifier: Modifier,
     onEndPosition: (LatLng) -> Unit,
+    modifier: Modifier,
 ) {
     Text("Unsupported Platform")
 }