Only show one of "Dexcom" or "Nightscout" text, based on the last point.

Move the settings to the bottom of the Graph Settings section.

LoopFollow/Controllers/NightScout.swift

@@ -199,7 +199,7 @@ extension MainViewController {
                         }
                         nsData.removeFirst(itemsToRemove)
                         nsData = dexData + nsData
-                        sourceName = "Dexcom + Nightscout"
+                        sourceName = "Dexcom"
                     }
                     
                     // trigger the processor for the data after downloading.

LoopFollow/ViewControllers/AdvancedSettingsViewController.swift

@@ -90,21 +90,6 @@ class AdvancedSettingsViewController: FormViewController {
                     guard let value = row.value else { return }
                     UserDefaultsRepository.bgUpdateDelay.value = Int(value)
             }
-            <<< StepperRow("downloadDays") { row in
-                // NS supports 4 days, Dexcom Share only 1 day
-                row.title = "Show Days Back"
-                row.cell.stepper.stepValue = 1
-                row.cell.stepper.minimumValue = 1
-                row.cell.stepper.maximumValue = 4
-                row.value = Double(UserDefaultsRepository.downloadDays.value)
-                row.displayValueFor = { value in
-                        guard let value = value else { return nil }
-                        return "\(Int(value))"
-                    }
-            }.onChange { [weak self] row in
-                    guard let value = row.value else { return }
-                    UserDefaultsRepository.downloadDays.value = Int(value)
-            }
             <<< SwitchRow("alwaysDownloadAllBG"){ row in
                 row.title = "Allways Download All BG Values"
                 row.value = UserDefaultsRepository.alwaysDownloadAllBG.value

LoopFollow/ViewControllers/GraphSettingsViewController.swift

@@ -117,14 +117,6 @@ class GraphSettingsViewController: FormViewController {
                         UserDefaultsRepository.showDIALines.value = value
                         
             }
-            <<< SwitchRow("showMidnightMarkers"){ row in
-                row.title = "Show Midnight Lines"
-                row.value = UserDefaultsRepository.showMidnightLines.value
-            }.onChange { [weak self] row in
-                        guard let value = row.value else { return }
-                        UserDefaultsRepository.showMidnightLines.value = value
-                        
-            }
             <<< SwitchRow("smallGraphTreatments"){ row in
                 row.title = "Treatments on Small Graph"
                 row.value = UserDefaultsRepository.smallGraphTreatments.value
@@ -235,7 +227,30 @@ class GraphSettingsViewController: FormViewController {
                appState.chartSettingsChanges |= ChartSettingsChangeEnum.highLineChanged.rawValue
              }
         }
-       
+        <<< StepperRow("downloadDays") { row in
+            // NS supports up to 4 days
+            row.title = "Show Days Back"
+            row.cell.stepper.stepValue = 1
+            row.cell.stepper.minimumValue = 1
+            row.cell.stepper.maximumValue = 4
+            row.value = Double(UserDefaultsRepository.downloadDays.value)
+            row.displayValueFor = { value in
+                    guard let value = value else { return nil }
+                    return "\(Int(value))"
+                }
+        }.onChange { [weak self] row in
+                guard let value = row.value else { return }
+                UserDefaultsRepository.downloadDays.value = Int(value)
+        }
+        <<< SwitchRow("showMidnightMarkers"){ row in
+            row.title = "Show Midnight Lines"
+            row.value = UserDefaultsRepository.showMidnightLines.value
+        }.onChange { [weak self] row in
+                    guard let value = row.value else { return }
+                    UserDefaultsRepository.showMidnightLines.value = value
+                    
+        }
+
             
        +++ ButtonRow() {
           $0.title = "DONE"