Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs
===================================================================
diff -u -rc20f5b24ecc1b1d69e499cffb5d117b3026810da -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs	(.../StructuresFailureMechanismResultView.cs)	(revision c20f5b24ecc1b1d69e499cffb5d117b3026810da)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/StructuresFailureMechanismResultView.cs	(.../StructuresFailureMechanismResultView.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -26,10 +26,8 @@
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Structures;
-using Riskeer.Common.Forms.Builders;
 using Riskeer.Common.Forms.Providers;
 
 namespace Riskeer.Common.Forms.Views
@@ -39,20 +37,11 @@
     /// </summary>
     /// <typeparam name="TFailureMechanism">The type of failure mechanism.</typeparam>
     /// <typeparam name="TStructuresInput">The type of input.</typeparam>
-    public class StructuresFailureMechanismResultView<TFailureMechanism, TStructuresInput> : FailureMechanismResultView<AdoptableFailureMechanismSectionResult, AdoptableFailureMechanismSectionResultRow, TFailureMechanism>
+    public class StructuresFailureMechanismResultView<TFailureMechanism, TStructuresInput> : AdoptableFailureMechanismResultView<
+        TFailureMechanism, StructuresCalculationScenario<TStructuresInput>, TStructuresInput>
         where TFailureMechanism : IFailureMechanism<AdoptableFailureMechanismSectionResult>, ICalculatableFailureMechanism, IFailureMechanism
         where TStructuresInput : IStructuresCalculationInput<StructureBase>, new()
     {
-        private const int initialFailureMechanismResultTypeIndex = 2;
-        private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
-        private const int furtherAnalysisTypeIndex = 4;
-        private const int refinedSectionProbabilityIndex = 5;
-        private const int sectionProbabilityIndex = 6;
-        private const int assemblyGroupIndex = 7;
-
-        private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputsObserver;
-        private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationGroupObserver;
-
         /// <summary>
         /// Creates a new instance of <see cref="StructuresFailureMechanismResultView{TFailureMechanism,TStructuresInput}"/>.
         /// </summary>
@@ -66,105 +55,28 @@
                                                     TFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection,
                                                     Func<TFailureMechanism, IAssessmentSection, FailureMechanismAssemblyResultWrapper> performFailureMechanismAssemblyFunc)
-            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc)
-        {
-            // The concat is needed to observe the input of calculations in child groups.
-            calculationInputsObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
-                UpdateInternalViewData,
-                cg => cg.Children.Concat(cg.Children
-                                           .OfType<StructuresCalculationScenario<TStructuresInput>>()
-                                           .Select(scenario => scenario.InputParameters)
-                                           .Cast<object>()))
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
-                UpdateInternalViewData,
-                c => c.Children)
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-        }
+            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, performFailureMechanismAssemblyFunc,
+                   (sr, fm, ass) => StructuresFailureMechanismAssemblyFactory.AssembleSection<TStructuresInput>(sr, fm, ass)) {}
 
-        protected override AdoptableFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(AdoptableFailureMechanismSectionResult sectionResult)
+        protected override IFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                              IEnumerable<StructuresCalculationScenario<TStructuresInput>> calculationScenarios)
         {
-            StructuresCalculationScenario<TStructuresInput>[] calculationScenarios = FailureMechanism.Calculations
-                                                                                                     .OfType<StructuresCalculationScenario<TStructuresInput>>()
-                                                                                                     .ToArray();
-
-            return new AdoptableFailureMechanismSectionResultRow(
-                sectionResult,
-                CreateCalculateStrategy(sectionResult, calculationScenarios),
-                CreateErrorProvider(sectionResult, calculationScenarios),
-                () => StructuresFailureMechanismAssemblyFactory.AssembleSection<TStructuresInput>(sectionResult, FailureMechanism, AssessmentSection),
-                new AdoptableFailureMechanismSectionResultRow.ConstructionProperties
-                {
-                    InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
-                    InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
-                    FurtherAnalysisTypeIndex = furtherAnalysisTypeIndex,
-                    RefinedSectionProbabilityIndex = refinedSectionProbabilityIndex,
-                    SectionProbabilityIndex = sectionProbabilityIndex,
-                    AssemblyGroupIndex = assemblyGroupIndex
-                });
+            return new StructuresFailureMechanismSectionResultCalculateProbabilityStrategy<TStructuresInput>(sectionResult, calculationScenarios);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider CreateErrorProvider(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                                       IEnumerable<StructuresCalculationScenario<TStructuresInput>> calculationScenarios)
         {
-            calculationInputsObserver.Dispose();
-            calculationGroupObserver.Dispose();
-
-            base.Dispose(disposing);
-        }
-
-        protected override void AddDataGridColumns()
-        {
-            FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.Name));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddIsRelevantColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.IsRelevant));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultTypeColumn<AdoptableInitialFailureMechanismResultType>(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddFurtherAnalysisTypeColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.FurtherAnalysisType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddRefinedSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.RefinedSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.SectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.AssemblyGroup));
-        }
-
-        private static FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<StructuresCalculationScenario<TStructuresInput>> CreateErrorProvider(
-            FailureMechanismSectionResult sectionResult, IEnumerable<StructuresCalculationScenario<TStructuresInput>> calculationScenarios)
-        {
             return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<StructuresCalculationScenario<TStructuresInput>>(
                 sectionResult, calculationScenarios,
                 (scenario, lineSegments) => scenario.IsStructureIntersectionWithReferenceLineInSection(lineSegments));
         }
