Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4 -rcb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 6e68772763eff7e38ef3e2c4dcfcbc18aff21cd4)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision cb4c5e6cd9a0478a8afe7d653bb7467b3c1a2b4e)
@@ -31,10 +31,10 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PropertyClasses;
+using Ringtoets.Common.Forms.UITypeEditors;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.Properties;
-using Ringtoets.HeightStructures.Forms.UITypeEditors;
 using Ringtoets.HeightStructures.Utils;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -44,7 +44,10 @@
     /// <summary>
     /// ViewModel of <see cref="HeightStructuresInputContext"/> for properties panel.
     /// </summary>
-    public class HeightStructuresInputContextProperties : ObjectProperties<HeightStructuresInputContext>
+    public class HeightStructuresInputContextProperties : ObjectProperties<HeightStructuresInputContext>,
+                                                          IHasStructureProperty<HeightStructure>,
+                                                          IHasForeshoreProfileProperty,
+                                                          IHasHydraulicBoundaryLocationProperty
     {
         private const int heightStructurePropertyIndex = 1;
         private const int heightStructureLocationPropertyIndex = 2;
@@ -84,44 +87,29 @@
 
         #endregion
 
-        /// <summary>
-        /// Returns the available hydraulic boundary locations in order for the user to select one to 
-        /// set <see cref="HeightStructuresInput.HydraulicBoundaryLocation"/>.
-        /// </summary>
-        /// <returns>The available hydraulic boundary locations.</returns>
+        public IEnumerable<ForeshoreProfile> GetAvailableForeshoreProfiles()
+        {
+            return data.FailureMechanism.ForeshoreProfiles;
+        }
+
         public IEnumerable<HydraulicBoundaryLocation> GetAvailableHydraulicBoundaryLocations()
         {
             return data.AvailableHydraulicBoundaryLocations;
         }
 
-        /// <summary>
-        /// Returns the available height structures in order for the user to select one to 
-        /// set <see cref="HeightStructuresInput.Structure"/>.
-        /// </summary>
-        /// <returns>The available height structures.</returns>
-        public IEnumerable<HeightStructure> GetAvailableHeightStructures()
+        public IEnumerable<HeightStructure> GetAvailableStructures()
         {
             return data.FailureMechanism.HeightStructures;
         }
 
-        /// <summary>
-        /// Returns the available foreshore profiles in order for the user to select one to 
-        /// set <see cref="HeightStructuresInput.ForeshoreProfile"/>.
-        /// </summary>
-        /// <returns>The available foreshore profiles.</returns>
-        public IEnumerable<ForeshoreProfile> GetAvailableForeshoreProfiles()
-        {
-            return data.FailureMechanism.ForeshoreProfiles;
-        }
-
         #region Schematization
 
         [PropertyOrder(heightStructurePropertyIndex)]
-        [Editor(typeof(HeightStructuresInputContextStructureEditor), typeof(UITypeEditor))]
+        [Editor(typeof(StructureEditor<HeightStructure>), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(Resources), "Structure_DisplayName")]
         [ResourcesDescription(typeof(Resources), "Structure_Description")]
-        public HeightStructure HeightStructure
+        public HeightStructure Structure
         {
             get
             {
@@ -296,7 +284,7 @@
         }
 
         [PropertyOrder(foreshoreProfilePropertyIndex)]
-        [Editor(typeof(HeightStructuresInputContextForeshoreProfileEditor), typeof(UITypeEditor))]
+        [Editor(typeof(ForeshoreProfileEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
         [ResourcesDisplayName(typeof(Resources), "ForeshoreProfile_DisplayName")]
         [ResourcesDescription(typeof(Resources), "ForeshoreProfile_Description")]
@@ -346,7 +334,7 @@
         #region Hydraulic data
 
         [PropertyOrder(hydraulicBoundaryLocationPropertyIndex)]
-        [Editor(typeof(HeightStructuresInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
+        [Editor(typeof(HydraulicBoundaryLocationEditor), typeof(UITypeEditor))]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_HydraulicData")]
         [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_DisplayName")]
         [ResourcesDescription(typeof(RingtoetsCommonFormsResources), "HydraulicBoundaryLocation_Description")]