Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r89e6554de0313cdaa6876ba510240ee98c8547bb -re7423204b7d614fbd894dbadfa4d4c7a7e894e94
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 89e6554de0313cdaa6876ba510240ee98c8547bb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
@@ -465,6 +465,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Kritieke waarden.
+        /// </summary>
+        public static string Categories_CriticalValues {
+            get {
+                return ResourceManager.GetString("Categories_CriticalValues", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Algemeen.
         /// </summary>
         public static string Categories_General {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r89e6554de0313cdaa6876ba510240ee98c8547bb -re7423204b7d614fbd894dbadfa4d4c7a7e894e94
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 89e6554de0313cdaa6876ba510240ee98c8547bb)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
@@ -739,4 +739,7 @@
   <data name="Structure_ThresholdHeightOpenWeir_DisplayName" xml:space="preserve">
     <value>Drempelhoogte [m+NAP]</value>
   </data>
+  <data name="Categories_CriticalValues" xml:space="preserve">
+    <value>Kritieke waarden</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs
===================================================================
diff -u -rb1b90dc0fd6fbb088eee337f911779724e7e79cd -re7423204b7d614fbd894dbadfa4d4c7a7e894e94
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs	(.../StabilityPointStructureProperties.cs)	(revision b1b90dc0fd6fbb088eee337f911779724e7e79cd)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs	(.../StabilityPointStructureProperties.cs)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
@@ -45,31 +45,52 @@
         private const int insideWaterLevelPropertyIndex = 3;
         private const int insideWaterLevelFailureConstructionPropertyIndex = 4;
 
-        private const int structureNormalOrientationPropertyIndex = 5;
-        private const int stabilityPointStructureInflowModelTypePropertyIndex = 6;
-        private const int widthFlowAperturesPropertyIndex = 7;
-        private const int areaFlowAperturesPropertyIndex = 8;
-        private const int flowWidthAtBottomProtectionPropertyIndex = 9;
-        private const int storageStructureAreaPropertyIndex = 10;
-        private const int allowedLevelIncreaseStoragePropertyIndex = 11;
-        private const int levelCrestStructurePropertyIndex = 12;
-        private const int thresholdHeightOpenWeirPropertyIndex = 13;
-        private const int criticalOvertoppingDischargePropertyIndex = 14;
-        private const int constructiveStrengthLinearLoadModelPropertyIndex = 15;
-        private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 16;
-        private const int bankWidthPropertyIndex = 17;
-        private const int evaluationLevelPropertyIndex = 18;
-        private const int verticalDistancePropertyIndex = 19;
-        private const int failureProbabilityRepairClosurePropertyIndex = 20;
-        private const int failureCollisionEnergyPropertyIndex = 21;
-        private const int shipMassPropertyIndex = 22;
-        private const int shipVelocityPropertyIndex = 23;
-        private const int levellingCountPropertyIndex = 24;
-        private const int probabilityCollisionSecondaryStructurePropertyIndex = 25;
-        private const int flowVelocityStructureClosablePropertyIndex = 26;
+        private const int flowVelocityStructureClosablePropertyIndex = 5;
+
+        private const int structureNormalOrientationPropertyIndex = 6;
+        private const int stabilityPointStructureInflowModelTypePropertyIndex = 7;
+        private const int widthFlowAperturesPropertyIndex = 8;
+        private const int areaFlowAperturesPropertyIndex = 9;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 10;
+        private const int storageStructureAreaPropertyIndex = 11;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 12;
+        private const int levelCrestStructurePropertyIndex = 13;
+        private const int thresholdHeightOpenWeirPropertyIndex = 14;
+        private const int criticalOvertoppingDischargePropertyIndex = 15;
+        private const int constructiveStrengthLinearLoadModelPropertyIndex = 16;
+        private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 17;
+        private const int bankWidthPropertyIndex = 18;
+        private const int evaluationLevelPropertyIndex = 19;
+        private const int verticalDistancePropertyIndex = 20;
+        private const int failureProbabilityRepairClosurePropertyIndex = 21;
+        private const int failureCollisionEnergyPropertyIndex = 22;
+        private const int shipMassPropertyIndex = 23;
+        private const int shipVelocityPropertyIndex = 24;
+        private const int levellingCountPropertyIndex = 25;
+        private const int probabilityCollisionSecondaryStructurePropertyIndex = 26;
         private const int stabilityLinearLoadModelPropertyIndex = 27;
         private const int stabilityQuadraticLoadModelPropertyIndex = 28;
 
+        #region Critical values
+
+        [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_CriticalValues")]
+        [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")]
+        public NormalDistributionProperties FlowVelocityStructureClosable
+        {
+            get
+            {
+                return new NormalDistributionProperties
+                {
+                    Data = data.FlowVelocityStructureClosable
+                };
+            }
+        }
+
+        #endregion
+
         #region General
 
         [PropertyOrder(namePropertyIndex)]
@@ -446,22 +467,6 @@
             }
         }
 
-        [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
-        [TypeConverter(typeof(ExpandableObjectConverter))]
-        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")]
-        public NormalDistributionProperties FlowVelocityStructureClosable
-        {
-            get
-            {
-                return new NormalDistributionProperties
-                {
-                    Data = data.FlowVelocityStructureClosable
-                };
-            }
-        }
-
         [PropertyOrder(stabilityLinearLoadModelPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs
===================================================================
diff -u -r89e6554de0313cdaa6876ba510240ee98c8547bb -re7423204b7d614fbd894dbadfa4d4c7a7e894e94
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs	(.../StabilityPointStructurePropertiesTest.cs)	(revision 89e6554de0313cdaa6876ba510240ee98c8547bb)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs	(.../StabilityPointStructurePropertiesTest.cs)	(revision e7423204b7d614fbd894dbadfa4d4c7a7e894e94)
@@ -41,28 +41,29 @@
         private const int insideWaterLevelPropertyIndex = 2;
         private const int insideWaterLevelFailureConstructionPropertyIndex = 3;
 
-        private const int structureNormalOrientationPropertyIndex = 4;
-        private const int stabilityPointStructureInflowModelTypePropertyIndex = 5;
-        private const int widthFlowAperturesPropertyIndex = 6;
-        private const int areaFlowAperturesPropertyIndex = 7;
-        private const int flowWidthAtBottomProtectionPropertyIndex = 8;
-        private const int storageStructureAreaPropertyIndex = 9;
-        private const int allowedLevelIncreaseStoragePropertyIndex = 10;
-        private const int levelCrestStructurePropertyIndex = 11;
-        private const int thresholdHeightOpenWeirPropertyIndex = 12;
-        private const int criticalOvertoppingDischargePropertyIndex = 13;
-        private const int constructiveStrengthLinearLoadModelPropertyIndex = 14;
-        private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 15;
-        private const int bankWidthPropertyIndex = 16;
-        private const int evaluationLevelPropertyIndex = 17;
-        private const int verticalDistancePropertyIndex = 18;
-        private const int failureProbabilityRepairClosurePropertyIndex = 19;
-        private const int failureCollisionEnergyPropertyIndex = 20;
-        private const int shipMassPropertyIndex = 21;
-        private const int shipVelocityPropertyIndex = 22;
-        private const int levellingCountPropertyIndex = 23;
-        private const int probabilityCollisionSecondaryStructurePropertyIndex = 24;
-        private const int flowVelocityStructureClosablePropertyIndex = 25;
+        private const int flowVelocityStructureClosablePropertyIndex = 4;
+
+        private const int structureNormalOrientationPropertyIndex = 5;
+        private const int stabilityPointStructureInflowModelTypePropertyIndex = 6;
+        private const int widthFlowAperturesPropertyIndex = 7;
+        private const int areaFlowAperturesPropertyIndex = 8;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 9;
+        private const int storageStructureAreaPropertyIndex = 10;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 11;
+        private const int levelCrestStructurePropertyIndex = 12;
+        private const int thresholdHeightOpenWeirPropertyIndex = 13;
+        private const int criticalOvertoppingDischargePropertyIndex = 14;
+        private const int constructiveStrengthLinearLoadModelPropertyIndex = 15;
+        private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 16;
+        private const int bankWidthPropertyIndex = 17;
+        private const int evaluationLevelPropertyIndex = 18;
+        private const int verticalDistancePropertyIndex = 19;
+        private const int failureProbabilityRepairClosurePropertyIndex = 20;
+        private const int failureCollisionEnergyPropertyIndex = 21;
+        private const int shipMassPropertyIndex = 22;
+        private const int shipVelocityPropertyIndex = 23;
+        private const int levellingCountPropertyIndex = 24;
+        private const int probabilityCollisionSecondaryStructurePropertyIndex = 25;
         private const int stabilityLinearLoadModelPropertyIndex = 26;
         private const int stabilityQuadraticLoadModelPropertyIndex = 27;
 
@@ -224,6 +225,7 @@
             const string schematizationCategory = "Schematisatie";
             const string hydraulicDataCategory = "Hydraulische gegevens";
             const string generalCategory = "Algemeen";
+            const string criticalValuesCategory = "Kritieke waarden";
 
             PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
             Assert.IsTrue(nameProperty.IsReadOnly);
@@ -249,6 +251,12 @@
             Assert.AreEqual("Binnenwaterstand bij constructief falen [m+NAP]", insideWaterLevelFailureConstructionProperty.DisplayName);
             Assert.AreEqual("Binnenwaterstand bij constructief falen.", insideWaterLevelFailureConstructionProperty.Description);
 
+            PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex];
+            Assert.IsInstanceOf<ExpandableObjectConverter>(flowVelocityStructureClosableProperty.Converter);
+            Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
+            Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
+            Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
+
             PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex];
             Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly);
             Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category);
@@ -370,12 +378,6 @@
             Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", probabilityCollisionSecondaryStructureProperty.DisplayName);
             Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering.", probabilityCollisionSecondaryStructureProperty.Description);
 
-            PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex];
-            Assert.IsInstanceOf<ExpandableObjectConverter>(flowVelocityStructureClosableProperty.Converter);
-            Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
-            Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
-            Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
-
             PropertyDescriptor stabilityLinearLoadModelProperty = dynamicProperties[stabilityLinearLoadModelPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(stabilityLinearLoadModelProperty.Converter);
             Assert.AreEqual(schematizationCategory, stabilityLinearLoadModelProperty.Category);