Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs	(revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -0,0 +1,74 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.Attributes;
+using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils.Attributes;
+using Ringtoets.ClosingStructures.Data;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.ClosingStructures.Forms.PropertyClasses
+{
+    /// <summary>
+    /// ViewModel of <see cref="ClosingStructure"/> for properties panel.
+    /// </summary>
+    public class ClosingStructureProperties : ObjectProperties<ClosingStructure>
+    {
+        [PropertyOrder(1)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Name_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Name_Description")]
+        public string Name
+        {
+            get
+            {
+                return data.Name;
+            }
+        }
+
+        [PropertyOrder(2)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Location_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Location_Description")]
+        public Point2D Location
+        {
+            get
+            {
+                return new Point2D(new RoundedDouble(0, data.Location.X),
+                                   new RoundedDouble(0, data.Location.Y));
+            }
+        }
+
+        [PropertyOrder(3)]
+        [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_Description")]
+        public RoundedDouble StructureNormalOrientation
+        {
+            get
+            {
+                return data.StructureNormalOrientation;
+            }
+        }
+    }
+}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj
===================================================================
diff -u -r6115bb70abacf9aed9119d43fc9430eff235da6a -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision 6115bb70abacf9aed9119d43fc9430eff235da6a)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -40,6 +40,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PropertyClasses\ClosingStructureProperties.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationGroupContext.cs" />
@@ -73,6 +74,11 @@
       <Name>Core.Common.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Gui\Core.Common.Gui.csproj">
+      <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
+      <Name>Core.Common.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
@@ -106,6 +112,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rf1c9115205cc613a4b07f9865014785ec780da79 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision f1c9115205cc613a4b07f9865014785ec780da79)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -28,6 +28,7 @@
 using Core.Common.Gui.Plugin;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
+using Ringtoets.ClosingStructures.Forms.PropertyClasses;
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.ClosingStructures.IO;
 using Ringtoets.Common.Data;
@@ -51,6 +52,11 @@
     /// </summary>
     public class ClosingStructuresPlugin : PluginBase
     {
+        public override IEnumerable<PropertyInfo> GetPropertyInfos()
+        {
+            yield return new PropertyInfo<ClosingStructure, ClosingStructureProperties>();
+        }
+
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
             yield return new ViewInfo<
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -0,0 +1,116 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.ComponentModel;
+using Core.Common.Base.Geometry;
+using Core.Common.Gui.PropertyBag;
+using NUnit.Framework;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.PropertyClasses;
+
+namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses
+{
+    [TestFixture]
+    public class ClosingStructurePropertiesTest
+    {
+        private const int namePropertyIndex = 0;
+        private const int locationPropertyIndex = 1;
+        private const int structureNormalOrientationPropertyIndex = 2;
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var properties = new ClosingStructureProperties();
+
+            // Assert
+            Assert.IsInstanceOf<ObjectProperties<ClosingStructure>>(properties);
+            Assert.IsNull(properties.Data);
+        }
+
+        [Test]
+        public void Data_SetNewClosingStructureInstance_ReturnCorrectPropertyValues()
+        {
+            // Setup
+            var structure = new ClosingStructure("A", "B", new Point2D(1, 2),
+                                                 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9,
+                                                 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16,
+                                                 17.17, 18.18, 19.19, 20.20, 21.21, 22, 23.23,
+                                                 ClosingStructureType.VerticalWall);
+            var properties = new ClosingStructureProperties();
+
+            // Call
+            properties.Data = structure;
+
+            // Assert
+            Assert.AreEqual(structure.Name, properties.Name);
+            Assert.AreEqual(structure.Location, properties.Location);
+            Assert.AreEqual(structure.StructureNormalOrientation, properties.StructureNormalOrientation);
+        }
+
+        [Test]
+        public void PropertyAttributes_ReturnExpectedValues()
+        {
+            // Setup
+            var structure = new ClosingStructure("A", "B", new Point2D(1, 2),
+                                                 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9,
+                                                 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16,
+                                                 17.17, 18.18, 19.19, 20.20, 21.21, 22, 23.23,
+                                                 ClosingStructureType.VerticalWall);
+
+            // Call
+            var properties = new ClosingStructureProperties
+            {
+                Data = structure
+            };
+
+            // Assert
+            var dynamicPropertyBag = new DynamicPropertyBag(properties);
+            PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
+            {
+                BrowsableAttribute.Yes
+            });
+            Assert.AreEqual(3, dynamicProperties.Count);
+
+            const string schematizationCategory = "Schematisatie";
+            const string generalCategory = "Algemeen";
+
+            PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
+            Assert.IsTrue(nameProperty.IsReadOnly);
+            Assert.AreEqual(generalCategory, nameProperty.Category);
+            Assert.AreEqual("Naam", nameProperty.DisplayName);
+            Assert.AreEqual("De naam van het kunstwerk.", nameProperty.Description);
+
+            PropertyDescriptor locationProperty = dynamicProperties[locationPropertyIndex];
+            Assert.IsTrue(locationProperty.IsReadOnly);
+            Assert.AreEqual(generalCategory, locationProperty.Category);
+            Assert.AreEqual("Locatie (RD) [m]", locationProperty.DisplayName);
+            Assert.AreEqual("De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel.", locationProperty.Description);
+
+            PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex];
+            Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly);
+            Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category);
+            Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName);
+            Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -rf1c9115205cc613a4b07f9865014785ec780da79 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision f1c9115205cc613a4b07f9865014785ec780da79)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -68,6 +68,7 @@
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresInputContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PropertyClasses\ClosingStructurePropertiesTest.cs" />
     <Compile Include="TreeNodeInfos\ClosingStructuresCalculationContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\ClosingStructuresContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs" />
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs
===================================================================
diff -u -rf1c9115205cc613a4b07f9865014785ec780da79 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision f1c9115205cc613a4b07f9865014785ec780da79)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs	(.../ClosingStructuresPluginTest.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -23,10 +23,12 @@
 using System.Linq;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.Plugin;
+using Core.Common.Gui.TestUtil;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
+using Ringtoets.ClosingStructures.Forms.PropertyClasses;
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.Common.Forms.PresentationObjects;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -48,6 +50,27 @@
         }
 
         [Test]
