Index: SDDs/TreatmentAdjustmentUltrafiltrationLayout.png
===================================================================
diff -u -rd2bea807686378545b1908944f31a1517c6943ab -rb04593ba64b521cda9f6eca00d9000c76c303914
Binary files differ
Index: SDDs/TreatmentAdjustmentUltrafiltrationLayout.puml
===================================================================
diff -u -rd2bea807686378545b1908944f31a1517c6943ab -rb04593ba64b521cda9f6eca00d9000c76c303914
--- SDDs/TreatmentAdjustmentUltrafiltrationLayout.puml	(.../TreatmentAdjustmentUltrafiltrationLayout.puml)	(revision d2bea807686378545b1908944f31a1517c6943ab)
+++ SDDs/TreatmentAdjustmentUltrafiltrationLayout.puml	(.../TreatmentAdjustmentUltrafiltrationLayout.puml)	(revision b04593ba64b521cda9f6eca00d9000c76c303914)
@@ -1,83 +1,86 @@
 @startuml
 title Treatment Adjustment Ultrafiltration Layouts
 
-package "TreatmentStack.qml" as TreatmentStack {
-    package "TreatmentUltrafiltrationItem.qml" as TreatmentUfItem {
-        package "TreatmentAdjustmentUltrafiltrationStart.qml" as UfStart {
-            package "TreatmentAdjustmentUltrafiltrationMetrics.qml" as UfStartMetrics #AliceBlue {
-                [vTreatmentUltrafiltration.setVolume]       as UfStartMetricsSetVolume
-                [vTreatmentUltrafiltration.volumeRemoved]   as UfStartMetricsVolumeRemoved
-            }
-            Rectangle "Item" as VolumeProgressItem #line:red;line.dashed {
-                package "ProgressBarEx.qml" as UfProgressBar #APPLICATION {
-                    [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min]   as VolumeProgressVolumeMin
-                    [vTreatmentUltrafiltration.setVolume]                           as VolumeProgressSetVolume
-                    [vTreatmentUltrafiltration.volumeRemoved]                       as VolumeProgressVolumeRemoved
+package "TreatmentStack : StackItem" as TreatmentStack {
+    package "TreatmentAdjustmentUltrafiltration : TreatmentAdjustmentBase" as TreatmentAdjustUf {
+        Rectangle "StackItem" as UfStackItem #line:red;line.dashed {
+            package "TreatmentAdjustmentUltrafiltrationStart : Item" as UfStart {
+                package "TreatmentAdjustmentUltrafiltrationMetrics" as UfStartMetrics #AliceBlue {
+                    [vTreatmentUltrafiltration.setVolume]       as UfStartMetricsSetVolume
+                    [vTreatmentUltrafiltration.volumeRemoved]   as UfStartMetricsVolumeRemoved
                 }
-            }
-            together {
-                package "TouchRect.qml" as PauseButton #APPLICATION {
-                    Rectangle "Pause" as PauseButtonText {
+                Rectangle "Item" as VolumeProgressItem #line:red;line.dashed {
+                    package "ProgressBarEx" as UfProgressBar #APPLICATION {
+                        [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min]   as VolumeProgressVolumeMin
+                        [vTreatmentUltrafiltration.setVolume]                           as VolumeProgressSetVolume
+                        [vTreatmentUltrafiltration.volumeRemoved]                       as VolumeProgressVolumeRemoved
                     }
                 }
-                Rectangle "Row" as ResumeRow #line:red;line.dashed {
-                    package "TouchRect.qml" as ResumeButton #APPLICATION {
-                        Rectangle "Resume" as ResumeButtonText {
+                Rectangle "Row" as ButtonRow #line:red;line.dashed {
+                    package "TouchRect" as ResumeButton #APPLICATION {
+                        Rectangle "Pause/Resume" as ResumeButtonText {
                         }
                     }
-                    package "TouchRect.qml" as EditUfButton #APPLICATION {
+                    package "TouchRect" as EditUfButton #APPLICATION {
                         Rectangle "Edit" as EditUfButtonText {
                         }
                     }
-                    package "TouchRect.qml" as IsolatedUsfButton #APPLICATION {
+                    package "TouchRect" as IsolatedUsfButton #APPLICATION {
                         Rectangle "Isolated UF" as IsolatedUfButtonText {
                         }
                     }
                 }
+                UfStartMetrics      -[hidden]down-  VolumeProgressItem
+                VolumeProgressItem  -[hidden]down-- ButtonRow
             }
-            UfStartMetrics      -[hidden]down-  VolumeProgressItem
-            VolumeProgressItem  -[hidden]down-- PauseButton
-        }
 
