diff --git a/Sources/SpeziDevicesUI/Measurements/ConfirmMeasurementButton.swift b/Sources/SpeziDevicesUI/Measurements/ConfirmMeasurementButton.swift
index 4380ddf..c3f7385 100644
--- a/Sources/SpeziDevicesUI/Measurements/ConfirmMeasurementButton.swift
+++ b/Sources/SpeziDevicesUI/Measurements/ConfirmMeasurementButton.swift
@@ -33,7 +33,7 @@ struct DiscardButton: View {
 
 
 struct ConfirmMeasurementButton: View {
-    private let confirm: () async throws -> Void
+    private let confirm: @MainActor () async throws -> Void
     private let discard: () -> Void
 
     @ScaledMetric private var buttonHeight: CGFloat = 38
@@ -55,7 +55,7 @@ struct ConfirmMeasurementButton: View {
         }
     }
 
-    init(viewState: Binding<ViewState>, confirm: @escaping () async throws -> Void, discard: @escaping () -> Void) {
+    init(viewState: Binding<ViewState>, confirm: @escaping @MainActor () async throws -> Void, discard: @escaping () -> Void) {
         self._viewState = viewState
         self.confirm = confirm
         self.discard = discard
diff --git a/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift b/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift
index 9f4973c..f5f0ba7 100644
--- a/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift
+++ b/Sources/SpeziDevicesUI/Scanning/NearbyDeviceRow.swift
@@ -46,6 +46,7 @@ public struct NearbyDeviceRow: View {
                 HStack {
                     ListRow(verbatim: peripheral.label) {
                         deviceSecondaryLabel
+                            .foregroundStyle(.secondary)
                     }
                     if peripheral.state == .connecting || peripheral.state == .disconnecting {
                         ProgressView()
@@ -53,6 +54,7 @@ public struct NearbyDeviceRow: View {
                     }
                 }
             }
+                .foregroundStyle(.primary)
 
             if showDetailsButton {
                 Button(action: deviceDetailsAction) {