app/src/main/kotlin/de/timklge/karoopowerbar/screens/MainScreen.kt

@@ -276,25 +276,6 @@ fun MainScreen(onFinish: () -> Unit) {
                 .verticalScroll(rememberScrollState())
                 .fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(10.dp)) {
 
-                FilledTonalButton(modifier = Modifier
-                    .fillMaxWidth()
-                    .height(60.dp),
-                    onClick = {
-                        topBarDialogVisible = true
-                    }) {
-                    Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp))
-                    Spacer(modifier = Modifier.width(5.dp))
-                    Text("Top Bar: ${topSelectedSource.label}", modifier = Modifier.weight(1.0f))
-                }
-
-                if (topBarDialogVisible){
-                    BarSelectDialog(topSelectedSource, onHide = { topBarDialogVisible = false }, onSelect = { selected ->
-                        topSelectedSource = selected
-                        coroutineScope.launch { updateSettings() }
-                        topBarDialogVisible = false
-                    })
-                }
-
                 FilledTonalButton(modifier = Modifier
                     .fillMaxWidth()
                     .height(60.dp),
@@ -314,6 +295,25 @@ fun MainScreen(onFinish: () -> Unit) {
                     })
                 }
 
+                FilledTonalButton(modifier = Modifier
+                    .fillMaxWidth()
+                    .height(60.dp),
+                    onClick = {
+                        topBarDialogVisible = true
+                    }) {
+                    Icon(Icons.Default.Build, contentDescription = "Select", modifier = Modifier.size(20.dp))
+                    Spacer(modifier = Modifier.width(5.dp))
+                    Text("Top Bar: ${topSelectedSource.label}", modifier = Modifier.weight(1.0f))
+                }
+
+                if (topBarDialogVisible){
+                    BarSelectDialog(topSelectedSource, onHide = { topBarDialogVisible = false }, onSelect = { selected ->
+                        topSelectedSource = selected
+                        coroutineScope.launch { updateSettings() }
+                        topBarDialogVisible = false
+                    })
+                }
+
                 apply {
                     val dropdownOptions = CustomProgressBarBarSize.entries.toList().map { unit -> DropdownOption(unit.id, unit.label) }
                     val dropdownInitialSelection by remember(barBarSize) {
@@ -494,7 +494,7 @@ fun MainScreen(onFinish: () -> Unit) {
                         coroutineScope.launch { updateSettings() }
                     })
                     Spacer(modifier = Modifier.width(10.dp))
-                    Text("Solid background")
+                    Text("Opaque background")
                 }
 
                 Row(verticalAlignment = Alignment.CenterVertically) {