+        public void GetPropertyInfos_ReturnsSupportedPropertyClasses()
+        {
+            // setup
+            using (var plugin = new ClosingStructuresPlugin())
+            {
+                // call
+                PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
+
+                // assert
+                Assert.AreEqual(1, propertyInfos.Length);
+                PropertyInfo closingStructureProperties = PluginTestHelper.AssertPropertyInfoDefined(
+                    propertyInfos,
+                    typeof(ClosingStructure),
+                    typeof(ClosingStructureProperties));
+                Assert.IsNull(closingStructureProperties.AdditionalDataCheck);
+                Assert.IsNull(closingStructureProperties.GetObjectPropertiesData);
+                Assert.IsNull(closingStructureProperties.AfterCreate);
+            }
+        }
+
+        [Test]
         public void GetTreeNodeInfos_ReturnsSupportedTreeNodeInfos()
         {
             // Setup
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -red80cd8fb7d91c419ca42f706625e77ae014339e -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ed80cd8fb7d91c419ca42f706625e77ae014339e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -1641,6 +1641,60 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel..
+        /// </summary>
+        public static string Structure_Location_Description {
+            get {
+                return ResourceManager.GetString("Structure_Location_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Locatie (RD) [m].
+        /// </summary>
+        public static string Structure_Location_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_Location_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to De naam van het kunstwerk..
+        /// </summary>
+        public static string Structure_Name_Description {
+            get {
+                return ResourceManager.GetString("Structure_Name_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Naam.
+        /// </summary>
+        public static string Structure_Name_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_Name_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden..
+        /// </summary>
+        public static string Structure_StructureNormalOrientation_Description {
+            get {
+                return ResourceManager.GetString("Structure_StructureNormalOrientation_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Oriëntatie [°].
+        /// </summary>
+        public static string Structure_StructureNormalOrientation_DisplayName {
+            get {
+                return ResourceManager.GetString("Structure_StructureNormalOrientation_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Kunstwerken.
         /// </summary>
         public static string StructuresCollection_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -red80cd8fb7d91c419ca42f706625e77ae014339e -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ed80cd8fb7d91c419ca42f706625e77ae014339e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -664,4 +664,23 @@
   <data name="HydraulicBoundaryLocationSelectionDialog_Select_HydraulicBoundaryLocations" xml:space="preserve">
     <value>Selecteer hydraulische randvoorwaardenlocaties</value>
   </data>
+  <data name="Structure_Location_Description" xml:space="preserve">
+    <value>De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel.</value>
+  </data>
+  <data name="Structure_Location_DisplayName" xml:space="preserve">
+    <value>Locatie (RD) [m]</value>
+  </data>
+  <data name="Structure_Name_Description" xml:space="preserve">
+    <value>De naam van het kunstwerk.</value>
+  </data>
+  <data name="Structure_Name_DisplayName" xml:space="preserve">
+    <value>Naam</value>
+  </data>
+  <data name="Structure_StructureNormalOrientation_Description" xml:space="preserve">
+    <value>Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.</value>
+  </data>
+  <data name="Structure_StructureNormalOrientation_DisplayName" xml:space="preserve">
+    <value>Oriëntatie [°]</value>
+  </data>
+
 </root>
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -red80cd8fb7d91c419ca42f706625e77ae014339e -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ed80cd8fb7d91c419ca42f706625e77ae014339e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -199,42 +199,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel..
-        /// </summary>
-        public static string HeightStructure_Location_Description {
-            get {
-                return ResourceManager.GetString("HeightStructure_Location_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Locatie (RD) [m].
-        /// </summary>
-        public static string HeightStructure_Location_DisplayName {
-            get {
-                return ResourceManager.GetString("HeightStructure_Location_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De naam van het kunstwerk..
-        /// </summary>
-        public static string HeightStructure_Name_Description {
-            get {
-                return ResourceManager.GetString("HeightStructure_Name_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Naam.
-        /// </summary>
-        public static string HeightStructure_Name_DisplayName {
-            get {
-                return ResourceManager.GetString("HeightStructure_Name_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Invoer.
         /// </summary>
         public static string HeightStructuresInputContext_NodeDisplayName {
@@ -394,24 +358,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden..
-        /// </summary>
-        public static string StructureNormalOrientation_Description {
-            get {
-                return ResourceManager.GetString("StructureNormalOrientation_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Oriëntatie [°].
-        /// </summary>
-        public static string StructureNormalOrientation_DisplayName {
-            get {
-                return ResourceManager.GetString("StructureNormalOrientation_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Selecteer kunstwerken.
         /// </summary>
         public static string StructureSelectionDialog_Select_Structures {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -red80cd8fb7d91c419ca42f706625e77ae014339e -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ed80cd8fb7d91c419ca42f706625e77ae014339e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -174,12 +174,6 @@
   <data name="ModelFactorSuperCriticalFlow_DisplayName" xml:space="preserve">
     <value>Modelfactor van overloopdebiet bij superkritische stroming [-]</value>
   </data>
-  <data name="StructureNormalOrientation_Description" xml:space="preserve">
-    <value>Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.</value>
-  </data>
-  <data name="StructureNormalOrientation_DisplayName" xml:space="preserve">
-    <value>Oriëntatie [°]</value>
-  </data>
   <data name="StorageStructureArea_Description" xml:space="preserve">
     <value>Het kombergend oppervlak.</value>
   </data>
@@ -207,18 +201,6 @@
   <data name="FailureProbabilityStructureWithErosion_Value_cannot_be_null" xml:space="preserve">
     <value>De waarde voor de faalkans moet ingevuld zijn.</value>
   </data>
-  <data name="HeightStructure_Location_Description" xml:space="preserve">
-    <value>De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel.</value>
-  </data>
-  <data name="HeightStructure_Location_DisplayName" xml:space="preserve">
-    <value>Locatie (RD) [m]</value>
-  </data>
-  <data name="HeightStructure_Name_Description" xml:space="preserve">
-    <value>De naam van het kunstwerk.</value>
-  </data>
-  <data name="HeightStructure_Name_DisplayName" xml:space="preserve">
-    <value>Naam</value>
-  </data>
   <data name="Structure_Description" xml:space="preserve">
     <value>Het kunstwerk dat gebruikt wordt in de berekening.</value>
   </data>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs
===================================================================
diff -u -r9050ad5f3a80e630b2fcc092942a40d6343286a0 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision 9050ad5f3a80e630b2fcc092942a40d6343286a0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs	(.../HeightStructureProperties.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -39,8 +39,8 @@
     {
         [PropertyOrder(1)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HeightStructure_Name_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HeightStructure_Name_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Name_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Name_Description")]
         public string Name
         {
             get
@@ -51,8 +51,8 @@
 
         [PropertyOrder(2)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
-        [ResourcesDisplayName(typeof(Resources), "HeightStructure_Location_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HeightStructure_Location_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Location_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Location_Description")]
         public Point2D Location
         {
             get
@@ -64,8 +64,8 @@
 
         [PropertyOrder(3)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "StructureNormalOrientation_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "StructureNormalOrientation_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_Description")]
         public RoundedDouble StructureNormalOrientation
         {
             get
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -rccf22c570f610fc47e18f8e92afc6aab2ee6c896 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision ccf22c570f610fc47e18f8e92afc6aab2ee6c896)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -135,8 +135,8 @@
 
         [PropertyOrder(heightStructureLocationPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "HeightStructure_Location_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "HeightStructure_Location_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_Location_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_Location_Description")]
         public Point2D HeightStructureLocation
         {
             get
@@ -150,8 +150,8 @@
 
         [PropertyOrder(structureNormalOrientationPropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
-        [ResourcesDisplayName(typeof(Resources), "StructureNormalOrientation_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "StructureNormalOrientation_Description")]
+        [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_DisplayName")]
+        [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "Structure_StructureNormalOrientation_Description")]
         public RoundedDouble StructureNormalOrientation
         {
             get
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs
===================================================================
diff -u -r9050ad5f3a80e630b2fcc092942a40d6343286a0 -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs	(.../HeightStructurePropertiesTest.cs)	(revision 9050ad5f3a80e630b2fcc092942a40d6343286a0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs	(.../HeightStructurePropertiesTest.cs)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
@@ -34,14 +34,14 @@
     {
         private const int namePropertyIndex = 0;
         private const int locationPropertyIndex = 1;
-        private const int structureNormalOrientation = 2;
-        private const int levelCrestStructure = 3;
-        private const int allowedLevelIncreaseStorage = 4;
-        private const int storageStructureArea = 5;
-        private const int flowWidthAtBottomProtection = 6;
-        private const int widthFlowApertures = 7;
-        private const int criticalOvertoppingDischarge = 8;
-        private const int failureProbabilityStructureWithErosion = 9;
+        private const int structureNormalOrientationPropertyIndex = 2;
+        private const int levelCrestStructurePropertyIndex = 3;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 4;
+        private const int storageStructureAreaPropertyIndex = 5;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 6;
+        private const int widthFlowAperturesPropertyIndex = 7;
+        private const int criticalOvertoppingDischargePropertyIndex = 8;
+        private const int failureProbabilityStructureWithErosionPropertyIndex = 9;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -120,7 +120,10 @@
 
             // Assert
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
-            PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]{BrowsableAttribute.Yes});
+            PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
+            {
+                BrowsableAttribute.Yes
+            });
             Assert.AreEqual(10, dynamicProperties.Count);
 
             const string schematizationCategory = "Schematisatie";
@@ -138,50 +141,49 @@
             Assert.AreEqual("Locatie (RD) [m]", locationProperty.DisplayName);
             Assert.AreEqual("De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel.", locationProperty.Description);
 
-
-            PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientation];
+            PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex];
             Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly);
             Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category);
             Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName);
             Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description);
 
-            PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructure];
+            PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructurePropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(levelCrestStructureProperty.Converter);
             Assert.AreEqual(schematizationCategory, levelCrestStructureProperty.Category);
             Assert.AreEqual("Kerende hoogte [m]", levelCrestStructureProperty.DisplayName);
             Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelCrestStructureProperty.Description);
 
-            PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStorage];
+            PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStoragePropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(allowedLevelIncreaseStorageProperty.Converter);
             Assert.AreEqual(schematizationCategory, allowedLevelIncreaseStorageProperty.Category);
             Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowedLevelIncreaseStorageProperty.DisplayName);
             Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowedLevelIncreaseStorageProperty.Description);
 
-            PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureArea];
+            PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(storageStructureAreaProperty.Converter);
             Assert.AreEqual(schematizationCategory, storageStructureAreaProperty.Category);
             Assert.AreEqual("Kombergend oppervlak [m²]", storageStructureAreaProperty.DisplayName);
             Assert.AreEqual("Het kombergend oppervlak.", storageStructureAreaProperty.Description);
 
-            PropertyDescriptor flowWidthAtBottomProtectionProperty = dynamicProperties[flowWidthAtBottomProtection];
+            PropertyDescriptor flowWidthAtBottomProtectionProperty = dynamicProperties[flowWidthAtBottomProtectionPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(flowWidthAtBottomProtectionProperty.Converter);
             Assert.AreEqual(schematizationCategory, flowWidthAtBottomProtectionProperty.Category);
             Assert.AreEqual("Stroomvoerende breedte bij bodembescherming [m]", flowWidthAtBottomProtectionProperty.DisplayName);
             Assert.AreEqual("De stroomvoerende breedte bij bodembescherming.", flowWidthAtBottomProtectionProperty.Description);
 
-            PropertyDescriptor widthFlowAperturesProperty = dynamicProperties[widthFlowApertures];
+            PropertyDescriptor widthFlowAperturesProperty = dynamicProperties[widthFlowAperturesPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(widthFlowAperturesProperty.Converter);
             Assert.AreEqual(schematizationCategory, widthFlowAperturesProperty.Category);
             Assert.AreEqual("Breedte van de kruin van het kunstwerk [m]", widthFlowAperturesProperty.DisplayName);
             Assert.AreEqual("De breedte van de kruin van het kunstwerk.", widthFlowAperturesProperty.Description);
 
-            PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischarge];
+            PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(criticalOvertoppingDischargeProperty.Converter);
             Assert.AreEqual(schematizationCategory, criticalOvertoppingDischargeProperty.Category);
             Assert.AreEqual("Kritiek overslagdebiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName);
             Assert.AreEqual("Het kritieke overslagdebiet per strekkende meter.", criticalOvertoppingDischargeProperty.Description);
 
-            PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosion];
+            PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex];
             Assert.IsTrue(failureProbabilityStructureWithErosionProperty.IsReadOnly);
             Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category);
             Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName);