Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs
===================================================================
diff -u -ra2c7b86519fdc614e1156b67ace16b5c9f265520 -r887a985a5e547f9b7f715dc8dff0e6a509381e4b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision a2c7b86519fdc614e1156b67ace16b5c9f265520)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision 887a985a5e547f9b7f715dc8dff0e6a509381e4b)
@@ -37,7 +37,18 @@
     /// </summary>
     public class HeightStructureProperties : ObjectProperties<HeightStructure>
     {
-        [PropertyOrder(1)]
+        private const int namePropertyIndex = 1;
+        private const int locationPropertyIndex = 2;
+        private const int structureNormalOrientationPropertyIndex = 3;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 4;
+        private const int widthFlowAperturesPropertyIndex = 5;
+        private const int storageStructureAreaPropertyIndex = 6;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 7;
+        private const int levelCrestStructurePropertyIndex = 8;
+        private const int criticalOvertoppingDischargePropertyIndex = 9;
+        private const int failureProbabilityStructureWithErosionPropertyIndex = 10;
+
+        [PropertyOrder(namePropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Name_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Name_Description")]
@@ -49,7 +60,7 @@
             }
         }
 
-        [PropertyOrder(2)]
+        [PropertyOrder(locationPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Location_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Location_Description")]
@@ -62,7 +73,7 @@
             }
         }
 
-        [PropertyOrder(3)]
+        [PropertyOrder(structureNormalOrientationPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_Description")]
@@ -74,39 +85,39 @@
             }
         }
 
-        [PropertyOrder(4)]
+        [PropertyOrder(flowWidthAtBottomProtectionPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")]
-        public NormalDistributionProperties LevelCrestStructure
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_Description")]
+        public LogNormalDistributionProperties FlowWidthAtBottomProtection
         {
             get
             {
-                return new NormalDistributionProperties
+                return new LogNormalDistributionProperties
                 {
-                    Data = data.LevelCrestStructure
+                    Data = data.FlowWidthAtBottomProtection
                 };
             }
         }
 
-        [PropertyOrder(5)]
+        [PropertyOrder(widthFlowAperturesPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_DisplayName")]
-        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_Description")]
-        public LogNormalDistributionProperties AllowedLevelIncreaseStorage
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_Description")]
+        public NormalDistributionVariationProperties WidthFlowApertures
         {
             get
             {
-                return new LogNormalDistributionProperties
+                return new NormalDistributionVariationProperties
                 {
-                    Data = data.AllowedLevelIncreaseStorage
+                    Data = data.WidthFlowApertures
                 };
             }
         }
 
-        [PropertyOrder(6)]
+        [PropertyOrder(storageStructureAreaPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StorageStructureArea_DisplayName")]
@@ -122,39 +133,39 @@
             }
         }
 
-        [PropertyOrder(7)]
+        [PropertyOrder(allowedLevelIncreaseStoragePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_DisplayName")]
-        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_FlowWidthAtBottomProtection_Description")]
-        public LogNormalDistributionProperties FlowWidthAtBottomProtection
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_AllowedLevelIncreaseStorage_Description")]
+        public LogNormalDistributionProperties AllowedLevelIncreaseStorage
         {
             get
             {
                 return new LogNormalDistributionProperties
                 {
-                    Data = data.FlowWidthAtBottomProtection
+                    Data = data.AllowedLevelIncreaseStorage
                 };
             }
         }
 
-        [PropertyOrder(8)]
+        [PropertyOrder(levelCrestStructurePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_DisplayName")]
-        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_WidthFlowApertures_Description")]
-        public NormalDistributionVariationProperties WidthFlowApertures
+        [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")]
+        public NormalDistributionProperties LevelCrestStructure
         {
             get
             {
-                return new NormalDistributionVariationProperties
+                return new NormalDistributionProperties
                 {
-                    Data = data.WidthFlowApertures
+                    Data = data.LevelCrestStructure
                 };
             }
         }
 
-        [PropertyOrder(9)]
+        [PropertyOrder(criticalOvertoppingDischargePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_CriticalOvertoppingDischarge_DisplayName")]
@@ -170,7 +181,7 @@
             }
         }
 
-        [PropertyOrder(10)]
+        [PropertyOrder(failureProbabilityStructureWithErosionPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")]
         [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")]