Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs	(.../ClosingStructuresFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -36,7 +36,9 @@
     /// The view for a collection of <see cref="ClosingStructuresFailureMechanismSectionResult"/> for closing structures.
     /// </summary>
     public class ClosingStructuresFailureMechanismResultView : FailureMechanismResultView<ClosingStructuresFailureMechanismSectionResult,
-        ClosingStructuresFailureMechanismSectionResultRow, ClosingStructuresFailureMechanism>
+        ClosingStructuresFailureMechanismSectionResultRow,
+        ClosingStructuresFailureMechanism,
+        FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -85,7 +86,8 @@
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<ClosingStructuresFailureMechanismSectionResult,
                     ClosingStructuresFailureMechanismSectionResultRow,
-                    ClosingStructuresFailureMechanism>>(view);
+                    ClosingStructuresFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs	(.../FailureMechanismResultView.Designer.cs)	(revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.Designer.cs	(.../FailureMechanismResultView.Designer.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -21,7 +21,7 @@
 
 namespace Ringtoets.Common.Forms.Views
 {
-    partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism>
+    partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism, TAssemblyResultControl>
     {
         /// <summary> 
         /// Required designer variable.
@@ -76,7 +76,7 @@
             this.failureMechanismAssemblyLabel.Name = "failureMechanismAssemblyLabel";
             this.failureMechanismAssemblyLabel.Size = new System.Drawing.Size(57, 30);
             this.failureMechanismAssemblyLabel.TabIndex = 2;
-            this.failureMechanismAssemblyLabel.Text = "Label Text";
+            this.failureMechanismAssemblyLabel.Text = global::Ringtoets.Common.Forms.Properties.Resources.FailureMechanismResultView_FailureMechanismAssemblyLabel;;
             this.failureMechanismAssemblyLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // infoIcon
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs	(.../FailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -38,26 +38,28 @@
     /// The view for the <see cref="FailureMechanismSectionResult"/>.
     /// </summary>
     /// <typeparam name="TSectionResult">The type of results which are presented by the 
-    /// <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism}"/>.</typeparam>
+    /// <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism, TAssemblyResultControl}"/>.</typeparam>
     /// <typeparam name="TSectionResultRow">The type of the row that is used to show the data.</typeparam>
     /// <typeparam name="TFailureMechanism">The type of the failure mechanism this view belongs to.</typeparam>
-    public abstract partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism> : UserControl, IView
+    /// <typeparam name="TAssemblyResultControl">The type of the assembly result control in this view.</typeparam>
+    public abstract partial class FailureMechanismResultView<TSectionResult, TSectionResultRow, TFailureMechanism, TAssemblyResultControl> : UserControl, IView
         where TSectionResult : FailureMechanismSectionResult
         where TSectionResultRow : FailureMechanismSectionResultRow<TSectionResult>
         where TFailureMechanism : IFailureMechanism
+        where TAssemblyResultControl : AssemblyResultControl, new()
     {
         private readonly IObservableEnumerable<TSectionResult> failureMechanismSectionResults;
         private readonly Observer failureMechanismObserver;
         private readonly Observer failureMechanismSectionResultObserver;
         private readonly RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> failureMechanismSectionResultsObserver;
-        private AssemblyResultControl failureMechanismAssemblyResultControl;
+        private TAssemblyResultControl failureMechanismAssemblyResultControl;
         private Action setFailureMechanismAssemblyResultAction;
 
         private IEnumerable<TSectionResultRow> sectionResultRows;
         private bool rowUpdating;
 
         /// <summary>
-        /// Creates a new instance of <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism}"/>.
+        /// Creates a new instance of <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism, TAssemblyResultControl}"/>.
         /// </summary>
         /// <param name="failureMechanismSectionResults">The collection of <typeparamref name="TSectionResult"/> to
         /// show in the view.</param>
@@ -76,7 +78,7 @@
             }
 
             InitializeComponent();
-            InitializeFailureMechanismAssemblyComponents();
+            InitializeInfoIcon();
 
             FailureMechanism = failureMechanism;
             this.failureMechanismSectionResults = failureMechanismSectionResults;
@@ -118,7 +120,7 @@
 
         /// <summary>
         /// Creates a display object for <paramref name="sectionResult"/> which is added to the
-        /// <see cref="DataGridView"/> on the <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism}"/>.
+        /// <see cref="DataGridView"/> on the <see cref="FailureMechanismResultView{TSectionResult, TSectionResultRow, TFailureMechanism, TAssemblyResultControl}"/>.
         /// </summary>
         /// <param name="sectionResult">The <typeparamref name="TSectionResult"/> for which to create a
         /// display object.</param>
@@ -144,28 +146,6 @@
         }
 
         /// <summary>
-        /// Updates the data source of the data grid view with the current known failure mechanism section results.
-        /// </summary>
-        protected void UpdateDataGridViewDataSource()
-        {
-            DataGridViewControl.EndEdit();
-
-            RemoveSectionResultRowEvents();
-
-            sectionResultRows = failureMechanismSectionResults
-                                .Select(CreateFailureMechanismSectionResultRow)
-                                .Where(sr => sr != null)
-                                .ToList();
-            DataGridViewControl.SetDataSource(sectionResultRows);
-
-            sectionResultRows?.ForEachElementDo(row =>
-            {
-                row.RowUpdated += RowUpdated;
-                row.RowUpdateDone += RowUpdateDone;
-            });
-        }
-
-        /// <summary>
         /// Adds the columns to the view.
         /// </summary>
         protected abstract void AddDataGridColumns();
@@ -175,14 +155,16 @@
         /// </summary>
         /// <param name="control">The control to set on the view.</param>
         /// <param name="setResultAction">The action to perform to update the data of the control.</param>
-        protected void SetAssemblyResultControl(AssemblyResultControl control,
-                                                                Action setResultAction)
+        protected void SetAssemblyResultControl(TAssemblyResultControl control,
+                                                Action setResultAction)
         {
-            failureMechanismAssemblyResultControl = control;
+            failureMechanismAssemblyResultControl = new TAssemblyResultControl();
             setFailureMechanismAssemblyResultAction = setResultAction;
             TableLayoutPanel.Controls.Add(failureMechanismAssemblyResultControl, 1, 0);
         }
 
+        protected abstract void UpdateAssemblyResultControl();
+
         /// <summary>
         /// Updates all controls in the view.
         /// </summary>
@@ -192,6 +174,28 @@
             UpdateFailureMechanismAssemblyResultControl();
         }
 
+        /// <summary>
+        /// Updates the data source of the data grid view with the current known failure mechanism section results.
+        /// </summary>
+        private void UpdateDataGridViewDataSource()
+        {
+            DataGridViewControl.EndEdit();
+
+            RemoveSectionResultRowEvents();
+
+            sectionResultRows = failureMechanismSectionResults
+                                .Select(CreateFailureMechanismSectionResultRow)
+                                .Where(sr => sr != null)
+                                .ToList();
+            DataGridViewControl.SetDataSource(sectionResultRows);
+
+            sectionResultRows?.ForEachElementDo(row =>
+            {
+                row.RowUpdated += RowUpdated;
+                row.RowUpdateDone += RowUpdateDone;
+            });
+        }
+
         private void UpdateFailureMechanismAssemblyResultControl()
         {
             if (failureMechanismAssemblyResultControl != null && setFailureMechanismAssemblyResultAction != null)
@@ -208,11 +212,10 @@
             }
         }
 
-        private void InitializeFailureMechanismAssemblyComponents()
+        private void InitializeInfoIcon()
         {
             infoIcon.BackgroundImage = CoreCommonGuiResources.information;
             toolTip.SetToolTip(infoIcon, Resources.FailureMechanismResultView_InfoToolTip);
-            failureMechanismAssemblyLabel.Text = Resources.FailureMechanismResultView_FailureMechanismAssemblyLabel;
         }
 
         private void RemoveSectionResultRowEvents()
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs	(.../FailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -486,7 +486,7 @@
             return (BorderedLabel) new ControlTester("GroupLabel").TheObject;
         }
 
-        private class TestFailureMechanismResultView : FailureMechanismResultView<FailureMechanismSectionResult, FailureMechanismSectionResultRow<FailureMechanismSectionResult>, TestFailureMechanism>
+        private class TestFailureMechanismResultView : FailureMechanismResultView<FailureMechanismSectionResult, FailureMechanismSectionResultRow<FailureMechanismSectionResult>, TestFailureMechanism, FailureMechanismAssemblyCategoryGroupControl>
         {
             public TestFailureMechanismResultView(IObservableEnumerable<FailureMechanismSectionResult> failureMechanismSectionResults, TestFailureMechanism failureMechanism)
                 : base(failureMechanismSectionResults, failureMechanism)
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs
===================================================================
diff -u -rbfd888d1102f04ff8d56e2e90c0d4ebea559f2e3 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs	(.../FailureMechanismAssemblyCategoryGroupControlTester.cs)	(revision bfd888d1102f04ff8d56e2e90c0d4ebea559f2e3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs	(.../FailureMechanismAssemblyCategoryGroupControlTester.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -43,7 +43,7 @@
     /// <typeparam name="TSectionResult">The type of the section results shown in the view.</typeparam>
     /// <typeparam name="TResultRow">The type of the presentation objects used in the view.</typeparam>
     public abstract class FailureMechanismAssemblyCategoryGroupControlTester<TView, TFailureMechanism, TSectionResult, TResultRow>
-        where TView : FailureMechanismResultView<TSectionResult, TResultRow, TFailureMechanism>
+        where TView : FailureMechanismResultView<TSectionResult, TResultRow, TFailureMechanism, FailureMechanismAssemblyCategoryGroupControl>
         where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, new()
         where TSectionResult : FailureMechanismSectionResult
         where TResultRow : FailureMechanismSectionResultRow<TSectionResult>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs
===================================================================
diff -u -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs	(.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs)	(revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs	(.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -46,7 +46,7 @@
     /// <typeparam name="TCalculation">The type of calculations to get the input from.</typeparam>
     /// <typeparam name="TCalculationInput">The type of the  input of a calculation.</typeparam>
     public abstract class FailureMechanismAssemblyControlTester<TView, TFailureMechanism, TSectionResult, TResultRow, TCalculation, TCalculationInput>
-        where TView : FailureMechanismResultView<TSectionResult, TResultRow, TFailureMechanism>
+        where TView : FailureMechanismResultView<TSectionResult, TResultRow, TFailureMechanism, FailureMechanismAssemblyControl>
         where TFailureMechanism : IFailureMechanism, IHasSectionResults<TSectionResult>, ICalculatableFailureMechanism, new()
         where TSectionResult : FailureMechanismSectionResult
         where TResultRow : FailureMechanismSectionResultRow<TSectionResult>
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs	(.../DuneErosionFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneErosionFailureMechanismResultView.cs	(.../DuneErosionFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -31,7 +31,10 @@
     /// The view for a collection of <see cref="DuneErosionFailureMechanismSectionResult"/>.
     /// </summary>
     public class DuneErosionFailureMechanismResultView : FailureMechanismResultView
-        <DuneErosionFailureMechanismSectionResult, DuneErosionSectionResultRow, DuneErosionFailureMechanism>
+    <DuneErosionFailureMechanismSectionResult,
+        DuneErosionSectionResultRow,
+        DuneErosionFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultForFactorizedSignalingNormIndex = 2;
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs	(.../DuneErosionFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs	(.../DuneErosionFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -25,6 +25,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -62,7 +63,10 @@
             using (var view = new DuneErosionFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<DuneErosionFailureMechanismSectionResult, DuneErosionSectionResultRow, DuneErosionFailureMechanism>>(view);
+                Assert.IsInstanceOf<FailureMechanismResultView<DuneErosionFailureMechanismSectionResult,
+                    DuneErosionSectionResultRow,
+                    DuneErosionFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
@@ -170,7 +174,7 @@
             protected override DuneErosionFailureMechanismResultView CreateResultView(DuneErosionFailureMechanism failureMechanism)
             {
                 return new DuneErosionFailureMechanismResultView(failureMechanism.SectionResults,
-                                                                            failureMechanism);
+                                                                 failureMechanism);
             }
         }
     }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -35,7 +35,10 @@
     /// The view for the <see cref="GrassCoverErosionInwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class GrassCoverErosionInwardsFailureMechanismResultView
-        : FailureMechanismResultView<GrassCoverErosionInwardsFailureMechanismSectionResult, GrassCoverErosionInwardsFailureMechanismSectionResultRow, GrassCoverErosionInwardsFailureMechanism>
+        : FailureMechanismResultView<GrassCoverErosionInwardsFailureMechanismSectionResult,
+            GrassCoverErosionInwardsFailureMechanismSectionResultRow,
+            GrassCoverErosionInwardsFailureMechanism,
+            FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -28,6 +28,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -84,7 +85,8 @@
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<GrassCoverErosionInwardsFailureMechanismSectionResult,
                     GrassCoverErosionInwardsFailureMechanismSectionResultRow,
-                    GrassCoverErosionInwardsFailureMechanism>>(view);
+                    GrassCoverErosionInwardsFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -31,7 +31,9 @@
     /// The view for a collection of <see cref="GrassCoverErosionOutwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class GrassCoverErosionOutwardsFailureMechanismResultView : FailureMechanismResultView<GrassCoverErosionOutwardsFailureMechanismSectionResult,
-        GrassCoverErosionOutwardsFailureMechanismSectionResultRow, GrassCoverErosionOutwardsFailureMechanism>
+        GrassCoverErosionOutwardsFailureMechanismSectionResultRow,
+        GrassCoverErosionOutwardsFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultForFactorizedSignalingNormIndex = 2;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -25,6 +25,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -64,7 +65,8 @@
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<GrassCoverErosionOutwardsFailureMechanismSectionResult,
                     GrassCoverErosionOutwardsFailureMechanismSectionResultRow,
-                    GrassCoverErosionOutwardsFailureMechanism>>(view);
+                    GrassCoverErosionOutwardsFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs	(.../HeightStructuresFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -36,7 +36,10 @@
     /// The view for the <see cref="HeightStructuresFailureMechanismSectionResult"/>.
     /// </summary>
     public class HeightStructuresFailureMechanismResultView
-        : FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult, HeightStructuresFailureMechanismSectionResultRow, HeightStructuresFailureMechanism>
+        : FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult,
+            HeightStructuresFailureMechanismSectionResultRow,
+            HeightStructuresFailureMechanism,
+            FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -29,6 +29,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -85,7 +86,8 @@
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<HeightStructuresFailureMechanismSectionResult,
                     HeightStructuresFailureMechanismSectionResultRow,
-                    HeightStructuresFailureMechanism>>(view);
+                    HeightStructuresFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffInwardsResultView.cs	(.../GrassCoverSlipOffInwardsResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="GrassCoverSlipOffInwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class GrassCoverSlipOffInwardsResultView : FailureMechanismResultView<GrassCoverSlipOffInwardsFailureMechanismSectionResult,
-        GrassCoverSlipOffInwardsSectionResultRow, GrassCoverSlipOffInwardsFailureMechanism>
+        GrassCoverSlipOffInwardsSectionResultRow,
+        GrassCoverSlipOffInwardsFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs	(.../GrassCoverSlipOffOutwardsResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultView.cs	(.../GrassCoverSlipOffOutwardsResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="GrassCoverSlipOffOutwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class GrassCoverSlipOffOutwardsResultView : FailureMechanismResultView<GrassCoverSlipOffOutwardsFailureMechanismSectionResult,
-        GrassCoverSlipOffOutwardsSectionResultRow, GrassCoverSlipOffOutwardsFailureMechanism>
+        GrassCoverSlipOffOutwardsSectionResultRow,
+        GrassCoverSlipOffOutwardsFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs	(.../MacroStabilityOutwardsResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MacroStabilityOutwardsResultView.cs	(.../MacroStabilityOutwardsResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -36,7 +36,9 @@
     /// The view for a collection of <see cref="MacroStabilityOutwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class MacroStabilityOutwardsResultView : FailureMechanismResultView<MacroStabilityOutwardsFailureMechanismSectionResult,
-        MacroStabilityOutwardsSectionResultRow, MacroStabilityOutwardsFailureMechanism>
+        MacroStabilityOutwardsSectionResultRow,
+        MacroStabilityOutwardsFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs	(.../MicrostabilityResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/MicrostabilityResultView.cs	(.../MicrostabilityResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="MicrostabilityFailureMechanismSectionResult"/>.
     /// </summary>
     public class MicrostabilityResultView : FailureMechanismResultView<MicrostabilityFailureMechanismSectionResult,
-        MicrostabilitySectionResultRow, MicrostabilityFailureMechanism>
+        MicrostabilitySectionResultRow,
+        MicrostabilityFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs	(.../PipingStructureResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/PipingStructureResultView.cs	(.../PipingStructureResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="PipingStructureFailureMechanismSectionResult"/>.
     /// </summary>
     public class PipingStructureResultView : FailureMechanismResultView<PipingStructureFailureMechanismSectionResult,
-        PipingStructureSectionResultRow, PipingStructureFailureMechanism>
+        PipingStructureSectionResultRow,
+        PipingStructureFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs	(.../StrengthStabilityLengthwiseConstructionResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultView.cs	(.../StrengthStabilityLengthwiseConstructionResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -36,7 +36,8 @@
     public class StrengthStabilityLengthwiseConstructionResultView
         : FailureMechanismResultView<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult,
             StrengthStabilityLengthwiseConstructionSectionResultRow,
-            StrengthStabilityLengthwiseConstructionFailureMechanism>
+            StrengthStabilityLengthwiseConstructionFailureMechanism,
+            FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int tailorMadeAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/TechnicalInnovationResultView.cs	(.../TechnicalInnovationResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="TechnicalInnovationFailureMechanismSectionResult"/>.
     /// </summary>
     public class TechnicalInnovationResultView : FailureMechanismResultView<TechnicalInnovationFailureMechanismSectionResult,
-        TechnicalInnovationSectionResultRow, TechnicalInnovationFailureMechanism>
+        TechnicalInnovationSectionResultRow,
+        TechnicalInnovationFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int tailorMadeAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs	(.../WaterPressureAsphaltCoverResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/WaterPressureAsphaltCoverResultView.cs	(.../WaterPressureAsphaltCoverResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -34,7 +34,9 @@
     /// The view for a collection of <see cref="WaterPressureAsphaltCoverFailureMechanismSectionResult"/>.
     /// </summary>
     public class WaterPressureAsphaltCoverResultView : FailureMechanismResultView<WaterPressureAsphaltCoverFailureMechanismSectionResult,
-        WaterPressureAsphaltCoverSectionResultRow, WaterPressureAsphaltCoverFailureMechanism>
+        WaterPressureAsphaltCoverSectionResultRow,
+        WaterPressureAsphaltCoverFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int tailorMadeAssessmentResultIndex = 2;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r3ab49f7b140be394314a3a329c6c4ed079d0aadf -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 3ab49f7b140be394314a3a329c6c4ed079d0aadf)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -51,6 +51,7 @@
 using Ringtoets.Common.Data.IllustrationPoints;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.ChangeHandlers;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.GuiServices;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.PropertyClasses;
@@ -446,7 +447,8 @@
                 GrassCoverSlipOffInwardsFailureMechanism,
                 GrassCoverSlipOffInwardsFailureMechanismSectionResult,
                 GrassCoverSlipOffInwardsResultView,
-                GrassCoverSlipOffInwardsSectionResultRow>(
+                GrassCoverSlipOffInwardsSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new GrassCoverSlipOffInwardsResultView(
                     context.WrappedData,
                     (GrassCoverSlipOffInwardsFailureMechanism) context.FailureMechanism));
@@ -455,7 +457,8 @@
                 GrassCoverSlipOffOutwardsFailureMechanism,
                 GrassCoverSlipOffOutwardsFailureMechanismSectionResult,
                 GrassCoverSlipOffOutwardsResultView,
-                GrassCoverSlipOffOutwardsSectionResultRow>(
+                GrassCoverSlipOffOutwardsSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new GrassCoverSlipOffOutwardsResultView(
                     context.WrappedData,
                     (GrassCoverSlipOffOutwardsFailureMechanism) context.FailureMechanism));
@@ -464,7 +467,8 @@
                 MicrostabilityFailureMechanism,
                 MicrostabilityFailureMechanismSectionResult,
                 MicrostabilityResultView,
-                MicrostabilitySectionResultRow>(
+                MicrostabilitySectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new MicrostabilityResultView(
                     context.WrappedData,
                     (MicrostabilityFailureMechanism) context.FailureMechanism));
@@ -473,7 +477,8 @@
                 PipingStructureFailureMechanism,
                 PipingStructureFailureMechanismSectionResult,
                 PipingStructureResultView,
-                PipingStructureSectionResultRow>(
+                PipingStructureSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new PipingStructureResultView(
                     context.WrappedData,
                     (PipingStructureFailureMechanism) context.FailureMechanism));
@@ -482,7 +487,8 @@
                 TechnicalInnovationFailureMechanism,
                 TechnicalInnovationFailureMechanismSectionResult,
                 TechnicalInnovationResultView,
-                TechnicalInnovationSectionResultRow>(
+                TechnicalInnovationSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new TechnicalInnovationResultView(
                     context.WrappedData,
                     (TechnicalInnovationFailureMechanism) context.FailureMechanism));
@@ -491,7 +497,8 @@
                 StrengthStabilityLengthwiseConstructionFailureMechanism,
                 StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult,
                 StrengthStabilityLengthwiseConstructionResultView,
-                StrengthStabilityLengthwiseConstructionSectionResultRow>(
+                StrengthStabilityLengthwiseConstructionSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new StrengthStabilityLengthwiseConstructionResultView(
                     context.WrappedData,
                     (StrengthStabilityLengthwiseConstructionFailureMechanism) context.FailureMechanism));
@@ -500,7 +507,8 @@
                 WaterPressureAsphaltCoverFailureMechanism,
                 WaterPressureAsphaltCoverFailureMechanismSectionResult,
                 WaterPressureAsphaltCoverResultView,
-                WaterPressureAsphaltCoverSectionResultRow>(
+                WaterPressureAsphaltCoverSectionResultRow,
+                FailureMechanismAssemblyCategoryGroupControl>(
                 context => new WaterPressureAsphaltCoverResultView(
                     context.WrappedData,
                     (WaterPressureAsphaltCoverFailureMechanism) context.FailureMechanism));
@@ -515,7 +523,8 @@
                 CloseForData = CloseFailureMechanismResultViewForData<MacroStabilityOutwardsFailureMechanism,
                     MacroStabilityOutwardsFailureMechanismSectionResult,
                     MacroStabilityOutwardsResultView,
-                    MacroStabilityOutwardsSectionResultRow>,
+                    MacroStabilityOutwardsSectionResultRow,
+                    FailureMechanismAssemblyCategoryGroupControl>,
                 GetViewData = context => context.WrappedData,
                 CreateInstance = context => new MacroStabilityOutwardsResultView(
                     context.WrappedData,
@@ -938,12 +947,13 @@
         }
 
         private static ViewInfo<FailureMechanismSectionResultContext<TResult>, IObservableEnumerable<TResult>, TView> CreateFailureMechanismResultViewInfo<
-            TFailureMechanism, TResult, TView, TResultRow>(
+            TFailureMechanism, TResult, TView, TResultRow, TAssemblyResultControl>(
             Func<FailureMechanismSectionResultContext<TResult>, TView> createInstanceFunc)
             where TResult : FailureMechanismSectionResult
-            where TView : FailureMechanismResultView<TResult, TResultRow, TFailureMechanism>
+            where TView : FailureMechanismResultView<TResult, TResultRow, TFailureMechanism, TAssemblyResultControl>
             where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TResult>
             where TResultRow : FailureMechanismSectionResultRow<TResult>
+            where TAssemblyResultControl : AssemblyResultControl, new()
         {
             return new ViewInfo<
                 FailureMechanismSectionResultContext<TResult>,
@@ -952,7 +962,7 @@
             {
                 GetViewName = (view, context) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon,
-                CloseForData = CloseFailureMechanismResultViewForData<TFailureMechanism, TResult, TView, TResultRow>,
+                CloseForData = CloseFailureMechanismResultViewForData<TFailureMechanism, TResult, TView, TResultRow, TAssemblyResultControl>,
                 GetViewData = context => context.WrappedData,
                 CreateInstance = createInstanceFunc
             };
@@ -1079,11 +1089,12 @@
 
         #region FailureMechanismResults ViewInfo
 
-        private static bool CloseFailureMechanismResultViewForData<TFailureMechanism, TResult, TView, TResultRow>(TView view, object dataToCloseFor)
-            where TView : FailureMechanismResultView<TResult, TResultRow, TFailureMechanism>
+        private static bool CloseFailureMechanismResultViewForData<TFailureMechanism, TResult, TView, TResultRow, TAssemblyResultControl>(TView view, object dataToCloseFor)
+            where TView : FailureMechanismResultView<TResult, TResultRow, TFailureMechanism, TAssemblyResultControl>
             where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TResult>
             where TResult : FailureMechanismSectionResult
             where TResultRow : FailureMechanismSectionResultRow<TResult>
+            where TAssemblyResultControl : AssemblyResultControl, new()
         {
             var assessmentSection = dataToCloseFor as IAssessmentSection;
             var failureMechanism = dataToCloseFor as IFailureMechanism;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs	(.../GrassCoverSlipOffInwardsResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -62,7 +63,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<GrassCoverSlipOffInwardsFailureMechanismSectionResult,
-                    GrassCoverSlipOffInwardsSectionResultRow, GrassCoverSlipOffInwardsFailureMechanism>>(view);
+                    GrassCoverSlipOffInwardsSectionResultRow,
+                    GrassCoverSlipOffInwardsFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs	(.../GrassCoverSlipOffOutwardsResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -62,7 +63,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<GrassCoverSlipOffOutwardsFailureMechanismSectionResult,
-                    GrassCoverSlipOffOutwardsSectionResultRow, GrassCoverSlipOffOutwardsFailureMechanism>>(view);
+                    GrassCoverSlipOffOutwardsSectionResultRow,
+                    GrassCoverSlipOffOutwardsFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs	(.../MacroStabilityOutwardsResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -29,6 +29,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -85,7 +86,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<MacroStabilityOutwardsFailureMechanismSectionResult,
-                    MacroStabilityOutwardsSectionResultRow, MacroStabilityOutwardsFailureMechanism>>(view);
+                    MacroStabilityOutwardsSectionResultRow,
+                    MacroStabilityOutwardsFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
                 mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs	(.../MicrostabilityResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -62,7 +63,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<MicrostabilityFailureMechanismSectionResult,
-                    MicrostabilitySectionResultRow, MicrostabilityFailureMechanism>>(view);
+                    MicrostabilitySectionResultRow,
+                    MicrostabilityFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs	(.../PipingStructureResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -62,7 +63,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<PipingStructureFailureMechanismSectionResult,
-                    PipingStructureSectionResultRow, PipingStructureFailureMechanism>>(view);
+                    PipingStructureSectionResultRow,
+                    PipingStructureFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs	(.../StrengthStabilityLengthwiseConstructionResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -60,7 +61,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult,
-                    StrengthStabilityLengthwiseConstructionSectionResultRow, StrengthStabilityLengthwiseConstructionFailureMechanism>>(view);
+                    StrengthStabilityLengthwiseConstructionSectionResultRow,
+                    StrengthStabilityLengthwiseConstructionFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs	(.../TechnicalInnovationResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -60,7 +61,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<TechnicalInnovationFailureMechanismSectionResult,
-                    TechnicalInnovationSectionResultRow, TechnicalInnovationFailureMechanism>>(view);
+                    TechnicalInnovationSectionResultRow,
+                    TechnicalInnovationFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs	(.../WaterPressureAsphaltCoverResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -60,7 +61,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<WaterPressureAsphaltCoverFailureMechanismSectionResult,
-                    WaterPressureAsphaltCoverSectionResultRow, WaterPressureAsphaltCoverFailureMechanism>>(view);
+                    WaterPressureAsphaltCoverSectionResultRow,
+                    WaterPressureAsphaltCoverFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -35,7 +35,9 @@
     /// The view for the <see cref="MacroStabilityInwardsFailureMechanismSectionResult"/>.
     /// </summary>
     public class MacroStabilityInwardsFailureMechanismResultView : FailureMechanismResultView<MacroStabilityInwardsFailureMechanismSectionResult,
-        MacroStabilityInwardsFailureMechanismSectionResultRow, MacroStabilityInwardsFailureMechanism>
+        MacroStabilityInwardsFailureMechanismSectionResultRow,
+        MacroStabilityInwardsFailureMechanism,
+        FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -28,6 +28,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -98,7 +99,10 @@
             using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<MacroStabilityInwardsFailureMechanismSectionResult, MacroStabilityInwardsFailureMechanismSectionResultRow, MacroStabilityInwardsFailureMechanism>>(view);
+                Assert.IsInstanceOf<FailureMechanismResultView<MacroStabilityInwardsFailureMechanismSectionResult,
+                    MacroStabilityInwardsFailureMechanismSectionResultRow,
+                    MacroStabilityInwardsFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -35,7 +35,9 @@
     /// The view for the <see cref="PipingFailureMechanismSectionResult"/>.
     /// </summary>
     public class PipingFailureMechanismResultView : FailureMechanismResultView<PipingFailureMechanismSectionResult,
-        PipingFailureMechanismSectionResultRow, PipingFailureMechanism>
+        PipingFailureMechanismSectionResultRow,
+        PipingFailureMechanism,
+        FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -28,6 +28,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -98,7 +99,10 @@
             using (var view = new PipingFailureMechanismResultView(pipingFailureMechanism.SectionResults, pipingFailureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<PipingFailureMechanismSectionResult, PipingFailureMechanismSectionResultRow, PipingFailureMechanism>>(view);
+                Assert.IsInstanceOf<FailureMechanismResultView<PipingFailureMechanismSectionResult,
+                    PipingFailureMechanismSectionResultRow,
+                    PipingFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(pipingFailureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs	(.../StabilityPointStructuresFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -37,7 +37,9 @@
     /// for stability point structures.
     /// </summary>
     public class StabilityPointStructuresFailureMechanismResultView : FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult,
-        StabilityPointStructuresFailureMechanismSectionResultRow, StabilityPointStructuresFailureMechanism>
+        StabilityPointStructuresFailureMechanismSectionResultRow,
+        StabilityPointStructuresFailureMechanism,
+        FailureMechanismAssemblyControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultIndex = 2;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -29,6 +29,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -84,7 +85,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<StabilityPointStructuresFailureMechanismSectionResult,
-                    StabilityPointStructuresFailureMechanismSectionResultRow, StabilityPointStructuresFailureMechanism>>(view);
+                    StabilityPointStructuresFailureMechanismSectionResultRow,
+                    StabilityPointStructuresFailureMechanism,
+                    FailureMechanismAssemblyControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs	(.../StabilityStoneCoverResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverResultView.cs	(.../StabilityStoneCoverResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -31,7 +31,9 @@
     /// The view for a collection of <see cref="StabilityStoneCoverFailureMechanismSectionResult"/>.
     /// </summary>
     public class StabilityStoneCoverResultView : FailureMechanismResultView<StabilityStoneCoverFailureMechanismSectionResult,
-        StabilityStoneCoverSectionResultRow, StabilityStoneCoverFailureMechanism>
+        StabilityStoneCoverSectionResultRow,
+        StabilityStoneCoverFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultForFactorizedSignalingNormIndex = 2;
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs	(.../StabilityStoneCoverResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs	(.../StabilityStoneCoverResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -25,6 +25,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -63,7 +64,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<StabilityStoneCoverFailureMechanismSectionResult,
-                    StabilityStoneCoverSectionResultRow, StabilityStoneCoverFailureMechanism>>(view);
+                    StabilityStoneCoverSectionResultRow,
+                    StabilityStoneCoverFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismResultView.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultView.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -31,7 +31,9 @@
     /// The view for a collection of <see cref="WaveImpactAsphaltCoverFailureMechanismSectionResult"/>.
     /// </summary>
     public class WaveImpactAsphaltCoverFailureMechanismResultView : FailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanismSectionResult,
-        WaveImpactAsphaltCoverFailureMechanismSectionResultRow, WaveImpactAsphaltCoverFailureMechanism>
+        WaveImpactAsphaltCoverFailureMechanismSectionResultRow,
+        WaveImpactAsphaltCoverFailureMechanism,
+        FailureMechanismAssemblyCategoryGroupControl>
     {
         private const int simpleAssessmentResultIndex = 1;
         private const int detailedAssessmentResultForFactorizedSignalingNormIndex = 2;
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs
===================================================================
diff -u -r4501abb594c49cc13981a47535229ce6222d6f35 -r50b3a6c556aace513b84909963bbc0ad37ee4374
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision 4501abb594c49cc13981a47535229ce6222d6f35)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs)	(revision 50b3a6c556aace513b84909963bbc0ad37ee4374)
@@ -25,6 +25,7 @@
 using Ringtoets.AssemblyTool.Forms;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.Primitives;
@@ -63,7 +64,9 @@
             {
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismResultView<WaveImpactAsphaltCoverFailureMechanismSectionResult,
-                    WaveImpactAsphaltCoverFailureMechanismSectionResultRow, WaveImpactAsphaltCoverFailureMechanism>>(view);
+                    WaveImpactAsphaltCoverFailureMechanismSectionResultRow,
+                    WaveImpactAsphaltCoverFailureMechanism,
+                    FailureMechanismAssemblyCategoryGroupControl>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }