diff --git a/LoopFollow.xcodeproj/project.pbxproj b/LoopFollow.xcodeproj/project.pbxproj
index 5bd76cc2a..8bebe1deb 100644
--- a/LoopFollow.xcodeproj/project.pbxproj
+++ b/LoopFollow.xcodeproj/project.pbxproj
@@ -32,6 +32,8 @@
 		6589CC6C2E9E7D1600BB18FE /* GraphSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC5E2E9E7D1600BB18FE /* GraphSettingsView.swift */; };
 		6589CC6D2E9E7D1600BB18FE /* CalendarSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC582E9E7D1600BB18FE /* CalendarSettingsView.swift */; };
 		6589CC6E2E9E7D1600BB18FE /* SettingsMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC5F2E9E7D1600BB18FE /* SettingsMenuView.swift */; };
+		65A100012F5AA00000AA1001 /* UnitsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */; };
+		65A100032F5AA00000AA1002 /* UnitsConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */; };
 		6589CC6F2E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC572E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift */; };
 		6589CC712E9E814F00BB18FE /* AlarmSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC702E9E814F00BB18FE /* AlarmSelectionView.swift */; };
 		6589CC752E9EAFB700BB18FE /* SettingsMigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC742E9EAFB700BB18FE /* SettingsMigrationManager.swift */; };
@@ -437,6 +439,8 @@
 		6589CC5D2E9E7D1600BB18FE /* GeneralSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsView.swift; sourceTree = "<group>"; };
 		6589CC5E2E9E7D1600BB18FE /* GraphSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphSettingsView.swift; sourceTree = "<group>"; };
 		6589CC5F2E9E7D1600BB18FE /* SettingsMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsMenuView.swift; sourceTree = "<group>"; };
+		65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsSettingsView.swift; sourceTree = "<group>"; };
+		65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsConfigurationView.swift; sourceTree = "<group>"; };
 		6589CC602E9E7D1600BB18FE /* TabCustomizationModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabCustomizationModal.swift; sourceTree = "<group>"; };
 		6589CC702E9E814F00BB18FE /* AlarmSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmSelectionView.swift; sourceTree = "<group>"; };
 		6589CC742E9EAFB700BB18FE /* SettingsMigrationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsMigrationManager.swift; sourceTree = "<group>"; };
@@ -868,6 +872,8 @@
 				6589CC5E2E9E7D1600BB18FE /* GraphSettingsView.swift */,
 				657F98172F043D8100F732BD /* HomeContentView.swift */,
 				6589CC5F2E9E7D1600BB18FE /* SettingsMenuView.swift */,
+				65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */,
+				65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */,
 				6589CC602E9E7D1600BB18FE /* TabCustomizationModal.swift */,
 			);
 			path = Settings;
@@ -2077,6 +2083,8 @@
 				6589CC6C2E9E7D1600BB18FE /* GraphSettingsView.swift in Sources */,
 				6589CC6D2E9E7D1600BB18FE /* CalendarSettingsView.swift in Sources */,
 				6589CC6E2E9E7D1600BB18FE /* SettingsMenuView.swift in Sources */,
+				65A100012F5AA00000AA1001 /* UnitsSettingsView.swift in Sources */,
+				65A100032F5AA00000AA1002 /* UnitsConfigurationView.swift in Sources */,
 				657F98182F043D8100F732BD /* HomeContentView.swift in Sources */,
 				6589CC6F2E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift in Sources */,
 				DD493ADF2ACF22BB009A6922 /* SAge.swift in Sources */,
diff --git a/LoopFollow/Application/Base.lproj/Main.storyboard b/LoopFollow/Application/Base.lproj/Main.storyboard
index 11e4b1a72..6441edc6c 100644
--- a/LoopFollow/Application/Base.lproj/Main.storyboard
+++ b/LoopFollow/Application/Base.lproj/Main.storyboard
@@ -223,7 +223,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="xGF-Pj-QE0">
                                                                         <rect key="frame" x="102.66666666666666" y="0.0" width="92.666666666666657" height="45"/>
                                                                         <subviews>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est A1C:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WV0-Jy-FPs" userLabel="Est A1C:">
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est. A1C:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WV0-Jy-FPs" userLabel="Est. A1C:">
                                                                                 <rect key="frame" x="18.333333333333346" y="0.0" width="56.333333333333343" height="18"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                                 <nil key="textColor"/>
@@ -306,11 +306,13 @@
                         <outlet property="smallGraphHeightConstraint" destination="qmO-ga-QWl" id="VsZ-zJ-LsJ"/>
                         <outlet property="statsAvgBG" destination="jpA-Nb-pU7" id="Uo8-a4-Aus"/>
                         <outlet property="statsEstA1C" destination="7Jx-XF-1vS" id="4RD-nm-JxO"/>
+                        <outlet property="statsEstA1CTitle" destination="WV0-Jy-FPs" id="WnU-h8-2hf"/>
                         <outlet property="statsHighPercent" destination="HON-rt-8pC" id="283-3S-PCR"/>
                         <outlet property="statsInRangePercent" destination="7mH-Np-j0L" id="vUp-Pv-Mva"/>
                         <outlet property="statsLowPercent" destination="TzL-hn-9qu" id="0QR-Mz-KJe"/>
                         <outlet property="statsPieChart" destination="Hhh-F1-s1p" id="Rhh-Up-Kr0"/>
                         <outlet property="statsStdDev" destination="wAI-Tp-784" id="BUZ-lS-JfA"/>
+                        <outlet property="statsStdDevTitle" destination="iXC-Mz-I09" id="QHf-Q8-J7B"/>
                         <outlet property="statsView" destination="ikj-at-auF" id="7AQ-VA-Pw2"/>
                     </connections>
                 </viewController>