-        
-        private static StructuresFailureMechanismSectionResultCalculateProbabilityStrategy<TStructuresInput> CreateCalculateStrategy(
-            AdoptableFailureMechanismSectionResult sectionResult,
-            IEnumerable<StructuresCalculationScenario<TStructuresInput>> calculationScenarios)
+
+        protected override IEnumerable<StructuresCalculationScenario<TStructuresInput>> GetCalculationScenarios(AdoptableFailureMechanismSectionResult sectionResult)
         {
-            return new StructuresFailureMechanismSectionResultCalculateProbabilityStrategy<TStructuresInput>(
-                sectionResult, calculationScenarios);
+            return FailureMechanism.Calculations
+                                   .OfType<StructuresCalculationScenario<TStructuresInput>>()
+                                   .ToArray();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/StructuresFailureMechanismResultViewTest.cs	(.../StructuresFailureMechanismResultViewTest.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -81,9 +81,9 @@
                        failureMechanism.SectionResults, failureMechanism, assessmentSection, (fm, section) => new FailureMechanismAssemblyResultWrapper(double.NaN, AssemblyMethod.BOI1A1)))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-                    AdoptableFailureMechanismSectionResultRow,
-                    TestStructuresFailureMechanism>>(view);
+                Assert.IsInstanceOf<AdoptableFailureMechanismResultView<TestStructuresFailureMechanism,
+                    StructuresCalculationScenario<TestStructuresInput>,
+                    TestStructuresInput>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
@@ -92,47 +92,6 @@
         }
 
         [Test]