-        package "TreatmentAdjustmentUltrafiltrationEdit.qml" as UfEdit {
-            package "TreatmentAdjustmentUltrafiltrationMetrics.qml" as UfEditMetrics #AliceBlue {
-                [vTreatmentUltrafiltration.setVolume]       as UfEditMetricsSetVolume
-                [vTreatmentUltrafiltration.volumeRemoved]   as UfEditMetricsVolumeRemoved
-            }
-            Rectangle "Item" as EditSliderItem #line:red;line.dashed {
-                package "StoppedSlider.qml" as StoppedSlider #APPLICATION {
-                    [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min]   as SliderVolumeMin
-                    [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max]   as SliderVolumeMax
-                    [vTreatmentUltrafiltration.setVolume]                           as SliderSetVolume
-                    [vTreatmentUltrafiltration.volumeRemoved]                       as SliderVolumeRemoved
+            package "TreatmentAdjustmentUltrafiltrationEdit : Item" as UfEdit {
+                package "TreatmentAdjustmentUltrafiltrationMetrics" as UfEditMetrics #AliceBlue {
+                    [vTreatmentUltrafiltration.setVolume]       as UfEditMetricsSetVolume
+                    [vTreatmentUltrafiltration.volumeRemoved]   as UfEditMetricsVolumeRemoved
                 }
-            }
-            package "TouchRect.qml" as ContinueButton #APPLICATION {
-                Rectangle "Continue" as ContinueButtonText {
+                Rectangle "Item" as EditSliderItem #line:red;line.dashed {
+                    package "ProgressBar" as UfEditProgressBar #APPLICATION {
+                        [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min]   as EditVolumeMin
+                        [vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max]   as EditVolumeMax
+                        package "Rectangle" as UfEditProgressBarFill {
+                            package "RangeMarker" as UfEditRangeMarker {
+                                [vTreatmentUltrafiltration.volumeRemoved] as EditVolumeRemoved
+                            }
+                        }
+                        EditVolumeMin -[hidden]down- UfEditProgressBarFill
+                    }
+                    package "LabelUnitContainer" as UfVolumeGoalContainer {
+                        package "ValueAdjuster" as UfVolumeGoalAdjuster {
+                            [vTreatmentUltrafiltration.setVolume] as EditSetVolume
+                        }
+                    }
+                    UfEditProgressBar -[hidden]down-- UfVolumeGoalContainer
                 }
+                package "TouchRect" as ContinueButton #APPLICATION {
+                    Rectangle "Continue" as ContinueButtonText {
+                    }
+                }
+                UfEditMetrics   -[hidden]down-  EditSliderItem
+                EditSliderItem  -[hidden]down---- ContinueButton
             }
 
-            UfEditMetrics   -[hidden]down-  EditSliderItem
-            EditSliderItem  -[hidden]down-- ContinueButton
-        }
-
-        package "TreatmentAdjustmentUltrafiltrationConfirm.qml" as UfConfirm {
-            Rectangle "Item" as UfConfirmItem #line:red;line.dashed {
-                Rectangle "Column" as UfConfirmLeftColumn {
-                    [vTreatmentAdjustmentUltrafiltrationEdit.volume]    as UfConfirmVolume
+            package "TreatmentAdjustmentUltrafiltrationConfirm : Item" as UfConfirm {
+                Rectangle "Row" as UfConfirmRow #line:red;line.dashed {
+                    package "LabelUnitContainer" as UfNewVolume {
+                        [vTreatmentAdjustmentUltrafiltrationEdit.volume]    as UfConfirmVolume
+                    }
+                    package "LabelUnitContainer" as UfNewRate {
+                        [vTreatmentAdjustmentUltrafiltrationEdit.rate]      as UfConfirmRate
+                    }
                 }
-                Rectangle "Column" as UfConfirmRightColumn {
-                    [vTreatmentAdjustmentUltrafiltrationEdit.rate]      as UfConfirmRate
+                package "TouchRect" as ConfirmButton #APPLICATION {
+                    Rectangle "Confirm" as ConfirmButtonText {
+                    }
                 }
+                UfConfirmRow -[hidden]- ConfirmButton
             }
-            package "TouchRect.qml" as ConfirmButton #APPLICATION {
-                Rectangle "Confirm" as ConfirmButtonText {
-                }
-            }
-
-            UfConfirmItem -[hidden]- ConfirmButton
         }
-
         UfStart -[hidden]right- UfEdit
         UfEdit  -[hidden]right- UfConfirm
     }