diff --git a/LoopFollow/Controllers/Graphs.swift b/LoopFollow/Controllers/Graphs.swift
index 0b272697f..caa746881 100644
--- a/LoopFollow/Controllers/Graphs.swift
+++ b/LoopFollow/Controllers/Graphs.swift
@@ -201,6 +201,12 @@ class TempTargetRenderer: LineChartRenderer {
 
 let ScaleXMax: Double = 150.0
 extension MainViewController {
+    private func graphRangeThresholds() -> (low: Double, high: Double) {
+        let low = 70.0
+        let high = UnitSettingsStore.shared.timeInRangeMode == .titr ? 140.0 : 180.0
+        return (low, high)
+    }
+
     func updateChartRenderers() {
         let tempTargetDataIndex = GraphDataIndex.tempTarget.rawValue
         let smbDataIndex = GraphDataIndex.smb.rawValue
@@ -621,15 +627,17 @@ extension MainViewController {
         // Clear limit lines so they don't add multiples when changing the settings
         BGChart.rightAxis.removeAllLimitLines()
 
+        let thresholds = graphRangeThresholds()
+
         // Add lower red line based on low alert value
         let ll = ChartLimitLine()
-        ll.limit = Storage.shared.lowLine.value
+        ll.limit = thresholds.low
         ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ll)
 
         // Add upper yellow line based on low alert value
         let ul = ChartLimitLine()
-        ul.limit = Storage.shared.highLine.value
+        ul.limit = thresholds.high
         ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ul)
 
@@ -780,15 +788,17 @@ extension MainViewController {
         // Clear limit lines so they don't add multiples when changing the settings
         BGChart.rightAxis.removeAllLimitLines()
 
+        let thresholds = graphRangeThresholds()
+
         // Add lower red line based on low alert value
         let ll = ChartLimitLine()
-        ll.limit = Storage.shared.lowLine.value
+        ll.limit = thresholds.low
         ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ll)
 
         // Add upper yellow line based on low alert value
         let ul = ChartLimitLine()
-        ul.limit = Storage.shared.highLine.value
+        ul.limit = thresholds.high
         ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ul)
 
@@ -815,6 +825,7 @@ extension MainViewController {
         var colors = [NSUIColor]()
 
         topBG = Storage.shared.minBGScale.value
+        let thresholds = graphRangeThresholds()
         for i in 0 ..< entries.count {
             if Double(entries[i].sgv) > topBG - maxBGOffset {
                 topBG = Double(entries[i].sgv) + maxBGOffset
@@ -823,9 +834,9 @@ extension MainViewController {
             mainChart.append(value)
             smallChart.append(value)
 
-            if Double(entries[i].sgv) >= Storage.shared.highLine.value {
+            if Double(entries[i].sgv) >= thresholds.high {
                 colors.append(NSUIColor.systemYellow)
-            } else if Double(entries[i].sgv) <= Storage.shared.lowLine.value {
+            } else if Double(entries[i].sgv) <= thresholds.low {
                 colors.append(NSUIColor.systemRed)
             } else {
                 colors.append(NSUIColor.systemGreen)
diff --git a/LoopFollow/Controllers/MainViewController+updateStats.swift b/LoopFollow/Controllers/MainViewController+updateStats.swift
index 090f7925e..890307d4d 100644
--- a/LoopFollow/Controllers/MainViewController+updateStats.swift
+++ b/LoopFollow/Controllers/MainViewController+updateStats.swift
@@ -26,12 +26,25 @@ extension MainViewController {
             statsInRangePercent.text = String(format: "%.1f%%", stats.percentRange)
             statsHighPercent.text = String(format: "%.1f%%", stats.percentHigh)
             statsAvgBG.text = Localizer.toDisplayUnits(String(format: "%.0f", stats.avgBG))
-            if Storage.shared.useIFCC.value {
+            statsEstA1CTitle.text = UnitSettingsStore.shared.glycemicMetricMode == .gmi ? "GMI:" : "Est. A1C:"
+
+            if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
                 statsEstA1C.text = String(format: "%.0f", stats.a1C)
             } else {
                 statsEstA1C.text = String(format: "%.1f", stats.a1C)
             }
-            statsStdDev.text = String(format: "%.2f", stats.stdDev)
+
+            if UnitSettingsStore.shared.variabilityMetricMode == .stdDeviation {
+                statsStdDevTitle.text = "Std Dev:"
+                if UnitSettingsStore.shared.glucoseUnit == .mgdL {
+                    statsStdDev.text = String(format: "%.0f", stats.stdDev)
+                } else {
+                    statsStdDev.text = String(format: "%.1f", stats.stdDev)
+                }
+            } else {
+                statsStdDevTitle.text = "CV:"
+                statsStdDev.text = String(format: "%.1f%%", stats.coefficientOfVariation)
+            }
 
             createStatsPie(pieData: stats.pie)
         }
diff --git a/LoopFollow/Controllers/Stats.swift b/LoopFollow/Controllers/Stats.swift
index 768215e6c..aa80c2c1e 100644
--- a/LoopFollow/Controllers/Stats.swift
+++ b/LoopFollow/Controllers/Stats.swift
@@ -14,6 +14,7 @@ class StatsData {
     var avgBG: Float
     var a1C: Float
     var stdDev: Float
+    var coefficientOfVariation: Float
     var bgDataCount: Int
     var pie: [DataStructs.pieData]
 
@@ -23,12 +24,16 @@ class StatsData {
         countHigh = 0
         totalGlucose = 0
         a1C = 0.0
+        coefficientOfVariation = 0.0
+
+        let lowThreshold = 70.0
+        let highThreshold = UnitSettingsStore.shared.timeInRangeMode == .titr ? 140.0 : 180.0
 
         for i in 0 ..< bgData.count {
             // Set low/range/high counts for pie chart and %'s
-            if Double(bgData[i].sgv) <= Storage.shared.lowLine.value {
+            if Double(bgData[i].sgv) < lowThreshold {
                 countLow += 1
-            } else if Double(bgData[i].sgv) >= Storage.shared.highLine.value {
+            } else if Double(bgData[i].sgv) > highThreshold {
                 countHigh += 1
             } else {
                 countRange += 1
@@ -60,15 +65,19 @@ class StatsData {
             partialSum += (Float(bgData[i].sgv) - avgBG) * (Float(bgData[i].sgv) - avgBG)
         }
 
-        stdDev = sqrt(partialSum / Float(bgData.count))
-        if Storage.shared.units.value != "mg/dL" {
-            stdDev = stdDev * Float(GlucoseConversion.mgDlToMmolL)
+        let stdDevMgdL = sqrt(partialSum / Float(bgData.count))
+        if avgBG > 0 {
+            coefficientOfVariation = (stdDevMgdL / avgBG) * 100.0
         }
+        stdDev = Float(UnitSettingsStore.shared.convertMgdlToDisplay(Double(stdDevMgdL)))
 
-        if Storage.shared.useIFCC.value {
-            a1C = (((46.7 + Float(avgBG)) / 28.7) - 2.152) / 0.09148
+        let avgBGDisplay = UnitSettingsStore.shared.convertMgdlToDisplay(Double(avgBG))
+        let metricValue: Double?
+        if UnitSettingsStore.shared.glycemicMetricMode == .gmi {
+            metricValue = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgBGDisplay)
         } else {
-            a1C = (46.7 + Float(avgBG)) / 28.7
+            metricValue = GlycemicMetricCalculator.calculateEhba1c(avgGlucoseInDisplayUnits: avgBGDisplay)
         }
+        a1C = Float(metricValue ?? 0.0)
     }
 }
diff --git a/LoopFollow/Helpers/Localizer.swift b/LoopFollow/Helpers/Localizer.swift
index af55db290..8e1d48fc0 100644
--- a/LoopFollow/Helpers/Localizer.swift
+++ b/LoopFollow/Helpers/Localizer.swift
@@ -4,13 +4,147 @@
 import Foundation
 import HealthKit
 
+enum GlucoseDisplayUnit: String, Codable, CaseIterable {
+    case mgdL = "mg/dL"
+    case mmolL = "mmol/L"
+
+    var fractionDigits: Int {
+        switch self {
+        case .mgdL:
+            return 0
+        case .mmolL:
+            return 1
+        }
+    }
+}
+
+enum TimeInRangeDisplayMode: String, Codable, CaseIterable {
+    case tir = "TIR"
+    case titr = "TITR"
+}
+
+enum GlycemicMetricMode: String, Codable, CaseIterable {
+    case ehba1c = "eHbA1c"
+    case gmi = "GMI"
+}
+
+enum GlycemicOutputUnit: String, Codable, CaseIterable {
+    case percent = "%"
+    case mmolMol = "mmol/mol"
+}
+
+enum VariabilityMetricMode: String, Codable, CaseIterable {
+    case stdDeviation = "Std Deviation"
+    case cv = "CV"
+}
+
+final class UnitSettingsStore {
+    static let shared = UnitSettingsStore()
+
+    private init() {}
+
+    var glucoseUnit: GlucoseDisplayUnit {
+        get {
+            GlucoseDisplayUnit(rawValue: Storage.shared.units.value) ?? .mgdL
+        }
+        set {
+            Storage.shared.units.value = newValue.rawValue
+        }
+    }
+
+    var timeInRangeMode: TimeInRangeDisplayMode {
+        get {
+            Storage.shared.showTITR.value ? .titr : .tir
+        }
+        set {
+            Storage.shared.showTITR.value = (newValue == .titr)
+        }
+    }
+
+    var glycemicMetricMode: GlycemicMetricMode {
+        get {
+            Storage.shared.showGMI.value ? .gmi : .ehba1c
+        }
+        set {
+            Storage.shared.showGMI.value = (newValue == .gmi)
+        }
+    }
+
+    var glycemicOutputUnit: GlycemicOutputUnit {
+        get {
+            Storage.shared.useIFCC.value ? .mmolMol : .percent
+        }
+        set {
+            Storage.shared.useIFCC.value = (newValue == .mmolMol)
+        }
+    }
+
+    var variabilityMetricMode: VariabilityMetricMode {
+        get {
+            Storage.shared.showStdDev.value ? .stdDeviation : .cv
+        }
+        set {
+            Storage.shared.showStdDev.value = (newValue == .stdDeviation)
+        }
+    }
+
+    func convertMgdlToDisplay(_ mgdl: Double) -> Double {
+        switch glucoseUnit {
+        case .mgdL:
+            return mgdl
+        case .mmolL:
+            return mgdl * GlucoseConversion.mgDlToMmolL
+        }
+    }
+
+    func convertDisplayToMgdl(_ value: Double) -> Double {
+        switch glucoseUnit {
+        case .mgdL:
+            return value
+        case .mmolL:
+            return value * GlucoseConversion.mmolToMgDl
+        }
+    }
+}
+
+enum GlycemicMetricCalculator {
+    static func calculateEhba1c(avgGlucoseInDisplayUnits: Double?) -> Double? {
+        guard let avgGlucoseInDisplayUnits else { return nil }
+
+        switch UnitSettingsStore.shared.glycemicOutputUnit {
+        case .mmolMol:
+            let avgMmolL = UnitSettingsStore.shared.glucoseUnit == .mmolL
+                ? avgGlucoseInDisplayUnits
+                : avgGlucoseInDisplayUnits * GlucoseConversion.mgDlToMmolL
+            return avgMmolL * 6.936514699616532 - 6.628248828291433
+        case .percent:
+            let avgMgdL = UnitSettingsStore.shared.convertDisplayToMgdl(avgGlucoseInDisplayUnits)
+            return (avgMgdL + 46.7) / 28.7
+        }
+    }
+
+    static func calculateGMI(avgGlucoseInDisplayUnits: Double?) -> Double? {
+        guard let avgGlucoseInDisplayUnits else { return nil }
+
+        switch UnitSettingsStore.shared.glycemicOutputUnit {
+        case .percent:
+            let avgMgdL = UnitSettingsStore.shared.convertDisplayToMgdl(avgGlucoseInDisplayUnits)
+            return 3.31 + (0.02392 * avgMgdL)
+        case .mmolMol:
+            let avgMmolL = UnitSettingsStore.shared.glucoseUnit == .mmolL
+                ? avgGlucoseInDisplayUnits
+                : avgGlucoseInDisplayUnits * GlucoseConversion.mgDlToMmolL
+            return 12.71 + (4.70587 * avgMmolL)
+        }
+    }
+}
+
 class Localizer {
     static func getPreferredUnit() -> HKUnit {
-        let unitString = Storage.shared.units.value
-        switch unitString {
-        case "mmol/L":
+        switch UnitSettingsStore.shared.glucoseUnit {
+        case .mmolL:
             return .millimolesPerLiter
-        default:
+        case .mgdL:
             return .milligramsPerDeciliter
         }
     }
@@ -50,14 +184,9 @@ class Localizer {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
 
-        let units = unit ?? Storage.shared.units.value
-
-        if units == "mg/dL" {
-            numberFormatter.maximumFractionDigits = 0 // No decimal places for mg/dL
-        } else {
-            numberFormatter.maximumFractionDigits = 1 // Always one decimal place for mmol/L
-            numberFormatter.minimumFractionDigits = 1 // This ensures even .0 is displayed
-        }
+        let units = GlucoseDisplayUnit(rawValue: unit ?? UnitSettingsStore.shared.glucoseUnit.rawValue) ?? .mgdL
+        numberFormatter.maximumFractionDigits = units.fractionDigits
+        numberFormatter.minimumFractionDigits = units.fractionDigits
 
         numberFormatter.locale = Locale.current
 
@@ -68,18 +197,14 @@ class Localizer {
     static func toDisplayUnits(_ value: String) -> String {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
-
-        if Storage.shared.units.value == "mg/dL" {
-            numberFormatter.maximumFractionDigits = 0 // No decimal places for mg/dL
-        } else {
-            numberFormatter.maximumFractionDigits = 1 // Always one decimal place for mmol/L
-            numberFormatter.minimumFractionDigits = 1 // This ensures even .0 is displayed
-        }
+        let units = UnitSettingsStore.shared.glucoseUnit
+        numberFormatter.maximumFractionDigits = units.fractionDigits
+        numberFormatter.minimumFractionDigits = units.fractionDigits
 
         numberFormatter.locale = Locale.current
 
         if let number = Float(value) {
-            if Storage.shared.units.value == "mg/dL" {
+            if units == .mgdL {
                 let numberValue = NSNumber(value: number)
                 return numberFormatter.string(from: numberValue) ?? value
             } else {
diff --git a/LoopFollow/Nightscout/NightscoutSettingsView.swift b/LoopFollow/Nightscout/NightscoutSettingsView.swift
index 7c08e756f..4fad2a7d0 100644
--- a/LoopFollow/Nightscout/NightscoutSettingsView.swift
+++ b/LoopFollow/Nightscout/NightscoutSettingsView.swift
@@ -5,21 +5,28 @@ import SwiftUI
 
 struct NightscoutSettingsView: View {
     @ObservedObject var viewModel: NightscoutSettingsViewModel
+    var usesModalCloseButton: Bool = false
+    var onContinueToUnits: (() -> Void)? = nil
+    var onImportSettings: (() -> Void)? = nil
+    @State private var showUnitsSetup = false
+    @Environment(\.dismiss) private var dismiss
 
     var body: some View {
-        NavigationView {
-            Form {
-                urlSection
-                tokenSection
-                statusSection
-                importSection
-            }
-            .onDisappear {
-                viewModel.dismiss()
+        Form {
+            urlSection
+            tokenSection
+            statusSection
+
+            if viewModel.isFreshSetup {
+                continueSection
             }
+
+            importSection
         }
-        .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
+        .background(unitsNavigationLink)
         .navigationBarTitle("Nightscout Settings", displayMode: .inline)
+        .navigationBarBackButtonHidden(usesModalCloseButton)
+        .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
     }
 
     // MARK: - Subviews / Computed Properties
@@ -52,19 +59,68 @@ struct NightscoutSettingsView: View {
 
     private var statusSection: some View {
         Section(header: Text("Status")) {
-            Text(viewModel.nightscoutStatus)
+            HStack {
+                Text(viewModel.nightscoutStatus)
+                if viewModel.isConnected {
+                    Spacer()
+                    Image(systemName: "checkmark.circle.fill")
+                        .foregroundColor(.green)
+                }
+            }
+        }
+    }
+
+    private var continueSection: some View {
+        Section {
+            Button(action: {
+                if let onContinueToUnits {
+                    onContinueToUnits()
+                } else {
+                    showUnitsSetup = true
+                }
+            }) {
+                HStack {
+                    Spacer()
+                    Text("Continue")
+                        .fontWeight(.semibold)
+                    Spacer()
+                }
+            }
+            .buttonStyle(.borderedProminent)
+            .disabled(!viewModel.isConnected)
+            .listRowBackground(Color.clear)
         }
     }
 
     private var importSection: some View {
         Section(header: Text("Import Settings")) {
-            NavigationLink(destination: ImportExportSettingsView()) {
-                HStack {
-                    Image(systemName: "square.and.arrow.down")
-                        .foregroundColor(.blue)
-                    Text("Import Settings from QR Code")
+            if let onImportSettings {
+                Button(action: onImportSettings) {
+                    HStack {
+                        Image(systemName: "square.and.arrow.down")
+                            .foregroundColor(.blue)
+                        Text("Import Settings from QR Code")
+                            .foregroundColor(.primary)
+                    }
+                }
+            } else {
+                NavigationLink(destination: ImportExportSettingsView()) {
+                    HStack {
+                        Image(systemName: "square.and.arrow.down")
+                            .foregroundColor(.blue)
+                        Text("Import Settings from QR Code")
+                    }
                 }
             }
         }
     }
+
+    private var unitsNavigationLink: some View {
+        NavigationLink(destination: UnitsOnboardingView {
+            dismiss()
+        }, isActive: $showUnitsSetup) {
+            EmptyView()
+        }
+        .hidden()
+    }
 }
diff --git a/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift b/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
index 299a73a7d..9b336be2b 100644
--- a/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
+++ b/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
@@ -14,6 +14,12 @@ class NightscoutSettingsViewModel: ObservableObject {
     private var initialURL: String
     private var initialToken: String
 
+    /// Whether the Nightscout connection is successfully verified
+    @Published var isConnected: Bool = false
+
+    /// Whether this is a fresh setup (URL was empty when view appeared)
+    private(set) var isFreshSetup: Bool = false
+
     @Published var nightscoutURL: String = Storage.shared.url.value {
         willSet {
             if newValue != nightscoutURL {
@@ -41,6 +47,7 @@ class NightscoutSettingsViewModel: ObservableObject {
     init() {
         initialURL = Storage.shared.url.value
         initialToken = Storage.shared.token.value
+        isFreshSetup = initialURL.isEmpty
 
         setupDebounce()
         checkNightscoutStatus()
@@ -107,6 +114,7 @@ class NightscoutSettingsViewModel: ObservableObject {
 
     func updateStatusLabel(error: NightscoutUtils.NightscoutError?) {
         if let error = error {
+            isConnected = false
             switch error {
             case .invalidURL:
                 nightscoutStatus = "Invalid URL"
@@ -124,6 +132,7 @@ class NightscoutSettingsViewModel: ObservableObject {
                 nightscoutStatus = "Address Empty"
             }
         } else {
+            isConnected = true
             let authStatus: String
             if Storage.shared.nsAdminAuth.value {
                 authStatus = "Admin"
diff --git a/LoopFollow/Settings/DexcomSettingsView.swift b/LoopFollow/Settings/DexcomSettingsView.swift
index c93b31855..99a4dc32b 100644
--- a/LoopFollow/Settings/DexcomSettingsView.swift
+++ b/LoopFollow/Settings/DexcomSettingsView.swift
@@ -5,40 +5,70 @@ import SwiftUI
 
 struct DexcomSettingsView: View {
     @ObservedObject var viewModel: DexcomSettingsViewModel
+    var usesModalCloseButton: Bool = false
+    var onContinueToUnits: (() -> Void)? = nil
+    @State private var showUnitsSetup = false
+    @Environment(\.dismiss) private var dismiss
 
     var body: some View {
-        NavigationView {
-            Form {
-                Section(header: Text("Dexcom Settings")) {
-                    HStack {
-                        Text("User Name")
-                        TextField("Enter User Name", text: $viewModel.userName)
-                            .autocapitalization(.none)
-                            .disableAutocorrection(true)
-                            .multilineTextAlignment(.trailing)
-                    }
+        Form {
+            Section(header: Text("Dexcom Settings")) {
+                HStack {
+                    Text("User Name")
+                    TextField("Enter User Name", text: $viewModel.userName)
+                        .autocapitalization(.none)
+                        .disableAutocorrection(true)
+                        .multilineTextAlignment(.trailing)
+                }
 
-                    HStack {
-                        Text("Password")
-                        TogglableSecureInput(
-                            placeholder: "Enter Password",
-                            text: $viewModel.password,
-                            style: .singleLine
-                        )
-                    }
+                HStack {
+                    Text("Password")
+                    TogglableSecureInput(
+                        placeholder: "Enter Password",
+                        text: $viewModel.password,
+                        style: .singleLine
+                    )
+                }
 
-                    Picker("Server", selection: $viewModel.server) {
-                        Text("US").tag("US")
-                        Text("NON-US").tag("NON-US")
+                Picker("Server", selection: $viewModel.server) {
+                    Text("US").tag("US")
+                    Text("NON-US").tag("NON-US")
+                }
+                .pickerStyle(SegmentedPickerStyle())
+            }
+
+            if viewModel.isFreshSetup {
+                Section {
+                    Button(action: {
+                        if let onContinueToUnits {
+                            onContinueToUnits()
+                        } else {
+                            showUnitsSetup = true
+                        }
+                    }) {
+                        HStack {
+                            Spacer()
+                            Text("Continue")
+                                .fontWeight(.semibold)
+                            Spacer()
+                        }
                     }
-                    .pickerStyle(SegmentedPickerStyle())
+                    .buttonStyle(.borderedProminent)
+                    .disabled(!viewModel.hasCredentials)
+                    .listRowBackground(Color.clear)
                 }
+            }
 
-                importSection
+            importSection
+        }
+        .navigationDestination(isPresented: $showUnitsSetup) {
+            UnitsOnboardingView {
+                dismiss()
             }
         }
         .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
         .navigationBarTitle("Dexcom Settings", displayMode: .inline)
+        .navigationBarBackButtonHidden(usesModalCloseButton)
     }
 
     private var importSection: some View {
diff --git a/LoopFollow/Settings/DexcomSettingsViewModel.swift b/LoopFollow/Settings/DexcomSettingsViewModel.swift
index 5e1af7aa1..8c7fd5324 100644
--- a/LoopFollow/Settings/DexcomSettingsViewModel.swift
+++ b/LoopFollow/Settings/DexcomSettingsViewModel.swift
@@ -5,6 +5,9 @@ import Combine
 import Foundation
 
 class DexcomSettingsViewModel: ObservableObject {
+    /// Whether this is a fresh setup (credentials were empty when view appeared)
+    private(set) var isFreshSetup: Bool = false
+
     @Published var userName: String = Storage.shared.shareUserName.value {
         willSet {
             if newValue != userName {
@@ -29,5 +32,12 @@ class DexcomSettingsViewModel: ObservableObject {
         }
     }
 
-    init() {}
+    /// Whether credentials are filled in
+    var hasCredentials: Bool {
+        !userName.isEmpty && !password.isEmpty
+    }
+
+    init() {
+        isFreshSetup = Storage.shared.shareUserName.value.isEmpty
+    }
 }
diff --git a/LoopFollow/Settings/GeneralSettingsView.swift b/LoopFollow/Settings/GeneralSettingsView.swift
index 033e19953..04dec7242 100644
--- a/LoopFollow/Settings/GeneralSettingsView.swift
+++ b/LoopFollow/Settings/GeneralSettingsView.swift
@@ -8,7 +8,6 @@ struct GeneralSettingsView: View {
     @ObservedObject var appBadge = Storage.shared.appBadge
     @ObservedObject var appearanceMode = Storage.shared.appearanceMode
     @ObservedObject var showStats = Storage.shared.showStats
-    @ObservedObject var useIFCC = Storage.shared.useIFCC
     @ObservedObject var showSmallGraph = Storage.shared.showSmallGraph
     @ObservedObject var screenlockSwitchState = Storage.shared.screenlockSwitchState
     @ObservedObject var showDisplayName = Storage.shared.showDisplayName
@@ -44,7 +43,6 @@ struct GeneralSettingsView: View {
                         }
                     }
                     Toggle("Display Stats", isOn: $showStats.value)
-                    Toggle("Use IFCC A1C", isOn: $useIFCC.value)
                     Toggle("Display Small Graph", isOn: $showSmallGraph.value)
                     Toggle("Color BG Text", isOn: $colorBGText.value)
                     Toggle("Keep Screen Active", isOn: $screenlockSwitchState.value)
diff --git a/LoopFollow/Settings/ImportExport/ExportableSettings.swift b/LoopFollow/Settings/ImportExport/ExportableSettings.swift
index 77c905806..86db11a66 100644
--- a/LoopFollow/Settings/ImportExport/ExportableSettings.swift
+++ b/LoopFollow/Settings/ImportExport/ExportableSettings.swift
@@ -11,14 +11,66 @@ struct NightscoutSettingsExport: Codable {
     let url: String
     let token: String
     let units: String
+    let glycemicMetricMode: String
+    let glycemicOutputUnit: String
+    let timeInRangeMode: String
+    let variabilityMetricMode: String
+
+    enum CodingKeys: String, CodingKey {
+        case version
+        case url
+        case token
+        case units
+        case glycemicMetricMode
+        case glycemicOutputUnit
+        case timeInRangeMode
+        case variabilityMetricMode
+    }
+
+    init(
+        version: String,
+        url: String,
+        token: String,
+        units: String,
+        glycemicMetricMode: String,
+        glycemicOutputUnit: String,
+        timeInRangeMode: String,
+        variabilityMetricMode: String
+    ) {
+        self.version = version
+        self.url = url
+        self.token = token
+        self.units = units
+        self.glycemicMetricMode = glycemicMetricMode
+        self.glycemicOutputUnit = glycemicOutputUnit
+        self.timeInRangeMode = timeInRangeMode
+        self.variabilityMetricMode = variabilityMetricMode
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        version = try container.decode(String.self, forKey: .version)
+        url = try container.decode(String.self, forKey: .url)
+        token = try container.decode(String.self, forKey: .token)
+        units = try container.decodeIfPresent(String.self, forKey: .units) ?? GlucoseDisplayUnit.mgdL.rawValue
+        glycemicMetricMode = try container.decodeIfPresent(String.self, forKey: .glycemicMetricMode) ?? GlycemicMetricMode.gmi.rawValue
+        glycemicOutputUnit = try container.decodeIfPresent(String.self, forKey: .glycemicOutputUnit) ?? GlycemicOutputUnit.percent.rawValue
+        timeInRangeMode = try container.decodeIfPresent(String.self, forKey: .timeInRangeMode) ?? TimeInRangeDisplayMode.tir.rawValue
+        variabilityMetricMode = try container.decodeIfPresent(String.self, forKey: .variabilityMetricMode) ?? VariabilityMetricMode.stdDeviation.rawValue
+    }
 
     static func fromCurrentStorage() -> NightscoutSettingsExport {
         let storage = Storage.shared
+        let unitSettings = UnitSettingsStore.shared
         return NightscoutSettingsExport(
             version: AppVersionManager().version(),
             url: storage.url.value,
             token: storage.token.value,
-            units: storage.units.value
+            units: storage.units.value,
+            glycemicMetricMode: unitSettings.glycemicMetricMode.rawValue,
+            glycemicOutputUnit: unitSettings.glycemicOutputUnit.rawValue,
+            timeInRangeMode: unitSettings.timeInRangeMode.rawValue,
+            variabilityMetricMode: unitSettings.variabilityMetricMode.rawValue
         )
     }
 
@@ -27,6 +79,19 @@ struct NightscoutSettingsExport: Codable {
         storage.url.value = url
         storage.token.value = token
         storage.units.value = units
+
+        if let glycemicMetricMode = GlycemicMetricMode(rawValue: glycemicMetricMode) {
+            UnitSettingsStore.shared.glycemicMetricMode = glycemicMetricMode
+        }
+        if let glycemicOutputUnit = GlycemicOutputUnit(rawValue: glycemicOutputUnit) {
+            UnitSettingsStore.shared.glycemicOutputUnit = glycemicOutputUnit
+        }
+        if let timeInRangeMode = TimeInRangeDisplayMode(rawValue: timeInRangeMode) {
+            UnitSettingsStore.shared.timeInRangeMode = timeInRangeMode
+        }
+        if let variabilityMetricMode = VariabilityMetricMode(rawValue: variabilityMetricMode) {
+            UnitSettingsStore.shared.variabilityMetricMode = variabilityMetricMode
+        }
     }
 
     func encodeToJSON() -> String? {
diff --git a/LoopFollow/Settings/SettingsMenuView.swift b/LoopFollow/Settings/SettingsMenuView.swift
index f12a1d025..52d44e90a 100644
--- a/LoopFollow/Settings/SettingsMenuView.swift
+++ b/LoopFollow/Settings/SettingsMenuView.swift
@@ -31,6 +31,7 @@ struct SettingsMenuView: View {
                     {
                         settingsPath.value.append(Sheet.general)
                     }
+
                     NavigationRow(title: "Graph",
                                   icon: "chart.xyaxis.line")
                     {
@@ -44,6 +45,11 @@ struct SettingsMenuView: View {
                             settingsPath.value.append(Sheet.infoDisplay)
                         }
                     }
+                     NavigationRow(title: "Units and Metrics",
+                                  icon: "scalemass")
+                    {
+                        settingsPath.value.append(Sheet.units)
+                    }
 
                     NavigationRow(title: "Tabs",
                                   icon: "rectangle.3.group")
@@ -124,16 +130,6 @@ struct SettingsMenuView: View {
     @ViewBuilder
     private var dataSection: some View {
         Section("Data Settings") {
-            Picker("Units",
-                   selection: Binding(
-                       get: { Storage.shared.units.value },
-                       set: { Storage.shared.units.value = $0 }
-                   )) {
-                Text("mg/dL").tag("mg/dL")
-                Text("mmol/L").tag("mmol/L")
-            }
-            .pickerStyle(.segmented)
-
             NavigationRow(title: "Nightscout",
                           icon: "network")
             {
@@ -152,6 +148,7 @@ struct SettingsMenuView: View {
 // MARK: – Sheet routing
 
 private enum Sheet: Hashable, Identifiable {
+    case units
     case nightscout, dexcom
     case backgroundRefresh
     case general, graph
@@ -169,6 +166,7 @@ private enum Sheet: Hashable, Identifiable {
     @ViewBuilder
     var destination: some View {
         switch self {
+        case .units: UnitsSettingsView()
         case .nightscout: NightscoutSettingsView(viewModel: .init())
         case .dexcom: DexcomSettingsView(viewModel: .init())
         case .backgroundRefresh: BackgroundRefreshSettingsView(viewModel: .init())
diff --git a/LoopFollow/Settings/UnitsConfigurationView.swift b/LoopFollow/Settings/UnitsConfigurationView.swift
new file mode 100644
index 000000000..1f1e2f3d1
--- /dev/null
+++ b/LoopFollow/Settings/UnitsConfigurationView.swift
@@ -0,0 +1,90 @@
+// LoopFollow
+// UnitsConfigurationView.swift
+
+import SwiftUI
+
+/// Reusable view for configuring units and metrics.
+/// Can be embedded in Forms or used standalone during onboarding.
+struct UnitsConfigurationView: View {
+    var body: some View {
+        Group {
+            Section("Glucose") {
+                Picker("Glucose Unit", selection: Binding(
+                    get: { UnitSettingsStore.shared.glucoseUnit },
+                    set: { UnitSettingsStore.shared.glucoseUnit = $0 }
+                )) {
+                    Text("mg/dL").tag(GlucoseDisplayUnit.mgdL)
+                    Text("mmol/L").tag(GlucoseDisplayUnit.mmolL)
+                }
+                .pickerStyle(.segmented)
+            }
+
+            Section("Range") {
+                Picker("Range Mode", selection: Binding(
+                    get: { UnitSettingsStore.shared.timeInRangeMode },
+                    set: { UnitSettingsStore.shared.timeInRangeMode = $0 }
+                )) {
+                    Text("Time In Range").tag(TimeInRangeDisplayMode.tir)
+                    Text("Time In Tighter Range").tag(TimeInRangeDisplayMode.titr)
+                }
+                .pickerStyle(.segmented)
+            }
+
+            Section("Glycemic Metrics") {
+                Picker("Metric", selection: Binding(
+                    get: { UnitSettingsStore.shared.glycemicMetricMode },
+                    set: { UnitSettingsStore.shared.glycemicMetricMode = $0 }
+                )) {
+                    Text("eHbA1c").tag(GlycemicMetricMode.ehba1c)
+                    Text("GMI").tag(GlycemicMetricMode.gmi)
+                }
+                .pickerStyle(.segmented)
+
+                Picker("Output Unit", selection: Binding(
+                    get: { UnitSettingsStore.shared.glycemicOutputUnit },
+                    set: { UnitSettingsStore.shared.glycemicOutputUnit = $0 }
+                )) {
+                    Text("%").tag(GlycemicOutputUnit.percent)
+                    Text("mmol/mol").tag(GlycemicOutputUnit.mmolMol)
+                }
+                .pickerStyle(.segmented)
+            }
+
+            Section("Variability") {
+                Picker("Metric", selection: Binding(
+                    get: { UnitSettingsStore.shared.variabilityMetricMode },
+                    set: { UnitSettingsStore.shared.variabilityMetricMode = $0 }
+                )) {
+                    Text("Std Dev").tag(VariabilityMetricMode.stdDeviation)
+                    Text("CV").tag(VariabilityMetricMode.cv)
+                }
+                .pickerStyle(.segmented)
+            }
+        }
+    }
+}
+
+/// Standalone page for units configuration during onboarding.
+/// Shows a checkmark button in the toolbar to complete setup.
+struct UnitsOnboardingView: View {
+    let onComplete: () -> Void
+
+    var body: some View {
+        Form {
+            UnitsConfigurationView()
+        }
+        .navigationTitle("Set Up Units")
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button(action: {
+                    Storage.shared.hasConfiguredUnits.value = true
+                    onComplete()
+                }) {
+                    Image(systemName: "checkmark")
+                        .fontWeight(.semibold)
+                }
+            }
+        }
+    }
+}
diff --git a/LoopFollow/Settings/UnitsSettingsView.swift b/LoopFollow/Settings/UnitsSettingsView.swift
new file mode 100644
index 000000000..b88cd0814
--- /dev/null
+++ b/LoopFollow/Settings/UnitsSettingsView.swift
@@ -0,0 +1,14 @@
+// LoopFollow
+// UnitsSettingsView.swift
+
+import SwiftUI
+
+struct UnitsSettingsView: View {
+    var body: some View {
+        Form {
+            UnitsConfigurationView()
+        }
+        .navigationTitle("Metrics and Units")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+}
diff --git a/LoopFollow/Stats/AggregatedStatsView.swift b/LoopFollow/Stats/AggregatedStatsView.swift
index fd338c3e0..9e4981224 100644
--- a/LoopFollow/Stats/AggregatedStatsView.swift
+++ b/LoopFollow/Stats/AggregatedStatsView.swift
@@ -19,8 +19,8 @@ struct AggregatedStatsView: View {
 
     init(viewModel: AggregatedStatsViewModel) {
         self.viewModel = viewModel
-        _showGMI = State(initialValue: Storage.shared.showGMI.value)
-        _showStdDev = State(initialValue: Storage.shared.showStdDev.value)
+        _showGMI = State(initialValue: UnitSettingsStore.shared.glycemicMetricMode == .gmi)
+        _showStdDev = State(initialValue: UnitSettingsStore.shared.variabilityMetricMode == .stdDeviation)
 
         let calendar = dateTimeUtils.displayCalendar()
         let startOfToday = calendar.startOfDay(for: Date())
@@ -155,11 +155,34 @@ struct AggregatedStatsView: View {
             timeoutTimer = nil
         }
         .onChange(of: showGMI) { newValue in
-            Storage.shared.showGMI.value = newValue
+            UnitSettingsStore.shared.glycemicMetricMode = newValue ? .gmi : .ehba1c
         }
         .onChange(of: showStdDev) { newValue in
-            Storage.shared.showStdDev.value = newValue
+            UnitSettingsStore.shared.variabilityMetricMode = newValue ? .stdDeviation : .cv
         }
+        .onReceive(Storage.shared.showGMI.$value) { newValue in
+            showGMI = newValue
+        }
+        .onReceive(Storage.shared.showStdDev.$value) { newValue in
+            showStdDev = newValue
+        }
+        .onReceive(Storage.shared.units.$value) { _ in
+            refreshVisibleStats()
+        }
+        .onReceive(Storage.shared.useIFCC.$value) { _ in
+            refreshVisibleStats()
+        }
+        .onReceive(Storage.shared.showTITR.$value) { newValue in
+            if viewModel.tirStats.showTITR != newValue {
+                viewModel.tirStats.showTITR = newValue
+                viewModel.tirStats.calculateTIR()
+            }
+        }
+    }
+
+    private func refreshVisibleStats() {
+        guard !isLoadingData else { return }
+        viewModel.calculateStats()
     }
 }
 
@@ -280,9 +303,9 @@ struct StatsGridView: View {
                     showGMI.toggle()
                 }) {
                     StatCard(
-                        title: showGMI ? "GMI" : "eHbA1c",
-                        value: showGMI ? formatGMI(simpleStats.gmi) : formatEhbA1c(simpleStats.avgGlucose),
-                        unit: showGMI ? "%" : (Storage.shared.units.value == "mg/dL" ? "%" : "mmol/mol"),
+                        title: showGMI ? "GMI" : "Est. A1C",
+                        value: showGMI ? formatGMI(simpleStats.avgGlucose) : formatEhbA1c(simpleStats.avgGlucose),
+                        unit: UnitSettingsStore.shared.glycemicOutputUnit.rawValue,
                         color: .blue,
                         isInteractive: true
                     )
@@ -292,7 +315,7 @@ struct StatsGridView: View {
                 StatCard(
                     title: "Avg Glucose",
                     value: formatGlucose(simpleStats.avgGlucose),
-                    unit: Storage.shared.units.value,
+                    unit: UnitSettingsStore.shared.glucoseUnit.rawValue,
                     color: Color(red: 0.20, green: 0.99, blue: 0.70)
                 )
 
@@ -302,7 +325,7 @@ struct StatsGridView: View {
                     StatCard(
                         title: showStdDev ? "Std Deviation" : "CV",
                         value: showStdDev ? formatStdDev(simpleStats.stdDeviation) : formatCV(simpleStats.coefficientOfVariation),
-                        unit: showStdDev ? Storage.shared.units.value : "%",
+                        unit: showStdDev ? UnitSettingsStore.shared.glucoseUnit.rawValue : "%",
                         color: .orange,
                         isInteractive: true
                     )
@@ -364,34 +387,25 @@ struct StatsGridView: View {
         }
     }
 
-    private func formatGMI(_ value: Double?) -> String {
-        guard let value = value else { return "---" }
+    private func formatGMI(_ avgGlucose: Double?) -> String {
+        guard let value = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgGlucose) else { return "---" }
+        if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
+            return String(format: "%.0f", value)
+        }
         return String(format: "%.1f", value)
     }
 
     private func formatEhbA1c(_ avgGlucose: Double?) -> String {
-        guard let avgGlucose = avgGlucose else { return "---" }
-
-        let avgGlucoseMgdL: Double
-        if Storage.shared.units.value == "mg/dL" {
-            avgGlucoseMgdL = avgGlucose
-        } else {
-            avgGlucoseMgdL = avgGlucose * 18.0182
-        }
-
-        let ehba1cPercent = (avgGlucoseMgdL + 46.7) / 28.7
-
-        if Storage.shared.units.value == "mg/dL" {
-            return String(format: "%.1f", ehba1cPercent)
-        } else {
-            let ehba1cMmolMol = (ehba1cPercent - 2.15) * 10.929
-            return String(format: "%.0f", ehba1cMmolMol)
+        guard let value = GlycemicMetricCalculator.calculateEhba1c(avgGlucoseInDisplayUnits: avgGlucose) else { return "---" }
+        if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
+            return String(format: "%.0f", value)
         }
+        return String(format: "%.1f", value)
     }
 
     private func formatGlucose(_ value: Double?) -> String {
         guard let value = value else { return "---" }
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return String(format: "%.0f", value)
         } else {
             return String(format: "%.1f", value)
@@ -400,7 +414,7 @@ struct StatsGridView: View {
 
     private func formatStdDev(_ value: Double?) -> String {
         guard let value = value else { return "---" }
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return String(format: "%.0f", value)
         } else {
             return String(format: "%.1f", value)
diff --git a/LoopFollow/Stats/SimpleStatsViewModel.swift b/LoopFollow/Stats/SimpleStatsViewModel.swift
index 960e17c57..afbf5568a 100644
--- a/LoopFollow/Stats/SimpleStatsViewModel.swift
+++ b/LoopFollow/Stats/SimpleStatsViewModel.swift
@@ -38,21 +38,22 @@ class SimpleStatsViewModel: ObservableObject {
     }
 
     func calculateStats() {
+        let unitSettings = UnitSettingsStore.shared
         let bgData = dataService.getBGData()
         guard !bgData.isEmpty else { return }
 
         let totalGlucose = bgData.reduce(0) { $0 + $1.sgv }
         let avgBGmgdL = Double(totalGlucose) / Double(bgData.count)
-        avgGlucose = Storage.shared.units.value == "mg/dL" ? avgBGmgdL : avgBGmgdL * GlucoseConversion.mgDlToMmolL
+        avgGlucose = unitSettings.convertMgdlToDisplay(avgBGmgdL)
 
         let variance = bgData.reduce(0.0) { sum, reading in
             let diff = Double(reading.sgv) - avgBGmgdL
             return sum + (diff * diff)
         }
         let stdDevMgdL = sqrt(variance / Double(bgData.count))
-        stdDeviation = Storage.shared.units.value == "mg/dL" ? stdDevMgdL : stdDevMgdL * GlucoseConversion.mgDlToMmolL
+        stdDeviation = unitSettings.convertMgdlToDisplay(stdDevMgdL)
 
-        gmi = 3.31 + (0.02392 * avgBGmgdL)
+        gmi = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgGlucose)
 
         if avgBGmgdL > 0 {
             coefficientOfVariation = (stdDevMgdL / avgBGmgdL) * 100.0
diff --git a/LoopFollow/Stats/TIR/TIRView.swift b/LoopFollow/Stats/TIR/TIRView.swift
index ac81c6880..b0229992d 100644
--- a/LoopFollow/Stats/TIR/TIRView.swift
+++ b/LoopFollow/Stats/TIR/TIRView.swift
@@ -32,7 +32,7 @@ struct TIRView: View {
 
                         VStack(alignment: .leading, spacing: 8) {
                             if let average = viewModel.tirData.first(where: { $0.period == .average }) {
-                                Text("Cutoffs in \(Storage.shared.units.value)")
+                                Text("Cutoffs in \(UnitSettingsStore.shared.glucoseUnit.rawValue)")
                                     .foregroundColor(.secondary)
 
                                 TIRLegendItem(
@@ -85,10 +85,11 @@ struct TIRView: View {
     }
 
     private func formatRange(_: Double) -> String {
+        let glucoseUnit = UnitSettingsStore.shared.glucoseUnit
         let lowThreshold: Double
         let highThreshold: Double
 
-        if Storage.shared.units.value == "mg/dL" {
+        if glucoseUnit == .mgdL {
             lowThreshold = 70.0
             highThreshold = viewModel.showTITR ? 140.0 : 180.0
         } else {
@@ -96,7 +97,7 @@ struct TIRView: View {
             highThreshold = viewModel.showTITR ? 7.8 : 10.0
         }
 
-        return String(format: "%.1f – %.1f %@", lowThreshold, highThreshold, Storage.shared.units.value)
+        return String(format: "%.1f – %.1f %@", lowThreshold, highThreshold, glucoseUnit.rawValue)
     }
 
     private var veryLowCutoffText: String {
@@ -120,26 +121,26 @@ struct TIRView: View {
     }
 
     private var lowThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 70.0 : 3.9
+        UnitSettingsStore.shared.glucoseUnit == .mgdL ? 70.0 : 3.9
     }
 
     private var highThreshold: Double {
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return viewModel.showTITR ? 140.0 : 180.0
         }
         return viewModel.showTITR ? 7.8 : 10.0
     }
 
     private var veryLowThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 54.0 : 3.0
+        UnitSettingsStore.shared.glucoseUnit == .mgdL ? 54.0 : 3.0
     }
 
     private var veryHighThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 250.0 : 13.9
+        UnitSettingsStore.shared.glucoseUnit == .mgdL ? 250.0 : 13.9
     }
 
     private func formatThreshold(_ value: Double) -> String {
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return String(format: "%.0f", value)
         }
         return String(format: "%.1f", value)
diff --git a/LoopFollow/Stats/TIR/TIRViewModel.swift b/LoopFollow/Stats/TIR/TIRViewModel.swift
index eb13fbdcb..650d9cd68 100644
--- a/LoopFollow/Stats/TIR/TIRViewModel.swift
+++ b/LoopFollow/Stats/TIR/TIRViewModel.swift
@@ -8,7 +8,7 @@ class TIRViewModel: ObservableObject {
     @Published var tirData: [TIRDataPoint] = []
     @Published var showTITR: Bool {
         didSet {
-            Storage.shared.showTITR.value = showTITR
+            UnitSettingsStore.shared.timeInRangeMode = showTITR ? .titr : .tir
         }
     }
 
@@ -16,7 +16,7 @@ class TIRViewModel: ObservableObject {
 
     init(dataService: StatsDataService) {
         self.dataService = dataService
-        showTITR = Storage.shared.showTITR.value
+        showTITR = UnitSettingsStore.shared.timeInRangeMode == .titr
         calculateTIR()
     }
 
diff --git a/LoopFollow/Storage/Storage.swift b/LoopFollow/Storage/Storage.swift
index 97e99bc7c..302a0dcb3 100644
--- a/LoopFollow/Storage/Storage.swift
+++ b/LoopFollow/Storage/Storage.swift
@@ -150,6 +150,7 @@ class Storage {
     var hideInfoTable = StorageValue<Bool>(key: "hideInfoTable", defaultValue: false)
     var token = StorageValue<String>(key: "token", defaultValue: "")
     var units = StorageValue<String>(key: "units", defaultValue: "mg/dL")
+    var hasConfiguredUnits = StorageValue<Bool>(key: "hasConfiguredUnits", defaultValue: false)
 
     var infoSort = StorageValue<[Int]>(key: "infoSort", defaultValue: InfoType.allCases.map { $0.sortOrder })
     var infoVisible = StorageValue<[Bool]>(key: "infoVisible", defaultValue: InfoType.allCases.map { $0.defaultVisible })
diff --git a/LoopFollow/ViewControllers/MainViewController.swift b/LoopFollow/ViewControllers/MainViewController.swift
index e494ea946..df8a1d0c2 100644
--- a/LoopFollow/ViewControllers/MainViewController.swift
+++ b/LoopFollow/ViewControllers/MainViewController.swift
@@ -34,7 +34,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     @IBOutlet var statsInRangePercent: UILabel!
     @IBOutlet var statsHighPercent: UILabel!
     @IBOutlet var statsAvgBG: UILabel!
+    @IBOutlet var statsEstA1CTitle: UILabel!
     @IBOutlet var statsEstA1C: UILabel!
+    @IBOutlet var statsStdDevTitle: UILabel!
     @IBOutlet var statsStdDev: UILabel!
     @IBOutlet var serverText: UILabel!
     @IBOutlet var statsView: UIView!
@@ -296,10 +298,23 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             }
             .store(in: &cancellables)
 
-        Storage.shared.useIFCC.$value
+        Publishers.MergeMany(
+            Storage.shared.units.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.useIFCC.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.showGMI.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.showStdDev.$value.map { _ in () }.eraseToAnyPublisher()
+        )
+        .receive(on: DispatchQueue.main)
+        .sink { [weak self] _ in
+            self?.updateStats()
+        }
+        .store(in: &cancellables)
+
+        Storage.shared.showTITR.$value
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                self?.updateStats()
+                self?.updateBGGraphSettings()
+                self?.updateBGGraph()
             }
             .store(in: &cancellables)
 
@@ -1426,15 +1441,30 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     }
 
     @objc private func setupNightscoutTapped() {
-        let nightscoutSettingsView = NightscoutSettingsView(viewModel: .init())
+        let navController = UINavigationController()
+        let nightscoutSettingsView = NightscoutSettingsView(viewModel: .init(), usesModalCloseButton: true, onContinueToUnits: { [weak navController] in
+            let unitsView = UnitsOnboardingView {
+                navController?.dismiss(animated: true)
+            }
+            let unitsController = UIHostingController(rootView: unitsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            unitsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(unitsController, animated: true)
+        }, onImportSettings: { [weak navController] in
+            let importSettingsView = ImportExportSettingsView()
+            let importSettingsController = UIHostingController(rootView: importSettingsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            importSettingsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(importSettingsController, animated: true)
+        })
         let hostingController = UIHostingController(rootView: nightscoutSettingsView)
-        let navController = UINavigationController(rootViewController: hostingController)
 
         // Apply appearance mode
         let style = Storage.shared.appearanceMode.value.userInterfaceStyle
         hostingController.overrideUserInterfaceStyle = style
         navController.overrideUserInterfaceStyle = style
 
+        navController.setViewControllers([hostingController], animated: false)
         hostingController.navigationItem.rightBarButtonItem = makeCloseBarButtonItem()
 
         navController.modalPresentationStyle = .pageSheet
@@ -1442,15 +1472,24 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     }
 
     @objc private func setupDexcomTapped() {
-        let dexcomSettingsView = DexcomSettingsView(viewModel: .init())
+        let navController = UINavigationController()
+        let dexcomSettingsView = DexcomSettingsView(viewModel: .init(), usesModalCloseButton: true, onContinueToUnits: { [weak navController] in
+            let unitsView = UnitsOnboardingView {
+                navController?.dismiss(animated: true)
+            }
+            let unitsController = UIHostingController(rootView: unitsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            unitsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(unitsController, animated: true)
+        })
         let hostingController = UIHostingController(rootView: dexcomSettingsView)
-        let navController = UINavigationController(rootViewController: hostingController)
 
         // Apply appearance mode
         let style = Storage.shared.appearanceMode.value.userInterfaceStyle
         hostingController.overrideUserInterfaceStyle = style
         navController.overrideUserInterfaceStyle = style
 
+        navController.setViewControllers([hostingController], animated: false)
         hostingController.navigationItem.rightBarButtonItem = makeCloseBarButtonItem()
 
         navController.modalPresentationStyle = .pageSheet
diff --git a/README.md b/README.md
index d0cd2d020..e711f9499 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,33 @@ Always rename your branch (that is aligned with `dev`) to a name suitable for yo
 
 After a PR is merged to `dev`, there is an automatic bump up the version number - please do not modify the version in your branch.
 
+### Commit Guidelines
+
+Write commit messages that complete the sentence: **"If applied, this commit will..."**
+
+For example:
+* "Add alarm snooze functionality" ✓
+* "Fix crash when loading empty profile" ✓
+* "Update documentation for build process" ✓
+* "Remove deprecated API calls" ✓
+
+**Commit message structure:**
+
+```
+<subject line - 50 chars or less>
+
+<optional body - wrap at 72 chars>
+```
+
+**Best practices:**
+* Use imperative mood in the subject line (Add, Fix, Update, Remove, Refactor)
+* Keep the subject line concise (50 characters or less)
+* Capitalize the first letter of the subject
+* Do not end the subject line with a period
+* Separate subject from body with a blank line
+* Use the body to explain *what* and *why*, not *how*
+* Reference related issues when applicable (e.g., "Fixes #123")
+
 ### Version Updates
 
 Only the maintainers for LoopFollow will update version numbers.