diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
index acaf64e8a..62cb3035b 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich/CycleBeginningForm.cs
@@ -29,13 +29,20 @@ namespace TBF.BenchControl.DataEntry.Munich
 			MainSNText = new string[Config.Data.CompoundWMsCount];
 			AuxSNText = new string[Config.Data.CompoundWMsCount];
 			completed = false;
-			StartForceCloseHandler();
 
-			if (Config.Data.CompoundWMsCount < 2) Height = 200;
-			else if (Config.Data.CompoundWMsCount < 3) Height = 355;
+            if (Config.Data.CompoundWMsCount < 2)
+            {
+                Height = 200;
+            }
+            else if (Config.Data.CompoundWMsCount < 3)
+            {
+                Height = 355;
+            }
 
 			Localize();
-		}
+
+            StartForceCloseHandler();
+        }
 
 		void Localize()
 		{
@@ -43,13 +50,21 @@ namespace TBF.BenchControl.DataEntry.Munich
 			groupBox1.Text = Strings.Water_Meter + " 1";
 			mainSN1Label.Text = Strings.Main_WM_SerialNr;
 			auxSN1Label.Text = Strings.Aux_WM_SerialNr;
-			groupBox2.Text = Strings.Water_Meter + " 2";
-			mainSN2Label.Text = Strings.Main_WM_SerialNr;
-			auxSN2Label.Text = Strings.Aux_WM_SerialNr;
-			groupBox3.Text = Strings.Water_Meter + " 3";
-			mainSN3Label.Text = Strings.Main_WM_SerialNr;
-			auxSN3Label.Text = Strings.Aux_WM_SerialNr;
-			okButton.Text = Strings.OkBtnText;
+            okButton.Text = Strings.OkBtnText;
+
+            if (Config.Data.CompoundWMsCount >= 2)
+            {
+                groupBox2.Text = Strings.Water_Meter + " 2";
+                mainSN2Label.Text = Strings.Main_WM_SerialNr;
+                auxSN2Label.Text = Strings.Aux_WM_SerialNr;
+            }
+            
+            if (Config.Data.CompoundWMsCount >= 3)
+            {
+                groupBox3.Text = Strings.Water_Meter + " 3";
+                mainSN3Label.Text = Strings.Main_WM_SerialNr;
+                auxSN3Label.Text = Strings.Aux_WM_SerialNr;
+            }
 		}
 
         private void okButton_Click(object sender, EventArgs e)
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 0fa88f96a..07deba6f8 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.7.283.1")]
-[assembly: AssemblyFileVersion("2.7.283.1")]
+[assembly: AssemblyVersion("2.7.284.1")]
+[assembly: AssemblyFileVersion("2.7.284.1")]
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
index 965c60c9f..3bc4e7d54 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.Designer.cs
@@ -31,95 +31,97 @@ namespace TBF.Screens
         /// </summary>
         private void InitializeComponent()
         {
-			this.splitContainer = new System.Windows.Forms.SplitContainer();
-			this.columnWidthsButton = new System.Windows.Forms.Button();
-			this.previousResultsButton = new System.Windows.Forms.Button();
-			this.configureButton = new System.Windows.Forms.Button();
-			this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
-			((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-			this.splitContainer.Panel1.SuspendLayout();
-			this.splitContainer.Panel2.SuspendLayout();
-			this.splitContainer.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// splitContainer
-			// 
-			this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-			this.splitContainer.IsSplitterFixed = true;
-			this.splitContainer.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer.Name = "splitContainer";
-			this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			// 
-			// splitContainer.Panel1
-			// 
-			this.splitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control;
-			this.splitContainer.Panel1.Controls.Add(this.columnWidthsButton);
-			this.splitContainer.Panel1.Controls.Add(this.previousResultsButton);
-			this.splitContainer.Panel1.Controls.Add(this.configureButton);
-			// 
-			// splitContainer.Panel2
-			// 
-			this.splitContainer.Panel2.Controls.Add(this.flowLayoutPanel);
-			this.splitContainer.Size = new System.Drawing.Size(1057, 706);
-			this.splitContainer.SplitterDistance = 42;
-			this.splitContainer.TabIndex = 0;
-			// 
-			// columnWidthsButton
-			// 
-			this.columnWidthsButton.Location = new System.Drawing.Point(126, 10);
-			this.columnWidthsButton.Name = "columnWidthsButton";
-			this.columnWidthsButton.Size = new System.Drawing.Size(120, 30);
-			this.columnWidthsButton.TabIndex = 1;
-			this.columnWidthsButton.Text = "Save column widths";
-			this.columnWidthsButton.UseVisualStyleBackColor = true;
-			this.columnWidthsButton.Click += new System.EventHandler(this.columnWidthsButton_Click);
-			// 
-			// previousResultsButton
-			// 
-			this.previousResultsButton.Location = new System.Drawing.Point(252, 10);
-			this.previousResultsButton.Name = "previousResultsButton";
-			this.previousResultsButton.Size = new System.Drawing.Size(100, 30);
-			this.previousResultsButton.TabIndex = 2;
-			this.previousResultsButton.Text = "Previous results";
-			this.previousResultsButton.UseVisualStyleBackColor = true;
-			this.previousResultsButton.Click += new System.EventHandler(this.previousResultsButton_Click);
-			// 
-			// configureButton
-			// 
-			this.configureButton.Location = new System.Drawing.Point(20, 10);
-			this.configureButton.Name = "configureButton";
-			this.configureButton.Size = new System.Drawing.Size(100, 30);
-			this.configureButton.TabIndex = 0;
-			this.configureButton.Text = "Configure";
-			this.configureButton.UseVisualStyleBackColor = true;
-			this.configureButton.Click += new System.EventHandler(this.configureButton_Click);
-			// 
-			// flowLayoutPanel
-			// 
-			this.flowLayoutPanel.AutoScroll = true;
-			this.flowLayoutPanel.BackColor = System.Drawing.SystemColors.Control;
-			this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0);
-			this.flowLayoutPanel.Name = "flowLayoutPanel";
-			this.flowLayoutPanel.Size = new System.Drawing.Size(1057, 660);
-			this.flowLayoutPanel.TabIndex = 0;
-			// 
-			// ResultsTabPageCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackColor = System.Drawing.Color.Silver;
-			this.Controls.Add(this.splitContainer);
-			this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-			this.Name = "ResultsTabPageCtrl";
-			this.Size = new System.Drawing.Size(1057, 706);
-			this.Load += new System.EventHandler(this.ResultsTabPageCtrl_Load);
-			this.splitContainer.Panel1.ResumeLayout(false);
-			this.splitContainer.Panel2.ResumeLayout(false);
-			((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-			this.splitContainer.ResumeLayout(false);
-			this.ResumeLayout(false);
+            this.splitContainer = new System.Windows.Forms.SplitContainer();
+            this.columnWidthsButton = new System.Windows.Forms.Button();
+            this.previousResultsButton = new System.Windows.Forms.Button();
+            this.configureButton = new System.Windows.Forms.Button();
+            this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+            this.splitContainer.Panel1.SuspendLayout();
+            this.splitContainer.Panel2.SuspendLayout();
+            this.splitContainer.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer
+            // 
+            this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer.IsSplitterFixed = true;
+            this.splitContainer.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer.Name = "splitContainer";
+            this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer.Panel1
+            // 
+            this.splitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control;
+            this.splitContainer.Panel1.Controls.Add(this.columnWidthsButton);
+            this.splitContainer.Panel1.Controls.Add(this.previousResultsButton);
+            this.splitContainer.Panel1.Controls.Add(this.configureButton);
+            // 
+            // splitContainer.Panel2
+            // 
+            this.splitContainer.Panel2.Controls.Add(this.flowLayoutPanel);
+            this.splitContainer.Size = new System.Drawing.Size(1057, 706);
+            this.splitContainer.SplitterDistance = 42;
+            this.splitContainer.TabIndex = 0;
+            // 
+            // columnWidthsButton
+            // 
+            this.columnWidthsButton.Location = new System.Drawing.Point(126, 10);
+            this.columnWidthsButton.Name = "columnWidthsButton";
+            this.columnWidthsButton.Size = new System.Drawing.Size(120, 30);
+            this.columnWidthsButton.TabIndex = 1;
+            this.columnWidthsButton.Text = "Save column widths";
+            this.columnWidthsButton.UseVisualStyleBackColor = true;
+            this.columnWidthsButton.Click += new System.EventHandler(this.columnWidthsButton_Click);
+            // 
+            // previousResultsButton
+            // 
+            this.previousResultsButton.Enabled = false;
+            this.previousResultsButton.Location = new System.Drawing.Point(252, 10);
+            this.previousResultsButton.Name = "previousResultsButton";
+            this.previousResultsButton.Size = new System.Drawing.Size(100, 30);
+            this.previousResultsButton.TabIndex = 2;
+            this.previousResultsButton.Text = "Previous results";
+            this.previousResultsButton.UseVisualStyleBackColor = true;
+            this.previousResultsButton.Visible = false;
+            this.previousResultsButton.Click += new System.EventHandler(this.previousResultsButton_Click);
+            // 
+            // configureButton
+            // 
+            this.configureButton.Location = new System.Drawing.Point(20, 10);
+            this.configureButton.Name = "configureButton";
+            this.configureButton.Size = new System.Drawing.Size(100, 30);
+            this.configureButton.TabIndex = 0;
+            this.configureButton.Text = "Configure";
+            this.configureButton.UseVisualStyleBackColor = true;
+            this.configureButton.Click += new System.EventHandler(this.configureButton_Click);
+            // 
+            // flowLayoutPanel
+            // 
+            this.flowLayoutPanel.AutoScroll = true;
+            this.flowLayoutPanel.BackColor = System.Drawing.SystemColors.Control;
+            this.flowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0);
+            this.flowLayoutPanel.Name = "flowLayoutPanel";
+            this.flowLayoutPanel.Size = new System.Drawing.Size(1057, 660);
+            this.flowLayoutPanel.TabIndex = 0;
+            // 
+            // ResultsTabPageCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Silver;
+            this.Controls.Add(this.splitContainer);
+            this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.Name = "ResultsTabPageCtrl";
+            this.Size = new System.Drawing.Size(1057, 706);
+            this.Load += new System.EventHandler(this.ResultsTabPageCtrl_Load);
+            this.splitContainer.Panel1.ResumeLayout(false);
+            this.splitContainer.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+            this.splitContainer.ResumeLayout(false);
+            this.ResumeLayout(false);
 
         }
 
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
index 43ce22dea..639985fb5 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
@@ -76,6 +76,7 @@ namespace TBF.Screens
 		{
 			// Localization
 			configureButton.Text = Strings.Configure;
+            columnWidthsButton.Text = Strings.Save_column_widths;
 			previousResultsButton.Text = Strings.Previous_results;
 
 			MetersArrangement = Program.LocalSettings.ResultsConfigMeters;