Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs
===================================================================
diff -u -r2657118de454794167b31aea0b730940c958c5c5 -rf41a3e73eca3e0b0a8639bdb8bdae4454be2ad36
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs	(.../FailureMechanismWithDetailedAssessmentView.cs)	(revision 2657118de454794167b31aea0b730940c958c5c5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs	(.../FailureMechanismWithDetailedAssessmentView.cs)	(revision f41a3e73eca3e0b0a8639bdb8bdae4454be2ad36)
@@ -45,7 +45,7 @@
         private readonly Func<IEnumerable<MapFeature>> getDetailedAssemblyFeaturesFunc;
         private readonly Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc;
         private readonly Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc;
-        
+
         private MapDataCollection mapDataCollection;
         private MapLineData referenceLineMapData;
         private MapPointData hydraulicBoundaryLocationsMapData;
@@ -87,7 +87,7 @@
         /// <param name="getCombinedAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
         /// the combined assembly results for this failure mechanism.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismWithDetailedAssessmentView(TFailureMechanism failureMechanism, 
+        public FailureMechanismWithDetailedAssessmentView(TFailureMechanism failureMechanism,
                                                           IAssessmentSection assessmentSection,
                                                           Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc,
                                                           Func<IEnumerable<MapFeature>> getDetailedAssemblyFeaturesFunc,
@@ -141,39 +141,6 @@
             ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData);
         }
 
-        private void CreateMapData()
-        {
-            mapDataCollection = new MapDataCollection(FailureMechanism.Name);
-            referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
-            hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
-
-            MapDataCollection sectionsMapDataCollection = RingtoetsMapDataFactory.CreateSectionsMapDataCollection();
-            sectionsMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsMapData();
-            sectionsStartPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
-            sectionsEndPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
-
-            MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection();
-            tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData();
-            detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData();
-            simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData();
-            combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData();
-
-            mapDataCollection.Add(referenceLineMapData);
-
-            sectionsMapDataCollection.Add(sectionsMapData);
-            sectionsMapDataCollection.Add(sectionsStartPointMapData);
-            sectionsMapDataCollection.Add(sectionsEndPointMapData);
-            mapDataCollection.Add(sectionsMapDataCollection);
-
-            assemblyMapDataCollection.Add(tailorMadeAssemblyMapData);
-            assemblyMapDataCollection.Add(detailedAssemblyMapData);
-            assemblyMapDataCollection.Add(simpleAssemblyMapData);
-            assemblyMapDataCollection.Add(combinedAssemblyMapData);
-            mapDataCollection.Add(assemblyMapDataCollection);
-
-            mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
-        }
-
         /// <summary>
         /// Gets the failure mechanism.
         /// </summary>
@@ -217,6 +184,39 @@
             base.Dispose(disposing);
         }
 
+        private void CreateMapData()
+        {
+            mapDataCollection = new MapDataCollection(FailureMechanism.Name);
+            referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
+            hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
+
+            MapDataCollection sectionsMapDataCollection = RingtoetsMapDataFactory.CreateSectionsMapDataCollection();
+            sectionsMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsMapData();
+            sectionsStartPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
+            sectionsEndPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
+
+            MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection();
+            tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData();
+            detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData();
+            simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData();
+            combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData();
+
+            mapDataCollection.Add(referenceLineMapData);
+
+            sectionsMapDataCollection.Add(sectionsMapData);
+            sectionsMapDataCollection.Add(sectionsStartPointMapData);
+            sectionsMapDataCollection.Add(sectionsEndPointMapData);
+            mapDataCollection.Add(sectionsMapDataCollection);
+
+            assemblyMapDataCollection.Add(tailorMadeAssemblyMapData);
+            assemblyMapDataCollection.Add(detailedAssemblyMapData);
+            assemblyMapDataCollection.Add(simpleAssemblyMapData);
+            assemblyMapDataCollection.Add(combinedAssemblyMapData);
+            mapDataCollection.Add(assemblyMapDataCollection);
+
+            mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
+        }
+
         private void CreateObservers()
         {
             failureMechanismObserver = new Observer(UpdateFailureMechanismMapData)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs
===================================================================
diff -u -r45668cee9f8146a743e4673a32bc4c885be8cace -rf41a3e73eca3e0b0a8639bdb8bdae4454be2ad36
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs	(.../FailureMechanismWithoutDetailedAssessmentView.cs)	(revision 45668cee9f8146a743e4673a32bc4c885be8cace)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs	(.../FailureMechanismWithoutDetailedAssessmentView.cs)	(revision f41a3e73eca3e0b0a8639bdb8bdae4454be2ad36)
@@ -44,7 +44,7 @@
         private readonly Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc;
         private readonly Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc;
         private readonly Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc;
-        
+
         private MapDataCollection mapDataCollection;
         private MapLineData referenceLineMapData;
         private MapPointData hydraulicBoundaryLocationsMapData;
@@ -83,11 +83,11 @@
         /// <param name="getCombinedAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
         /// the combined assembly results for this failure mechanism.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismWithoutDetailedAssessmentView(TFailureMechanism failureMechanism, 
-                                                          IAssessmentSection assessmentSection,
-                                                          Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc,
-                                                          Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc,
-                                                          Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc)
+        public FailureMechanismWithoutDetailedAssessmentView(TFailureMechanism failureMechanism,
+                                                             IAssessmentSection assessmentSection,
+                                                             Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc,
+                                                             Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc,
+                                                             Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc)
         {
             if (failureMechanism == null)
             {
@@ -130,37 +130,6 @@
             ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData);
         }
 