-        public void GivenFormWithStructuresFailureMechanismResultView_ThenExpectedColumnsAreVisible()
-        {
-            // Given
-            using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(new TestStructuresFailureMechanism()))
-            {
-                // Then
-                DataGridView dataGridView = GetDataGridView();
-
-                Assert.AreEqual(columnCount, dataGridView.ColumnCount);
-
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[nameColumnIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[isRelevantIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[initialFailureMechanismResultTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[furtherAnalysisTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[refinedSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[sectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assemblyGroupIndex]);
-
-                Assert.AreEqual("Vaknaam", dataGridView.Columns[nameColumnIndex].HeaderText);
-                Assert.AreEqual("Is relevant", dataGridView.Columns[isRelevantIndex].HeaderText);
-                Assert.AreEqual("Resultaat initieel mechanisme", dataGridView.Columns[initialFailureMechanismResultTypeIndex].HeaderText);
-                Assert.AreEqual("Faalkans initieel\r\nmechanisme per vak\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Vervolganalyse", dataGridView.Columns[furtherAnalysisTypeIndex].HeaderText);
-                Assert.AreEqual("Aangescherpte\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[refinedSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Rekenwaarde\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Duidingsklasse", dataGridView.Columns[assemblyGroupIndex].HeaderText);
-
-                Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[isRelevantIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[furtherAnalysisTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[refinedSectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[sectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[assemblyGroupIndex].ReadOnly);
-            }
-        }
-
-        [Test]
         public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Setup
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs
===================================================================
diff -u -re2d70c6fa4d781b964a08c8379893e57031af902 -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision e2d70c6fa4d781b964a08c8379893e57031af902)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs	(.../GrassCoverErosionInwardsFailureMechanismResultView.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -24,9 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.Builders;
 using Riskeer.Common.Forms.Providers;
 using Riskeer.Common.Forms.Views;
 using Riskeer.GrassCoverErosionInwards.Data;
@@ -37,19 +35,9 @@
     /// The view for the <see cref="AdoptableFailureMechanismSectionResult"/>
     /// in the <see cref="GrassCoverErosionInwardsFailureMechanism"/>.
     /// </summary>
-    public class GrassCoverErosionInwardsFailureMechanismResultView : FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-        AdoptableFailureMechanismSectionResultRow, GrassCoverErosionInwardsFailureMechanism>
+    public class GrassCoverErosionInwardsFailureMechanismResultView : AdoptableFailureMechanismResultView<GrassCoverErosionInwardsFailureMechanism,
+        GrassCoverErosionInwardsCalculationScenario, GrassCoverErosionInwardsInput>
     {
-        private const int initialFailureMechanismResultTypeIndex = 2;
-        private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
-        private const int furtherAnalysisTypeIndex = 4;
-        private const int refinedSectionProbabilityIndex = 5;
-        private const int sectionProbabilityIndex = 6;
-        private const int assemblyGroupIndex = 7;
-
-        private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputsObserver;
-        private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationGroupObserver;
-
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsFailureMechanismResultView"/>.
         /// </summary>
@@ -61,105 +49,29 @@
         public GrassCoverErosionInwardsFailureMechanismResultView(IObservableEnumerable<AdoptableFailureMechanismSectionResult> failureMechanismSectionResults,
                                                                   GrassCoverErosionInwardsFailureMechanism failureMechanism,
                                                                   IAssessmentSection assessmentSection)
-            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism)
-        {
-            // The concat is needed to observe the input of calculations in child groups.
-            calculationInputsObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
-                UpdateInternalViewData,
-                cg => cg.Children.Concat<object>(cg.Children
-                                                   .OfType<GrassCoverErosionInwardsCalculationScenario>()
-                                                   .Select(c => c.InputParameters)))
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
-                UpdateInternalViewData,
-                c => c.Children)
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-        }
+            : base(failureMechanismSectionResults, failureMechanism, assessmentSection,
+                   GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                   GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSection) {}
 
-        protected override AdoptableFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(
-            AdoptableFailureMechanismSectionResult sectionResult)
+        protected override IFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(AdoptableFailureMechanismSectionResult sectionResult, 
+                                                                                                              IEnumerable<GrassCoverErosionInwardsCalculationScenario> calculationScenarios)
         {
-            GrassCoverErosionInwardsCalculationScenario[] calculationScenarios = FailureMechanism.Calculations
-                                                                                                 .OfType<GrassCoverErosionInwardsCalculationScenario>()
-                                                                                                 .ToArray();
-
-            return new AdoptableFailureMechanismSectionResultRow(
-                sectionResult,
-                CreateCalculateStrategy(sectionResult, calculationScenarios),
-                CreateErrorProvider(sectionResult, calculationScenarios),
-                () => GrassCoverErosionInwardsFailureMechanismAssemblyFactory.AssembleSection(sectionResult, FailureMechanism, AssessmentSection),
-                new AdoptableFailureMechanismSectionResultRow.ConstructionProperties
-                {
-                    InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
-                    InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
-                    FurtherAnalysisTypeIndex = furtherAnalysisTypeIndex,
-                    RefinedSectionProbabilityIndex = refinedSectionProbabilityIndex,
-                    SectionProbabilityIndex = sectionProbabilityIndex,
-                    AssemblyGroupIndex = assemblyGroupIndex
-                });
+            return new GrassCoverErosionInwardsFailureMechanismSectionResultCalculateProbabilityStrategy(sectionResult, calculationScenarios);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider CreateErrorProvider(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                                       IEnumerable<GrassCoverErosionInwardsCalculationScenario> calculationScenarios)
         {
-            calculationInputsObserver.Dispose();
-            calculationGroupObserver.Dispose();
-
-            base.Dispose(disposing);
-        }
-
-        protected override void AddDataGridColumns()
-        {
-            FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.Name));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddIsRelevantColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.IsRelevant));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultTypeColumn<AdoptableInitialFailureMechanismResultType>(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddFurtherAnalysisTypeColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.FurtherAnalysisType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddRefinedSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.RefinedSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.SectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.AssemblyGroup));
-        }
-
-        private static GrassCoverErosionInwardsFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(
-            AdoptableFailureMechanismSectionResult sectionResult,
-            IEnumerable<GrassCoverErosionInwardsCalculationScenario> calculationScenarios)
-        {
-            return new GrassCoverErosionInwardsFailureMechanismSectionResultCalculateProbabilityStrategy(
-                sectionResult, calculationScenarios);
-        }
-
-        private static FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<GrassCoverErosionInwardsCalculationScenario> CreateErrorProvider(
-            FailureMechanismSectionResult sectionResult, IEnumerable<GrassCoverErosionInwardsCalculationScenario> calculationScenarios)
-        {
             return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<GrassCoverErosionInwardsCalculationScenario>(
                 sectionResult, calculationScenarios,
                 (scenario, lineSegments) => scenario.IsDikeProfileIntersectionWithReferenceLineInSection(lineSegments));
         }
