Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs
===================================================================
diff -u -ref9f41ef150aee02d286c53de24660a19d948e02 -rc61152c80323d74e6f848f5617c33ddeacd5e089
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs	(.../DesignWaterLevelCalculationsProperties.cs)	(revision ef9f41ef150aee02d286c53de24660a19d948e02)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignWaterLevelCalculationsProperties.cs	(.../DesignWaterLevelCalculationsProperties.cs)	(revision c61152c80323d74e6f848f5617c33ddeacd5e089)
@@ -46,7 +46,7 @@
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Locations_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Locations_Description))]
-        public DesignWaterLevelCalculationProperties[] Calculations
+        public virtual DesignWaterLevelCalculationProperties[] Calculations
         {
             get
             {
Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs
===================================================================
diff -u -rb685b7897863f95c9b3ed34a67c020681ec152a0 -rc61152c80323d74e6f848f5617c33ddeacd5e089
--- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision b685b7897863f95c9b3ed34a67c020681ec152a0)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs	(.../WaterLevelCalculationsForUserDefinedTargetProbabilityProperties.cs)	(revision c61152c80323d74e6f848f5617c33ddeacd5e089)
@@ -21,6 +21,7 @@
 
 using System;
 using Core.Common.Util.Attributes;
+using Core.Gui.Attributes;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Forms.Properties;
 using Riskeer.Common.Forms.TypeConverters;
@@ -33,6 +34,9 @@
     /// </summary>
     public class WaterLevelCalculationsForUserDefinedTargetProbabilityProperties : DesignWaterLevelCalculationsProperties
     {
+        private const int targetProbabilityPropertyIndex = 1;
+        private const int calculationsPropertyIndex = 2;
+
         private static readonly NoProbabilityValueDoubleConverter noProbabilityValueDoubleConverter = new NoProbabilityValueDoubleConverter();
         private readonly HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForTargetProbability;
 
@@ -47,6 +51,16 @@
             this.calculationsForTargetProbability = calculationsForTargetProbability;
         }
 
+        [PropertyOrder(calculationsPropertyIndex)]
+        public override DesignWaterLevelCalculationProperties[] Calculations
+        {
+            get
+            {
+                return base.Calculations;
+            }
+        }
+
+        [PropertyOrder(targetProbabilityPropertyIndex)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.TargetProbability_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.TargetProbability_WaterLevels_Description))]