Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs
===================================================================
diff -u -r944fdee64bdb19c321a106fef6a40263698644bd -r2099f5c28f0980f31e91d886ae368b32006ec9a2
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs	(.../HydraulicBoundaryCalculationsView.Designer.cs)	(revision 944fdee64bdb19c321a106fef6a40263698644bd)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs	(.../HydraulicBoundaryCalculationsView.Designer.cs)	(revision 2099f5c28f0980f31e91d886ae368b32006ec9a2)
@@ -46,6 +46,7 @@
             this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
             this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.splitContainer = new System.Windows.Forms.SplitContainer();
+            this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox = new System.Windows.Forms.CheckBox();
             this.illustrationPointsControl = new Riskeer.Common.Forms.Views.IllustrationPointsControl();
             this.ButtonGroupBox.SuspendLayout();
@@ -54,17 +55,18 @@
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
             this.splitContainer.SuspendLayout();
+            this.tableLayoutPanel.SuspendLayout();
             this.SuspendLayout();
             // 
             // dataGridViewControl
             // 
             this.dataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridViewControl.Location = new System.Drawing.Point(0, 40);
+            this.dataGridViewControl.Location = new System.Drawing.Point(3, 49);
             this.dataGridViewControl.MultiSelect = true;
             this.dataGridViewControl.Name = "dataGridViewControl";
             this.dataGridViewControl.Padding = new System.Windows.Forms.Padding(0, 0, 0, 5);
             this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
-            this.dataGridViewControl.Size = new System.Drawing.Size(536, 324);
+            this.dataGridViewControl.Size = new System.Drawing.Size(536, 306);
             this.dataGridViewControl.TabIndex = 0;
             // 
             // CalculateForSelectedButton
@@ -101,8 +103,8 @@
             this.ButtonGroupBox.Controls.Add(this.CalculateForSelectedButton);
             this.ButtonGroupBox.Controls.Add(this.DeselectAllButton);
             this.ButtonGroupBox.Controls.Add(this.SelectAllButton);
-            this.ButtonGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.ButtonGroupBox.Location = new System.Drawing.Point(0, 364);
+            this.ButtonGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ButtonGroupBox.Location = new System.Drawing.Point(3, 361);
             this.ButtonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
             this.ButtonGroupBox.Name = "ButtonGroupBox";
             this.ButtonGroupBox.Size = new System.Drawing.Size(536, 61);
@@ -129,9 +131,7 @@
             // 
             this.splitContainer.Panel1.AutoScroll = true;
             this.splitContainer.Panel1.AutoScrollMinSize = new System.Drawing.Size(535, 0);
-            this.splitContainer.Panel1.Controls.Add(this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox);
-            this.splitContainer.Panel1.Controls.Add(this.dataGridViewControl);
-            this.splitContainer.Panel1.Controls.Add(this.ButtonGroupBox);
+            this.splitContainer.Panel1.Controls.Add(this.tableLayoutPanel);
             // 
             // splitContainer.Panel2
             // 
@@ -140,15 +140,31 @@
             this.splitContainer.SplitterDistance = 536;
             this.splitContainer.TabIndex = 1;
             // 
+            // tableLayoutPanel
+            // 
+            this.tableLayoutPanel.ColumnCount = 1;
+            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel.Controls.Add(this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox, 0, 0);
+            this.tableLayoutPanel.Controls.Add(this.dataGridViewControl, 0, 1);
+            this.tableLayoutPanel.Controls.Add(this.ButtonGroupBox, 0, 2);
+            this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel.Name = "tableLayoutPanel";
+            this.tableLayoutPanel.RowCount = 3;
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel.Size = new System.Drawing.Size(536, 425);
+            this.tableLayoutPanel.TabIndex = 4;
+            // 
             // showHydraulicBoundaryDatabaseFileNameColumnCheckBox
             // 
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.AutoSize = true;
-            this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Dock = System.Windows.Forms.DockStyle.Top;
-            this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Location = new System.Drawing.Point(0, 0);
+            this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Location = new System.Drawing.Point(3, 3);
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.MinimumSize = new System.Drawing.Size(500, 40);
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Name = "showHydraulicBoundaryDatabaseFileNameColumnCheckBox";
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Padding = new System.Windows.Forms.Padding(8, 0, 0, 0);
-            this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Size = new System.Drawing.Size(536, 40);
+            this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Size = new System.Drawing.Size(500, 40);
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.TabIndex = 3;
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.UseVisualStyleBackColor = true;
             this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox.CheckedChanged += new System.EventHandler(this.ShowHydraulicBoundaryDatabaseFileNameColumnCheckBox_CheckedChanged);
@@ -176,9 +192,13 @@
             this.splitContainer.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize) (this.splitContainer)).EndInit();
             this.splitContainer.ResumeLayout(false);
+            this.tableLayoutPanel.ResumeLayout(false);
+            this.tableLayoutPanel.PerformLayout();
             this.ResumeLayout(false);
         }
 
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
+
         #endregion
 
         protected Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl;
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs
===================================================================
diff -u -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 -r2099f5c28f0980f31e91d886ae368b32006ec9a2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs	(.../HydraulicBoundaryCalculationsViewTest.cs)	(revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs	(.../HydraulicBoundaryCalculationsViewTest.cs)	(revision 2099f5c28f0980f31e91d886ae368b32006ec9a2)
@@ -108,11 +108,16 @@
                 Assert.IsNotNull(splitContainer);
                 Control.ControlCollection verticalSplitContainerPanel1Controls = splitContainer.Panel1.Controls;
                 Assert.AreEqual(new Size(535, 0), splitContainer.Panel1.AutoScrollMinSize);
-                Assert.AreEqual(3, verticalSplitContainerPanel1Controls.Count);
-                Assert.IsInstanceOf<CheckBox>(verticalSplitContainerPanel1Controls[0]);
-                Assert.IsInstanceOf<DataGridViewControl>(verticalSplitContainerPanel1Controls[1]);
-                Assert.IsInstanceOf<GroupBox>(verticalSplitContainerPanel1Controls[2]);
+                Assert.AreEqual(1, verticalSplitContainerPanel1Controls.Count);
+                Assert.IsInstanceOf<TableLayoutPanel>(verticalSplitContainerPanel1Controls[0]);
 
+                var tableLayoutPanel = (TableLayoutPanel) verticalSplitContainerPanel1Controls[0];
+                Assert.AreEqual(1, tableLayoutPanel.ColumnCount);
+                Assert.AreEqual(3, tableLayoutPanel.RowCount);
+                Assert.IsInstanceOf<CheckBox>(tableLayoutPanel.GetControlFromPosition(0, 0));
+                Assert.IsInstanceOf<DataGridViewControl>(tableLayoutPanel.GetControlFromPosition(0, 1));
+                Assert.IsInstanceOf<GroupBox>(tableLayoutPanel.GetControlFromPosition(0, 2));
+
                 Control.ControlCollection verticalSplitContainerPanel2Controls = splitContainer.Panel2.Controls;
                 Assert.AreEqual(1, verticalSplitContainerPanel2Controls.Count);
                 Assert.IsInstanceOf<IllustrationPointsControl>(verticalSplitContainerPanel2Controls[0]);