+
+        protected override IEnumerable<GrassCoverErosionInwardsCalculationScenario> GetCalculationScenarios(AdoptableFailureMechanismSectionResult sectionResult)
+        {
+            return FailureMechanism.Calculations
+                                   .OfType<GrassCoverErosionInwardsCalculationScenario>()
+                                   .ToArray();
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -red6bc36073bc1a91c98cee04fcda58ea539464bc -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision ed6bc36073bc1a91c98cee04fcda58ea539464bc)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -81,9 +81,9 @@
             using (var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-                    AdoptableFailureMechanismSectionResultRow,
-                    GrassCoverErosionInwardsFailureMechanism>>(view);
+                Assert.IsInstanceOf<AdoptableFailureMechanismResultView<GrassCoverErosionInwardsFailureMechanism,
+                    GrassCoverErosionInwardsCalculationScenario,
+                    GrassCoverErosionInwardsInput>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
@@ -92,49 +92,6 @@
         }
 
         [Test]
-        public void GivenFormWithGrassCoverErosionInwardsFailureMechanismResultView_ThenExpectedColumnsAreVisible()
-        {
-            // Given
-            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-
-            using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(failureMechanism))
-            {
-                // Then
-                DataGridView dataGridView = GetDataGridView();
-
-                Assert.AreEqual(columnCount, dataGridView.ColumnCount);
-
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[nameColumnIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[isRelevantIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[initialFailureMechanismResultTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[furtherAnalysisTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[refinedSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[sectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assemblyGroupIndex]);
-
-                Assert.AreEqual("Vaknaam", dataGridView.Columns[nameColumnIndex].HeaderText);
-                Assert.AreEqual("Is relevant", dataGridView.Columns[isRelevantIndex].HeaderText);
-                Assert.AreEqual("Resultaat initieel mechanisme", dataGridView.Columns[initialFailureMechanismResultTypeIndex].HeaderText);
-                Assert.AreEqual("Faalkans initieel\r\nmechanisme per vak\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Vervolganalyse", dataGridView.Columns[furtherAnalysisTypeIndex].HeaderText);
-                Assert.AreEqual("Aangescherpte\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[refinedSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Rekenwaarde\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Duidingsklasse", dataGridView.Columns[assemblyGroupIndex].HeaderText);
-
-                Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[isRelevantIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[furtherAnalysisTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[refinedSectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[sectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[assemblyGroupIndex].ReadOnly);
-            }
-        }
-
-        [Test]
         [SetCulture("nl-NL")]
         public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs
===================================================================
diff -u -r7cd8a77e8106ad14f49ea3c450d77ad9faa962b8 -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision 7cd8a77e8106ad14f49ea3c450d77ad9faa962b8)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismResultView.cs	(.../MacroStabilityInwardsFailureMechanismResultView.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -24,9 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.Builders;
 using Riskeer.Common.Forms.Providers;
 using Riskeer.Common.Forms.Views;
 using Riskeer.MacroStabilityInwards.Data;
@@ -37,19 +35,9 @@
     /// The view for the <see cref="AdoptableFailureMechanismSectionResult"/>
     /// in the <see cref="MacroStabilityInwardsFailureMechanism"/>.
     /// </summary>
-    public class MacroStabilityInwardsFailureMechanismResultView : FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-        AdoptableFailureMechanismSectionResultRow, MacroStabilityInwardsFailureMechanism>
+    public class MacroStabilityInwardsFailureMechanismResultView : AdoptableFailureMechanismResultView<MacroStabilityInwardsFailureMechanism,
+        MacroStabilityInwardsCalculationScenario, MacroStabilityInwardsInput>
     {
-        private const int initialFailureMechanismResultTypeIndex = 2;
-        private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
-        private const int furtherAnalysisTypeIndex = 4;
-        private const int refinedSectionProbabilityIndex = 5;
-        private const int sectionProbabilityIndex = 6;
-        private const int assemblyGroupIndex = 7;
-
-        private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputsObserver;
-        private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationGroupObserver;
-
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsFailureMechanismResultView"/>.
         /// </summary>
@@ -61,102 +49,28 @@
         public MacroStabilityInwardsFailureMechanismResultView(IObservableEnumerable<AdoptableFailureMechanismSectionResult> failureMechanismSectionResults,
                                                                MacroStabilityInwardsFailureMechanism failureMechanism,
                                                                IAssessmentSection assessmentSection)
-            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism)
-        {
-            // The concat is needed to observe the input of calculations in child groups.
-            calculationInputsObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
-                UpdateInternalViewData,
-                cg => cg.Children.Concat<object>(cg.Children
-                                                   .OfType<MacroStabilityInwardsCalculationScenario>()
-                                                   .Select(c => c.InputParameters)))
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
-                UpdateInternalViewData,
-                c => c.Children)
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-        }
+            : base(failureMechanismSectionResults, failureMechanism, assessmentSection,
+                   MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleFailureMechanism,
+                   MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection) {}
 
-        protected override AdoptableFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(AdoptableFailureMechanismSectionResult sectionResult)
+        protected override IFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                              IEnumerable<MacroStabilityInwardsCalculationScenario> calculationScenarios)
         {
-            MacroStabilityInwardsCalculationScenario[] calculationScenarios = FailureMechanism.Calculations
-                                                                                              .OfType<MacroStabilityInwardsCalculationScenario>()
-                                                                                              .ToArray();
-            return new AdoptableFailureMechanismSectionResultRow(
-                sectionResult,
-                CreateCalculateStrategy(sectionResult, calculationScenarios),
-                CreateErrorProvider(sectionResult, calculationScenarios),
-                () => MacroStabilityInwardsFailureMechanismAssemblyFactory.AssembleSection(sectionResult, FailureMechanism, AssessmentSection),
-                new AdoptableFailureMechanismSectionResultRow.ConstructionProperties
-                {
-                    InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
-                    InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
-                    FurtherAnalysisTypeIndex = furtherAnalysisTypeIndex,
-                    RefinedSectionProbabilityIndex = refinedSectionProbabilityIndex,
-                    SectionProbabilityIndex = sectionProbabilityIndex,
-                    AssemblyGroupIndex = assemblyGroupIndex
-                });
+            return new MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy(sectionResult, calculationScenarios, FailureMechanism);
         }
 
-        protected override void Dispose(bool disposing)
+        protected override IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider CreateErrorProvider(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                                       IEnumerable<MacroStabilityInwardsCalculationScenario> calculationScenarios)
         {
-            calculationInputsObserver.Dispose();
-            calculationGroupObserver.Dispose();
-
-            base.Dispose(disposing);
+            return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<MacroStabilityInwardsCalculationScenario>(
+                sectionResult, calculationScenarios, (scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
         }
 
-        protected override void AddDataGridColumns()
+        protected override IEnumerable<MacroStabilityInwardsCalculationScenario> GetCalculationScenarios(AdoptableFailureMechanismSectionResult sectionResult)
         {
-            FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.Name));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddIsRelevantColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.IsRelevant));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultTypeColumn<AdoptableInitialFailureMechanismResultType>(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddFurtherAnalysisTypeColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.FurtherAnalysisType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddRefinedSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.RefinedSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.SectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.AssemblyGroup));
+            return FailureMechanism.Calculations
+                                   .OfType<MacroStabilityInwardsCalculationScenario>()
+                                   .ToArray();
         }
