Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -78,7 +78,7 @@
             {
                 return calculator.CalculateFailureMechanismSectionCategories(signalingNorm,
                                                                              lowerLimitNorm,
-                                                                             probabilityDistributionFactor,
+                                                                             probabilityDistributionFactor / 100,
                                                                              n);
             }
             catch (AssemblyCategoriesCalculatorException e)
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs	(.../FailureMechanismSectionResultColumnBuilder.cs)	(revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Builders/FailureMechanismSectionResultColumnBuilder.cs	(.../FailureMechanismSectionResultColumnBuilder.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -100,6 +100,35 @@
 
         /// <summary>
         /// Adds a column to the <paramref name="dataGridViewControl"/> showing a
+        /// <see cref="SimpleAssessmentResultValidityOnlyType"/>.
+        /// </summary>
+        /// <param name="dataGridViewControl">The <see cref="DataGridViewControl"/> to add the column to.</param>
+        /// <param name="dataPropertyName">The data property name of the column.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public static void AddSimpleAssessmentResultValidityOnlyColumn(DataGridViewControl dataGridViewControl, string dataPropertyName)
+        {
+            if (dataGridViewControl == null)
+            {
+                throw new ArgumentNullException(nameof(dataGridViewControl));
+            }
+
+            if (dataPropertyName == null)
+            {
+                throw new ArgumentNullException(nameof(dataPropertyName));
+            }
+
+            IEnumerable<EnumDisplayWrapper<SimpleAssessmentResultValidityOnlyType>> dataSource = CreateEnumDisplayWrappers<SimpleAssessmentResultValidityOnlyType>();
+
+            dataGridViewControl.AddComboBoxColumn(
+                dataPropertyName,
+                Resources.FailureMechanismResultView_SimpleAssessmentResult_DisplayName,
+                dataSource,
+                nameof(EnumDisplayWrapper<SimpleAssessmentResultValidityOnlyType>.Value),
+                nameof(EnumDisplayWrapper<SimpleAssessmentResultValidityOnlyType>.DisplayName));
+        }
+
+        /// <summary>
+        /// Adds a column to the <paramref name="dataGridViewControl"/> showing a
         /// <see cref="DetailedAssessmentResultType"/>.
         /// </summary>
         /// <param name="dataGridViewControl">The <see cref="DataGridViewControl"/> to add the column to.</param>
@@ -182,6 +211,36 @@
         }
 
         /// <summary>
+        /// Adds a column to the <paramref name="dataGridViewControl"/> showing a
+        /// <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>.
+        /// </summary>
+        /// <param name="dataGridViewControl">The <see cref="DataGridViewControl"/> to add the column to.</param>
+        /// <param name="dataPropertyName">The data property name of the column.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public static void AddTailorMadeAssessmentProbabilityCalculationResultColumn(DataGridViewControl dataGridViewControl, string dataPropertyName)
+        {
+            if (dataGridViewControl == null)
+            {
+                throw new ArgumentNullException(nameof(dataGridViewControl));
+            }
+
+            if (dataPropertyName == null)
+            {
+                throw new ArgumentNullException(nameof(dataPropertyName));
+            }
+
+            IEnumerable<EnumDisplayWrapper<TailorMadeAssessmentProbabilityCalculationResultType>> dataSource = 
+                CreateEnumDisplayWrappers<TailorMadeAssessmentProbabilityCalculationResultType>();
+
+            dataGridViewControl.AddComboBoxColumn(
+                dataPropertyName,
+                Resources.FailureMechanismResultView_TailorMadeAssessmentResult_DisplayName,
+                dataSource,
+                nameof(EnumDisplayWrapper<TailorMadeAssessmentProbabilityCalculationResultType>.Value),
+                nameof(EnumDisplayWrapper<TailorMadeAssessmentProbabilityCalculationResultType>.DisplayName));
+        }
+
+        /// <summary>
         /// Adds a column to the <paramref name="dataGridViewControl"/> showing the tailor made
         /// assessment probability.
         /// </summary>
@@ -356,12 +415,36 @@
 
             dataGridViewControl.AddComboBoxColumn(
                 dataPropertyName,
-                Resources.FailureMechanismResultView_ManualAssemblyCategoryGroup_DisplayName,
+                Resources.FailureMechanismResultView_ManualAssembly_DisplayName,
                 dataSource,
                 nameof(EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>.Value),
                 nameof(EnumDisplayWrapper<FailureMechanismSectionAssemblyCategoryGroup>.DisplayName));
         }
 