-        private void CreateMapData()
-        {
-            mapDataCollection = new MapDataCollection(FailureMechanism.Name);
-            referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
-            hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
-
-            MapDataCollection sectionsMapDataCollection = RingtoetsMapDataFactory.CreateSectionsMapDataCollection();
-            sectionsMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsMapData();
-            sectionsStartPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
-            sectionsEndPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
-
-            MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection();
-            tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData();
-            simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData();
-            combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData();
-
-            mapDataCollection.Add(referenceLineMapData);
-
-            sectionsMapDataCollection.Add(sectionsMapData);
-            sectionsMapDataCollection.Add(sectionsStartPointMapData);
-            sectionsMapDataCollection.Add(sectionsEndPointMapData);
-            mapDataCollection.Add(sectionsMapDataCollection);
-
-            assemblyMapDataCollection.Add(tailorMadeAssemblyMapData);
-            assemblyMapDataCollection.Add(simpleAssemblyMapData);
-            assemblyMapDataCollection.Add(combinedAssemblyMapData);
-            mapDataCollection.Add(assemblyMapDataCollection);
-
-            mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
-        }
-
         /// <summary>
         /// Gets the failure mechanism.
         /// </summary>
@@ -204,6 +173,37 @@
             base.Dispose(disposing);
         }
 
+        private void CreateMapData()
+        {
+            mapDataCollection = new MapDataCollection(FailureMechanism.Name);
+            referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
+            hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
+
+            MapDataCollection sectionsMapDataCollection = RingtoetsMapDataFactory.CreateSectionsMapDataCollection();
+            sectionsMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsMapData();
+            sectionsStartPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
+            sectionsEndPointMapData = RingtoetsMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
+
+            MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection();
+            tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData();
+            simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData();
+            combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData();
+
+            mapDataCollection.Add(referenceLineMapData);
+
+            sectionsMapDataCollection.Add(sectionsMapData);
+            sectionsMapDataCollection.Add(sectionsStartPointMapData);
+            sectionsMapDataCollection.Add(sectionsEndPointMapData);
+            mapDataCollection.Add(sectionsMapDataCollection);
+
+            assemblyMapDataCollection.Add(tailorMadeAssemblyMapData);
+            assemblyMapDataCollection.Add(simpleAssemblyMapData);
+            assemblyMapDataCollection.Add(combinedAssemblyMapData);
+            mapDataCollection.Add(assemblyMapDataCollection);
+
+            mapDataCollection.Add(hydraulicBoundaryLocationsMapData);
+        }
+
         private void CreateObservers()
         {
             failureMechanismObserver = new Observer(UpdateFailureMechanismMapData)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rce9b991f7116ccba947c49bbb379e7a0728a7bd3 -rf41a3e73eca3e0b0a8639bdb8bdae4454be2ad36
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismViewInfoTest.cs)	(revision ce9b991f7116ccba947c49bbb379e7a0728a7bd3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/MacroStabilityOutwardsFailureMechanismViewInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismViewInfoTest.cs)	(revision f41a3e73eca3e0b0a8639bdb8bdae4454be2ad36)
@@ -29,7 +29,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.PresentationObjects.StandAlone;