-
-        private MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(
-            AdoptableFailureMechanismSectionResult sectionResult,
-            IEnumerable<MacroStabilityInwardsCalculationScenario> calculationScenarios)
-        {
-            return new MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy(
-                sectionResult, calculationScenarios, FailureMechanism);
-        }
-
-        private static FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<MacroStabilityInwardsCalculationScenario> CreateErrorProvider(
-            FailureMechanismSectionResult sectionResult, IEnumerable<MacroStabilityInwardsCalculationScenario> calculationScenarios)
-        {
-            return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<MacroStabilityInwardsCalculationScenario>(
-                sectionResult, calculationScenarios, (scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r29b4531378c15337787a6439d27d0f701ece0974 -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision 29b4531378c15337787a6439d27d0f701ece0974)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewTest.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -82,9 +82,9 @@
             using (var view = new MacroStabilityInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-                    AdoptableFailureMechanismSectionResultRow,
-                    MacroStabilityInwardsFailureMechanism>>(view);
+                Assert.IsInstanceOf<AdoptableFailureMechanismResultView<MacroStabilityInwardsFailureMechanism,
+                    MacroStabilityInwardsCalculationScenario,
+                    MacroStabilityInwardsInput>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
@@ -93,47 +93,6 @@
         }
 
         [Test]
-        public void GivenFormWithMacroStabilityInwardsFailureMechanismResultView_ThenExpectedColumnsAreVisible()
-        {
-            // Given
-            using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(new MacroStabilityInwardsFailureMechanism()))
-            {
-                // Then
-                DataGridView dataGridView = GetDataGridView();
-
-                Assert.AreEqual(columnCount, dataGridView.ColumnCount);
-
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[nameColumnIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[isRelevantIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[initialFailureMechanismResultTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[furtherAnalysisTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[refinedSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[sectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assemblyGroupIndex]);
-
-                Assert.AreEqual("Vaknaam", dataGridView.Columns[nameColumnIndex].HeaderText);
-                Assert.AreEqual("Is relevant", dataGridView.Columns[isRelevantIndex].HeaderText);
-                Assert.AreEqual("Resultaat initieel mechanisme", dataGridView.Columns[initialFailureMechanismResultTypeIndex].HeaderText);
-                Assert.AreEqual("Faalkans initieel\r\nmechanisme per vak\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Vervolganalyse", dataGridView.Columns[furtherAnalysisTypeIndex].HeaderText);
-                Assert.AreEqual("Aangescherpte\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[refinedSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Rekenwaarde\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Duidingsklasse", dataGridView.Columns[assemblyGroupIndex].HeaderText);
-
-                Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[isRelevantIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[furtherAnalysisTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[refinedSectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[sectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[assemblyGroupIndex].ReadOnly);
-            }
-        }
-
-        [Test]
         [SetCulture("nl-NL")]
         public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
@@ -200,7 +159,7 @@
                 FailureMechanismSectionAssemblyCalculatorStub failureMechanismSectionAssemblyCalculator = testFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
                 FailureMechanismAssemblyCalculatorStub failureMechanismAssemblyCalculator = testFactory.LastCreatedFailureMechanismAssemblyCalculator;
 
-                Assert.AreSame(failureMechanismSectionAssemblyCalculator.FailureMechanismSectionAssemblyResultOutput.AssemblyResult, 
+                Assert.AreSame(failureMechanismSectionAssemblyCalculator.FailureMechanismSectionAssemblyResultOutput.AssemblyResult,
                                failureMechanismAssemblyCalculator.SectionAssemblyResultsInput.Single());
             }
         }
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismResultView.cs
===================================================================
diff -u -re2d70c6fa4d781b964a08c8379893e57031af902 -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision e2d70c6fa4d781b964a08c8379893e57031af902)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -24,9 +24,7 @@
 using System.Linq;
 using Core.Common.Base;
 using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
-using Riskeer.Common.Forms.Builders;
 using Riskeer.Common.Forms.Providers;
 using Riskeer.Common.Forms.Views;
 using Riskeer.Piping.Data;
@@ -39,18 +37,8 @@
     /// The view for the <see cref="AdoptableFailureMechanismSectionResult"/>
     /// in the <see cref="PipingFailureMechanism"/>.
     /// </summary>
-    public class PipingFailureMechanismResultView : FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-        AdoptableFailureMechanismSectionResultRow, PipingFailureMechanism>
+    public class PipingFailureMechanismResultView : AdoptableFailureMechanismResultView<PipingFailureMechanism, IPipingCalculationScenario<PipingInput>, PipingInput>
     {
-        private const int initialFailureMechanismResultTypeIndex = 2;
-        private const int initialFailureMechanismResultSectionProbabilityIndex = 3;
-        private const int furtherAnalysisTypeIndex = 4;
-        private const int refinedSectionProbabilityIndex = 5;
-        private const int sectionProbabilityIndex = 6;
-        private const int assemblyGroupIndex = 7;
-
-        private readonly RecursiveObserver<CalculationGroup, ICalculationInput> calculationInputsObserver;
-        private readonly RecursiveObserver<CalculationGroup, ICalculationBase> calculationGroupObserver;
         private readonly RecursiveObserver<IObservableEnumerable<PipingScenarioConfigurationPerFailureMechanismSection>, PipingScenarioConfigurationPerFailureMechanismSection> scenarioConfigurationsPerSectionObserver;
 
         /// <summary>
@@ -64,24 +52,8 @@
         public PipingFailureMechanismResultView(IObservableEnumerable<AdoptableFailureMechanismSectionResult> failureMechanismSectionResults,
                                                 PipingFailureMechanism failureMechanism,
                                                 IAssessmentSection assessmentSection)
-            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism)
+            : base(failureMechanismSectionResults, failureMechanism, assessmentSection, PipingFailureMechanismAssemblyFactory.AssembleFailureMechanism, PipingFailureMechanismAssemblyFactory.AssembleSection)
         {
-            // The concat is needed to observe the input of calculations in child groups.
-            calculationInputsObserver = new RecursiveObserver<CalculationGroup, ICalculationInput>(
-                UpdateInternalViewData,
-                cg => cg.Children.Concat<object>(cg.Children
-                                                   .OfType<IPipingCalculationScenario<PipingInput>>()
-                                                   .Select(c => c.InputParameters)))
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-            calculationGroupObserver = new RecursiveObserver<CalculationGroup, ICalculationBase>(
-                UpdateInternalViewData,
-                c => c.Children)
-            {
-                Observable = failureMechanism.CalculationsGroup
-            };
-
             scenarioConfigurationsPerSectionObserver = new RecursiveObserver<IObservableEnumerable<PipingScenarioConfigurationPerFailureMechanismSection>, PipingScenarioConfigurationPerFailureMechanismSection>(
                 UpdateInternalViewData,
                 sc => sc)
@@ -92,76 +64,31 @@
 
         protected override void Dispose(bool disposing)
         {
-            calculationInputsObserver.Dispose();
-            calculationGroupObserver.Dispose();
             scenarioConfigurationsPerSectionObserver.Dispose();
 
             base.Dispose(disposing);
         }
 
-        protected override AdoptableFailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(AdoptableFailureMechanismSectionResult sectionResult)
+        protected override IFailureMechanismSectionResultCalculateProbabilityStrategy CreateCalculateStrategy(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                              IEnumerable<IPipingCalculationScenario<PipingInput>> calculationScenarios)
         {
-            return new AdoptableFailureMechanismSectionResultRow(
-                sectionResult,
-                PipingFailureMechanismSectionResultCalculateProbabilityStrategyFactory.CreateCalculateStrategy(sectionResult, FailureMechanism, AssessmentSection),
-                CreateErrorProvider(sectionResult),
-                () => PipingFailureMechanismAssemblyFactory.AssembleSection(sectionResult, FailureMechanism, AssessmentSection),
-                new AdoptableFailureMechanismSectionResultRow.ConstructionProperties
-                {
-                    InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
-                    InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
-                    FurtherAnalysisTypeIndex = furtherAnalysisTypeIndex,
-                    RefinedSectionProbabilityIndex = refinedSectionProbabilityIndex,
-                    SectionProbabilityIndex = sectionProbabilityIndex,
-                    AssemblyGroupIndex = assemblyGroupIndex
-                });
+            return PipingFailureMechanismSectionResultCalculateProbabilityStrategyFactory.CreateCalculateStrategy(sectionResult, FailureMechanism, AssessmentSection);
         }
 
-        protected override void AddDataGridColumns()
+        protected override IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider CreateErrorProvider(AdoptableFailureMechanismSectionResult sectionResult,
+                                                                                                                       IEnumerable<IPipingCalculationScenario<PipingInput>> calculationScenarios)
         {
-            FailureMechanismSectionResultViewColumnBuilder.AddSectionNameColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.Name));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddIsRelevantColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.IsRelevant));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultTypeColumn<AdoptableInitialFailureMechanismResultType>(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddInitialFailureMechanismResultSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.InitialFailureMechanismResultSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddFurtherAnalysisTypeColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.FurtherAnalysisType));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddRefinedSectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.RefinedSectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblySectionProbabilityColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.SectionProbability));
-
-            FailureMechanismSectionResultViewColumnBuilder.AddAssemblyGroupColumn(
-                DataGridViewControl,
-                nameof(AdoptableFailureMechanismSectionResultRow.AssemblyGroup));
+            return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<IPipingCalculationScenario<PipingInput>>(
+                sectionResult, calculationScenarios,
+                (scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
         }
 
-        private IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider CreateErrorProvider(FailureMechanismSectionResult sectionResult)
+        protected override IEnumerable<IPipingCalculationScenario<PipingInput>> GetCalculationScenarios(AdoptableFailureMechanismSectionResult sectionResult)
         {
             PipingScenarioConfigurationPerFailureMechanismSection scenarioConfigurationForSection = FailureMechanism.GetScenarioConfigurationForSection(sectionResult);
-            IEnumerable<IPipingCalculationScenario<PipingInput>> calculationScenarios = FailureMechanism.ScenarioConfigurationTypeIsSemiProbabilistic(scenarioConfigurationForSection)
-                                                                                            ? (IEnumerable<IPipingCalculationScenario<PipingInput>>) FailureMechanism.Calculations.OfType<SemiProbabilisticPipingCalculationScenario>()
-                                                                                            : FailureMechanism.Calculations.OfType<ProbabilisticPipingCalculationScenario>();
-
-            return new FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider<IPipingCalculationScenario<PipingInput>>(
-                sectionResult, calculationScenarios,
-                (scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
+            return FailureMechanism.ScenarioConfigurationTypeIsSemiProbabilistic(scenarioConfigurationForSection)
+                       ? (IEnumerable<IPipingCalculationScenario<PipingInput>>) FailureMechanism.Calculations.OfType<SemiProbabilisticPipingCalculationScenario>()
+                       : FailureMechanism.Calculations.OfType<ProbabilisticPipingCalculationScenario>();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -r07ed5d07cd57499d7c57ae64e18b508e3b987fed -rf4cbcdd45b2e235aa947d60188a574fe9d36abbe
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision 07ed5d07cd57499d7c57ae64e18b508e3b987fed)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision f4cbcdd45b2e235aa947d60188a574fe9d36abbe)
@@ -85,58 +85,17 @@
             using (var view = new PipingFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection))
             {
                 // Assert
-                Assert.IsInstanceOf<FailureMechanismResultView<AdoptableFailureMechanismSectionResult,
-                    AdoptableFailureMechanismSectionResultRow,
-                    PipingFailureMechanism>>(view);
+                Assert.IsInstanceOf<AdoptableFailureMechanismResultView<PipingFailureMechanism,
+                    IPipingCalculationScenario<PipingInput>,
+                    PipingInput>>(view);
                 Assert.IsNull(view.Data);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
             }
 
             mocks.VerifyAll();
         }
-
+        
         [Test]
-        public void GivenFormWithPipingFailureMechanismResultView_ThenExpectedColumnsAreVisible()
-        {
-            // Given
-            using (new AssemblyToolCalculatorFactoryConfig())
-            using (ShowFailureMechanismResultsView(new PipingFailureMechanism()))
-            {
-                // Then
-                DataGridView dataGridView = GetDataGridView();
-
-                Assert.AreEqual(columnCount, dataGridView.ColumnCount);
-
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[nameColumnIndex]);
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[isRelevantIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[initialFailureMechanismResultTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[furtherAnalysisTypeIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[refinedSectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[sectionProbabilityIndex]);
-                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assemblyGroupIndex]);
-
-                Assert.AreEqual("Vaknaam", dataGridView.Columns[nameColumnIndex].HeaderText);
-                Assert.AreEqual("Is relevant", dataGridView.Columns[isRelevantIndex].HeaderText);
-                Assert.AreEqual("Resultaat initieel mechanisme", dataGridView.Columns[initialFailureMechanismResultTypeIndex].HeaderText);
-                Assert.AreEqual("Faalkans initieel\r\nmechanisme per vak\r\n[1/jaar]", dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Vervolganalyse", dataGridView.Columns[furtherAnalysisTypeIndex].HeaderText);
-                Assert.AreEqual("Aangescherpte\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[refinedSectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Rekenwaarde\r\nfaalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionProbabilityIndex].HeaderText);
-                Assert.AreEqual("Duidingsklasse", dataGridView.Columns[assemblyGroupIndex].HeaderText);
-
-                Assert.IsTrue(dataGridView.Columns[nameColumnIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[isRelevantIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[initialFailureMechanismResultSectionProbabilityIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[furtherAnalysisTypeIndex].ReadOnly);
-                Assert.IsFalse(dataGridView.Columns[refinedSectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[sectionProbabilityIndex].ReadOnly);
-                Assert.IsTrue(dataGridView.Columns[assemblyGroupIndex].ReadOnly);
-            }
-        }
-
-        [Test]
         [SetCulture("nl-NL")]
         [TestCase(PipingScenarioConfigurationType.SemiProbabilistic, PipingScenarioConfigurationPerFailureMechanismSectionType.Probabilistic, "1/31")]
         [TestCase(PipingScenarioConfigurationType.Probabilistic, PipingScenarioConfigurationPerFailureMechanismSectionType.SemiProbabilistic, "1/4")]