+        /// <summary>
+        /// Adds a column to the <paramref name="dataGridViewControl"/> showing the
+        /// overridden combined assembly probability.
+        /// </summary>
+        /// <param name="dataGridViewControl">The <see cref="DataGridViewControl"/> to add the column to.</param>
+        /// <param name="dataPropertyName">The data property name of the column.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public static void AddManualAssemblyProbabilityColumn(DataGridViewControl dataGridViewControl, string dataPropertyName)
+        {
+            if (dataGridViewControl == null)
+            {
+                throw new ArgumentNullException(nameof(dataGridViewControl));
+            }
+
+            if (dataPropertyName == null)
+            {
+                throw new ArgumentNullException(nameof(dataPropertyName));
+            }
+
+            dataGridViewControl.AddTextBoxColumn(
+                dataPropertyName,
+                Resources.FailureMechanismResultView_ManualAssembly_DisplayName);
+        }
+
         #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r1c6c2405bf85bf76ffd242478df9a10d4ae3c966 -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1c6c2405bf85bf76ffd242478df9a10d4ae3c966)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -1478,9 +1478,9 @@
         ///   Looks up a localized string similar to Assemblageresultaat
         ///handmatig.
         /// </summary>
-        public static string FailureMechanismResultView_ManualAssemblyCategoryGroup_DisplayName {
+        public static string FailureMechanismResultView_ManualAssembly_DisplayName {
             get {
-                return ResourceManager.GetString("FailureMechanismResultView_ManualAssemblyCategoryGroup_DisplayName", resourceCulture);
+                return ResourceManager.GetString("FailureMechanismResultView_ManualAssembly_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r1c6c2405bf85bf76ffd242478df9a10d4ae3c966 -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 1c6c2405bf85bf76ffd242478df9a10d4ae3c966)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -254,7 +254,7 @@
     <value>Overschrijf
 assemblageresultaat</value>
   </data>
-  <data name="FailureMechanismResultView_ManualAssemblyCategoryGroup_DisplayName" xml:space="preserve">
+  <data name="FailureMechanismResultView_ManualAssembly_DisplayName" xml:space="preserve">
     <value>Assemblageresultaat
 handmatig</value>
   </data>
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs	(.../TailorMadeAssessmentProbabilityCalculationResultType.cs)	(revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs	(.../TailorMadeAssessmentProbabilityCalculationResultType.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -48,7 +48,7 @@
         /// The calculated probability for this failure
         /// mechanism section has to be entered.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Sufficient))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Probability))]
         Probability = 3,
 
         /// <summary>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs
===================================================================
diff -u -rdeeb111cd648c41702c810d6b4f13ecc67098ccb -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision deeb111cd648c41702c810d6b4f13ecc67098ccb)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -127,7 +127,7 @@
                 // Assert
                 Assert.AreEqual(signalingNorm, calculator.SignalingNorm);
                 Assert.AreEqual(lowerLimitNorm, calculator.LowerLimitNorm);
-                Assert.AreEqual(probabilityDistributionFactor, calculator.ProbabilityDistributionFactor);
+                Assert.AreEqual(probabilityDistributionFactor / 100, calculator.ProbabilityDistributionFactor);
                 Assert.AreEqual(n, calculator.N);
             }
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs	(.../FailureMechanismSectionResultColumnBuilderTest.cs)	(revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Builders/FailureMechanismSectionResultColumnBuilderTest.cs	(.../FailureMechanismSectionResultColumnBuilderTest.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -171,6 +171,60 @@
             }
         }
 
+        [Test]
+        public void AddSimpleAssessmentResultValidityOnlyColumn_DataGridViewControlNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(null, "property");
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataGridViewControl", exception.ParamName);
+        }
+
+        [Test]
+        public void AddSimpleAssessmentResultValidityOnlyColumn_DataPropertyNameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(new DataGridViewControl(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataPropertyName", exception.ParamName);
+        }
+
+        [Test]
+        public void AddSimpleAssessmentResultValidityOnlyColumn_WithParameters_AddsColumnToDataGridViewControl()
+        {
+            // Setup
+            using (var form = new Form())
+            using (var control = new DataGridViewControl())
+            {
+                form.Controls.Add(control);
+                form.Show();
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+                // Precondition
+                Assert.AreEqual(0, dataGridView.ColumnCount);
+
+                // Call
+                FailureMechanismSectionResultColumnBuilder.AddSimpleAssessmentResultValidityOnlyColumn(control, dataPropertyName);
+
+                // Assert
+                Assert.AreEqual(1, dataGridView.ColumnCount);
+
+                var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0];
+                Assert.AreEqual(dataPropertyName, columnData.DataPropertyName);
+                Assert.AreEqual("Eenvoudige toets", columnData.HeaderText);
+                Assert.AreEqual("Value", columnData.ValueMember);
+                Assert.AreEqual("DisplayName", columnData.DisplayMember);
+
+                IEnumerable<EnumDisplayWrapper<SimpleAssessmentResultValidityOnlyType>> expectedDataSource =
+                    CreateExpectedEnumDisplayWrappers<SimpleAssessmentResultValidityOnlyType>();
+                AssertEnumDisplayWrappersAreEqual(expectedDataSource, (EnumDisplayWrapper<SimpleAssessmentResultValidityOnlyType>[]) columnData.DataSource);
+            }
+        }
+
         #endregion
 
         #region Detailed Assessment
@@ -295,7 +349,7 @@
         public void AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn_DataPropertyNameNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => 
+            TestDelegate test = () =>
                 FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityAndDetailedCalculationResultColumn(new DataGridViewControl(), null);
 
             // Assert
@@ -331,12 +385,68 @@
 
                 IEnumerable<EnumDisplayWrapper<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>> expectedDataSource =
                     CreateExpectedEnumDisplayWrappers<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>();
-                AssertEnumDisplayWrappersAreEqual(expectedDataSource, 
+                AssertEnumDisplayWrappersAreEqual(expectedDataSource,
                                                   (EnumDisplayWrapper<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>[]) columnData.DataSource);
             }
         }
 
         [Test]
+        public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_DataGridViewControlNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(null, "property");
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataGridViewControl", exception.ParamName);
+        }
+
+        [Test]
+        public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_DataPropertyNameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () =>
+                FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(new DataGridViewControl(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataPropertyName", exception.ParamName);
+        }
+
+        [Test]
+        public void AddTailorMadeAssessmentProbabilityCalculationResultColumn_WithParameters_AddsColumnToDataGridViewControl()
+        {
+            // Setup
+            using (var form = new Form())
+            using (var control = new DataGridViewControl())
+            {
+                form.Controls.Add(control);
+                form.Show();
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+                // Precondition
+                Assert.AreEqual(0, dataGridView.ColumnCount);
+
+                // Call
+                FailureMechanismSectionResultColumnBuilder.AddTailorMadeAssessmentProbabilityCalculationResultColumn(control, dataPropertyName);
+
+                // Assert
+                Assert.AreEqual(1, dataGridView.ColumnCount);
+
+                var columnData = (DataGridViewComboBoxColumn) dataGridView.Columns[0];
+                Assert.AreEqual(dataPropertyName, columnData.DataPropertyName);
+                Assert.AreEqual("Toets op maat", columnData.HeaderText);
+                Assert.AreEqual("Value", columnData.ValueMember);
+                Assert.AreEqual("DisplayName", columnData.DisplayMember);
+
+                IEnumerable<EnumDisplayWrapper<TailorMadeAssessmentProbabilityCalculationResultType>> expectedDataSource =
+                    CreateExpectedEnumDisplayWrappers<TailorMadeAssessmentProbabilityCalculationResultType>();
+                AssertEnumDisplayWrappersAreEqual(expectedDataSource,
+                                                  (EnumDisplayWrapper<TailorMadeAssessmentProbabilityCalculationResultType>[]) columnData.DataSource);
+            }
+        }
+
+        [Test]
         public void AddTailorMadeAssessmentProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException()
         {
             // Call
@@ -686,6 +796,54 @@
             }
         }
 
+        [Test]
+        public void AddManualAssemblyProbabilityColumn_DataGridViewControlNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddManualAssemblyProbabilityColumn(null, "property");
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataGridViewControl", exception.ParamName);
+        }
+
+        [Test]
+        public void AddManualAssemblyProbabilityColumn_DataPropertyNameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => FailureMechanismSectionResultColumnBuilder.AddManualAssemblyProbabilityColumn(new DataGridViewControl(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("dataPropertyName", exception.ParamName);
+        }
+
+        [Test]
+        public void AddManualAssemblyProbabilityColumn_WithParameters_AddsColumnToDataGridViewControl()
+        {
+            // Setup
+            using (var form = new Form())
+            using (var control = new DataGridViewControl())
+            {
+                form.Controls.Add(control);
+                form.Show();
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+                // Precondition
+                Assert.AreEqual(0, dataGridView.ColumnCount);
+
+                // Call
+                FailureMechanismSectionResultColumnBuilder.AddManualAssemblyProbabilityColumn(control, dataPropertyName);
+
+                // Assert
+                Assert.AreEqual(1, dataGridView.ColumnCount);
+
+                var columnData = (DataGridViewTextBoxColumn) dataGridView.Columns[0];
+                Assert.AreEqual(dataPropertyName, columnData.DataPropertyName);
+                Assert.AreEqual("Assemblageresultaat\r\nhandmatig", columnData.HeaderText);
+            }
+        }
+
         #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -r70df02232e2470ca8edfa1181512e96c580d264a -r10da55f5cb8bf1b8a8309e43f923072a29db254d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs)	(revision 70df02232e2470ca8edfa1181512e96c580d264a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs)	(revision 10da55f5cb8bf1b8a8309e43f923072a29db254d)
@@ -46,7 +46,7 @@
             SimpleAssessmentResult = SimpleAssessmentResultValidityOnlyType.None;
             DetailedAssessmentResult = DetailedAssessmentResultType.Probability;
             TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.None;
-            tailorMadeAssessmentProbability = double.NaN;
+            TailorMadeAssessmentProbability = double.NaN;
             ManualAssemblyProbability = double.NaN;
         }