Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs
===================================================================
diff -u -rc09b65e09c7af06495433e73530b900c46414392 -rbcc1d59b72f2928780e1512a7e4c10a6e1ce68ab
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision c09b65e09c7af06495433e73530b900c46414392)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision bcc1d59b72f2928780e1512a7e4c10a6e1ce68ab)
@@ -38,6 +38,18 @@
             }
         }
 
+        [PropertyOrder(3)]
+        [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
+        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_WaterVolumetricWeight_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_WaterVolumetricWeight_Description")]
+        public double WaterVolumetricWeight
+        {
+            get
+            {
+                return data.WrappedData.GeneralInput.WaterVolumetricWeight;
+            }
+        }
+
         #endregion
 
         #region Model Factors
@@ -68,20 +80,37 @@
 
         #endregion
 
-        #region General sub-failure mechanism parameters
+        #region Semi-probabilistic parameters
 
         [PropertyOrder(21)]
-        [ResourcesCategory(typeof(Common.Data.Properties.Resources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_WaterVolumetricWeight_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_WaterVolumetricWeight_Description")]
-        public double WaterVolumetricWeight
+        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
+        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_A_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_A_Description")]
+        public double A
         {
             get
             {
-                return data.WrappedData.GeneralInput.WaterVolumetricWeight;
+                return data.WrappedData.PipingProbabilityAssessmentInput.A;
             }
+            set
+            {
+                data.WrappedData.PipingProbabilityAssessmentInput.A = value;
+                data.WrappedData.NotifyObservers();
+            }
         }
 
+        [PropertyOrder(22)]
+        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
+        [ResourcesDisplayName(typeof(Resources), "GenerapPipingInput_B_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_B_Description")]
+        public double B
+        {
+            get
+            {
+                return data.WrappedData.PipingProbabilityAssessmentInput.B;
+            }
+        }
+
         #endregion
 
         #region Heave
@@ -100,9 +129,30 @@
 
         #endregion
 
-        #region Sellmeijer
+        #region Uplift
 
         [PropertyOrder(41)]
+        [ResourcesCategory(typeof(Resources), "Categories_Uplift")]
+        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_UpliftCriticalSafetyFactor_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_UpliftCriticalSafetyFactor_Description")]
+        public double UpliftCriticalSafetyFactor
+        {
+            get
+            {
+                return data.WrappedData.PipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor;
+            }
+            set
+            {
+                data.WrappedData.PipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor = value;
+                data.WrappedData.NotifyObservers();
+            }
+        }
+
+        #endregion
+
+        #region Sellmeijer
+
+        [PropertyOrder(51)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_SandParticlesVolumicWeight_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_SandParticlesVolumicWeight_Description")]
@@ -114,7 +164,7 @@
             }
         }
 
-        [PropertyOrder(42)]
+        [PropertyOrder(52)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_WhitesDragCoefficient_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_WhitesDragCoefficient_Description")]
@@ -126,7 +176,7 @@
             }
         }
 
-        [PropertyOrder(43)]
+        [PropertyOrder(53)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_BeddingAngle_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_BeddingAngle_Description")]
@@ -138,7 +188,7 @@
             }
         }
 
-        [PropertyOrder(44)]
+        [PropertyOrder(54)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_WaterKinematicViscosity_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_WaterKinematicViscosity_Description")]
@@ -150,7 +200,7 @@
             }
         }
 
-        [PropertyOrder(45)]
+        [PropertyOrder(55)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_Gravity_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_Gravity_Description")]
@@ -162,7 +212,7 @@
             }
         }
 
-        [PropertyOrder(46)]
+        [PropertyOrder(56)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_MeanDiameter70_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_MeanDiameter70_Description")]
@@ -174,7 +224,7 @@
             }
         }
 
-        [PropertyOrder(47)]
+        [PropertyOrder(57)]
         [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")]
         [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_SellmeijerReductionFactor_DisplayName")]
         [ResourcesDescription(typeof(Resources), "GeneralPipingInput_SellmeijerReductionFactor_Description")]
@@ -187,38 +237,5 @@
         }
 
         #endregion
-
-        #region Semi-probabilistic parameters
-
-        [PropertyOrder(51)]
-        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
-        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_A_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_A_Description")]
-        public double A
-        {
-            get
-            {
-                return data.WrappedData.PipingProbabilityAssessmentInput.A;
-            }
-            set
-            {
-                data.WrappedData.PipingProbabilityAssessmentInput.A = value;
-                data.WrappedData.NotifyObservers();
-            }
-        }
-
-        [PropertyOrder(52)]
-        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
-        [ResourcesDisplayName(typeof(Resources), "GenerapPipingInput_B_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_B_Description")]
-        public double B
-        {
-            get
-            {
-                return data.WrappedData.PipingProbabilityAssessmentInput.B;
-            }
-        }
-
-        #endregion
     }
 }
\ No newline at end of file