diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs
index ee5d7a67c..9859ed1f3 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.cs
@@ -25,29 +25,83 @@ namespace TBF.BenchControl.DataEntry.Standard24
         public bool Completed { get { return completed; } }
 		bool completed;
 
+		int TextBoxesCount;
+		Label[] labels;
+		ComboBox[] comboBoxes;
+		CheckBox[] checkBoxes;
 		IList<ComboBox> enabledComboBoxes;
 
+
+		/// <summary> Parameterless constructor for common functionality </summary>
+		public CycleBeginningForm()
+		{
+			InitializeComponent();
+
+			TextBoxesCount = 24;
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24,
+				};
+			comboBoxes = new ComboBox[]
+				{
+					comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6,
+					comboBox7,  comboBox8,  comboBox9,  comboBox10, comboBox11, comboBox12,
+					comboBox13, comboBox14, comboBox15, comboBox16, comboBox17, comboBox18,
+					comboBox19, comboBox20, comboBox21, comboBox22, comboBox23, comboBox24,
+				};
+			checkBoxes = new CheckBox[]
+				{
+					checkBox1,  checkBox2,  checkBox3,  checkBox4,  checkBox5,  checkBox6,
+					checkBox7,  checkBox8,  checkBox9,  checkBox10, checkBox11, checkBox12,
+					checkBox13, checkBox14, checkBox15, checkBox16, checkBox17, checkBox18,
+					checkBox19, checkBox20, checkBox21, checkBox22, checkBox23, checkBox24,
+				};
+			enabledComboBoxes = new List<ComboBox>();
+
+			completed = false;
+			StartForceCloseHandler();
+		}
+
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
         public CycleBeginningForm(int waterMetersCount)
+			: this()
         {
             this.WaterMetersCount = waterMetersCount;
-            InitializeComponent();
             SNText = new string[WaterMetersCount];
 			Disabled = new bool[WaterMetersCount];
-            completed = false;
-			enabledComboBoxes = new List<ComboBox>();
-			StartForceCloseHandler();
 
             //Height = 147 + WaterMetersCount * 90;
         }
 
-		/// <summary> Parameterless constructor for all watermeters </summary>
-		public CycleBeginningForm()
-			: this(Program.WMsCount)
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		void ShuffleTextBoxes()
 		{
+			if (Program.WMsCount < TextBoxesCount)
+			{
+				int nrLines = Program.WMsCount / Program.LineSize;
+				int gap = (TextBoxesCount - Program.WMsCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < Program.LineSize; i++)
+					{
+						labels[dest] = labels[l * Program.LineSize + l * gap + i];
+						comboBoxes[dest] = comboBoxes[l * Program.LineSize + l * gap + i];
+						checkBoxes[dest] = checkBoxes[l * Program.LineSize + l * gap + i];
+						dest++;
+					}
+				}
+				TextBoxesCount = Program.WMsCount;
+			}
 		}
 
         private void CycleBeginningForm_Load(object sender, EventArgs e)
@@ -56,88 +110,22 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			
 			PrepareOrderCombo(orderComboBox);
 
-			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+			for (int i = 0; i < Math.Min(TextBoxesCount, WaterMetersCount); i++)
 			{
-				if (WaterMetersCount >= 1)  comboBox1.Items.Add(Program.LocalSettings.LastSNTexts[0]);
-				if (WaterMetersCount >= 2)  comboBox2.Items.Add(Program.LocalSettings.LastSNTexts[1]);
-				if (WaterMetersCount >= 3)  comboBox3.Items.Add(Program.LocalSettings.LastSNTexts[2]);
-				if (WaterMetersCount >= 4)  comboBox4.Items.Add(Program.LocalSettings.LastSNTexts[3]);
-				if (WaterMetersCount >= 5)  comboBox5.Items.Add(Program.LocalSettings.LastSNTexts[4]);
-				if (WaterMetersCount >= 6)  comboBox6.Items.Add(Program.LocalSettings.LastSNTexts[5]);
-				if (WaterMetersCount >= 7)  comboBox7.Items.Add(Program.LocalSettings.LastSNTexts[6]);
-				if (WaterMetersCount >= 8)  comboBox8.Items.Add(Program.LocalSettings.LastSNTexts[7]);
-				if (WaterMetersCount >= 9)  comboBox9.Items.Add(Program.LocalSettings.LastSNTexts[8]);
-				if (WaterMetersCount >= 10) comboBox10.Items.Add(Program.LocalSettings.LastSNTexts[9]);
-				if (WaterMetersCount >= 11) comboBox11.Items.Add(Program.LocalSettings.LastSNTexts[10]);
-				if (WaterMetersCount >= 12) comboBox12.Items.Add(Program.LocalSettings.LastSNTexts[11]);
-				if (WaterMetersCount >= 13) comboBox13.Items.Add(Program.LocalSettings.LastSNTexts[12]);
-				if (WaterMetersCount >= 14) comboBox14.Items.Add(Program.LocalSettings.LastSNTexts[13]);
-				if (WaterMetersCount >= 15) comboBox15.Items.Add(Program.LocalSettings.LastSNTexts[14]);
-				if (WaterMetersCount >= 16) comboBox16.Items.Add(Program.LocalSettings.LastSNTexts[15]);
-				if (WaterMetersCount >= 17) comboBox17.Items.Add(Program.LocalSettings.LastSNTexts[16]);
-				if (WaterMetersCount >= 18) comboBox18.Items.Add(Program.LocalSettings.LastSNTexts[17]);
-				if (WaterMetersCount >= 19) comboBox19.Items.Add(Program.LocalSettings.LastSNTexts[18]);
-				if (WaterMetersCount >= 20) comboBox20.Items.Add(Program.LocalSettings.LastSNTexts[19]);
-				if (WaterMetersCount >= 21) comboBox21.Items.Add(Program.LocalSettings.LastSNTexts[20]);
-				if (WaterMetersCount >= 22) comboBox22.Items.Add(Program.LocalSettings.LastSNTexts[21]);
-				if (WaterMetersCount >= 23) comboBox23.Items.Add(Program.LocalSettings.LastSNTexts[22]);
-				if (WaterMetersCount >= 24) comboBox24.Items.Add(Program.LocalSettings.LastSNTexts[23]);
+				comboBoxes[i].Items.Add(Program.LocalSettings.LastSNTexts[i]);
+				labels[i].Visible = comboBoxes[i].Visible = checkBoxes[i].Visible = true;
+				enabledComboBoxes.Add(comboBoxes[i]);
 			}
-
-			if (WaterMetersCount < 1) { label1.Visible = comboBox1.Visible = checkBox1.Visible = false; } else { enabledComboBoxes.Add(comboBox1); }
-			if (WaterMetersCount < 2) { label2.Visible = comboBox2.Visible = checkBox2.Visible = false; } else { enabledComboBoxes.Add(comboBox2); }
-			if (WaterMetersCount < 3) { label3.Visible = comboBox3.Visible = checkBox3.Visible = false; } else { enabledComboBoxes.Add(comboBox3); }
-			if (WaterMetersCount < 4) { label4.Visible = comboBox4.Visible = checkBox4.Visible = false; } else { enabledComboBoxes.Add(comboBox4); }
-			if (WaterMetersCount < 5) { label5.Visible = comboBox5.Visible = checkBox5.Visible = false; } else { enabledComboBoxes.Add(comboBox5); }
-			if (WaterMetersCount < 6) { label6.Visible = comboBox6.Visible = checkBox6.Visible = false; } else { enabledComboBoxes.Add(comboBox6); }
-			if (WaterMetersCount < 7) { label7.Visible = comboBox7.Visible = checkBox7.Visible = false; } else { enabledComboBoxes.Add(comboBox7); }
-			if (WaterMetersCount < 8) { label8.Visible = comboBox8.Visible = checkBox8.Visible = false; } else { enabledComboBoxes.Add(comboBox8); }
-			if (WaterMetersCount < 9) { label9.Visible = comboBox9.Visible = checkBox9.Visible = false; } else { enabledComboBoxes.Add(comboBox9); }
-			if (WaterMetersCount < 10) { label10.Visible = comboBox10.Visible = checkBox10.Visible = false; } else { enabledComboBoxes.Add(comboBox10); }
-			if (WaterMetersCount < 11) { label11.Visible = comboBox11.Visible = checkBox11.Visible = false; } else { enabledComboBoxes.Add(comboBox11); }
-			if (WaterMetersCount < 12) { label12.Visible = comboBox12.Visible = checkBox12.Visible = false; } else { enabledComboBoxes.Add(comboBox12); }
-			if (WaterMetersCount < 13) { label13.Visible = comboBox13.Visible = checkBox13.Visible = false; } else { enabledComboBoxes.Add(comboBox13); }
-			if (WaterMetersCount < 14) { label14.Visible = comboBox14.Visible = checkBox14.Visible = false; } else { enabledComboBoxes.Add(comboBox14); }
-			if (WaterMetersCount < 15) { label15.Visible = comboBox15.Visible = checkBox15.Visible = false; } else { enabledComboBoxes.Add(comboBox15); }
-			if (WaterMetersCount < 16) { label16.Visible = comboBox16.Visible = checkBox16.Visible = false; } else { enabledComboBoxes.Add(comboBox16); }
-			if (WaterMetersCount < 17) { label17.Visible = comboBox17.Visible = checkBox17.Visible = false; } else { enabledComboBoxes.Add(comboBox17); }
-			if (WaterMetersCount < 18) { label18.Visible = comboBox18.Visible = checkBox18.Visible = false; } else { enabledComboBoxes.Add(comboBox18); }
-			if (WaterMetersCount < 19) { label19.Visible = comboBox19.Visible = checkBox19.Visible = false; } else { enabledComboBoxes.Add(comboBox19); }
-			if (WaterMetersCount < 20) { label20.Visible = comboBox20.Visible = checkBox20.Visible = false; } else { enabledComboBoxes.Add(comboBox20); }
-			if (WaterMetersCount < 21) { label21.Visible = comboBox21.Visible = checkBox21.Visible = false; } else { enabledComboBoxes.Add(comboBox21); }
-			if (WaterMetersCount < 22) { label22.Visible = comboBox22.Visible = checkBox22.Visible = false; } else { enabledComboBoxes.Add(comboBox22); }
-			if (WaterMetersCount < 23) { label23.Visible = comboBox23.Visible = checkBox23.Visible = false; } else { enabledComboBoxes.Add(comboBox23); }
-			if (WaterMetersCount < 24) { label24.Visible = comboBox24.Visible = checkBox24.Visible = false; } else { enabledComboBoxes.Add(comboBox24); }
 		}
 
 		void Localize()
 		{
 			Text = Strings.Data;
 			orderGroupBox.Text = Strings.Purchase_Order;
-			label1.Text = Strings.Serial_Number + " 1";
-			label2.Text = Strings.Serial_Number + " 2";
-			label3.Text = Strings.Serial_Number + " 3";
-			label4.Text = Strings.Serial_Number + " 4";
-			label5.Text = Strings.Serial_Number + " 5";
-			label6.Text = Strings.Serial_Number + " 6";
-			label7.Text = Strings.Serial_Number + " 7";
-			label8.Text = Strings.Serial_Number + " 8";
-			label9.Text = Strings.Serial_Number + " 9";
-			label10.Text = Strings.Serial_Number + " 10";
-			label11.Text = Strings.Serial_Number + " 11";
-			label12.Text = Strings.Serial_Number + " 12";
-			label13.Text = Strings.Serial_Number + " 13";
-			label14.Text = Strings.Serial_Number + " 14";
-			label15.Text = Strings.Serial_Number + " 15";
-			label16.Text = Strings.Serial_Number + " 16";
-			label17.Text = Strings.Serial_Number + " 17";
-			label18.Text = Strings.Serial_Number + " 18";
-			label19.Text = Strings.Serial_Number + " 19";
-			label20.Text = Strings.Serial_Number + " 20";
-			label21.Text = Strings.Serial_Number + " 21";
-			label22.Text = Strings.Serial_Number + " 22";
-			label23.Text = Strings.Serial_Number + " 23";
-			label24.Text = Strings.Serial_Number + " 24";
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				labels[i].Text = Strings.Serial_Number + " " + (i + 1).ToString();
+			}
 			okButton.Text = Strings.OkBtnText;
 			clearButton.Text = Strings.ClearBtnText;
 		}
@@ -169,188 +157,38 @@ namespace TBF.BenchControl.DataEntry.Standard24
 #endif
 												);
 
-			Program.LocalSettings.LastSNTexts = SNText; 
+			Program.LocalSettings.LastSNTexts = SNText;
 
-            if (WaterMetersCount >= 1) { SNText[0] = comboBox1.Text; Disabled[0] = !checkBox1.Checked; }
-            if (WaterMetersCount >= 2) { SNText[1] = comboBox2.Text; Disabled[1] = !checkBox2.Checked; }
-            if (WaterMetersCount >= 3) { SNText[2] = comboBox3.Text; Disabled[2] = !checkBox3.Checked; }
-            if (WaterMetersCount >= 4) { SNText[3] = comboBox4.Text; Disabled[3] = !checkBox4.Checked; }
-            if (WaterMetersCount >= 5) { SNText[4] = comboBox5.Text; Disabled[4] = !checkBox5.Checked; }
-			if (WaterMetersCount >= 6) { SNText[5] = comboBox6.Text; Disabled[5] = !checkBox6.Checked; }
-			if (WaterMetersCount >= 7) { SNText[6] = comboBox7.Text; Disabled[6] = !checkBox7.Checked; }
-			if (WaterMetersCount >= 8) { SNText[7] = comboBox8.Text; Disabled[7] = !checkBox8.Checked; }
-			if (WaterMetersCount >= 9) { SNText[8] = comboBox9.Text; Disabled[8] = !checkBox9.Checked; }
-			if (WaterMetersCount >= 10) { SNText[9] = comboBox10.Text; Disabled[9] = !checkBox10.Checked; }
-			if (WaterMetersCount >= 11) { SNText[10] = comboBox11.Text; Disabled[10] = !checkBox11.Checked; }
-			if (WaterMetersCount >= 12) { SNText[11] = comboBox12.Text; Disabled[11] = !checkBox12.Checked; }
-			if (WaterMetersCount >= 13) { SNText[12] = comboBox13.Text; Disabled[12] = !checkBox13.Checked; }
-			if (WaterMetersCount >= 14) { SNText[13] = comboBox14.Text; Disabled[13] = !checkBox14.Checked; }
-			if (WaterMetersCount >= 15) { SNText[14] = comboBox15.Text; Disabled[14] = !checkBox15.Checked; }
-			if (WaterMetersCount >= 16) { SNText[15] = comboBox16.Text; Disabled[15] = !checkBox16.Checked; }
-			if (WaterMetersCount >= 17) { SNText[16] = comboBox17.Text; Disabled[16] = !checkBox17.Checked; }
-			if (WaterMetersCount >= 18) { SNText[17] = comboBox18.Text; Disabled[17] = !checkBox18.Checked; }
-			if (WaterMetersCount >= 19) { SNText[18] = comboBox19.Text; Disabled[18] = !checkBox19.Checked; }
-			if (WaterMetersCount >= 20) { SNText[19] = comboBox20.Text; Disabled[19] = !checkBox20.Checked; }
-			if (WaterMetersCount >= 21) { SNText[20] = comboBox21.Text; Disabled[20] = !checkBox21.Checked; }
-			if (WaterMetersCount >= 22) { SNText[21] = comboBox22.Text; Disabled[21] = !checkBox22.Checked; }
-			if (WaterMetersCount >= 23) { SNText[22] = comboBox23.Text; Disabled[22] = !checkBox23.Checked; }
-			if (WaterMetersCount >= 24) { SNText[23] = comboBox24.Text; Disabled[23] = !checkBox24.Checked; }
+			for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+			{
+				SNText[i] = comboBoxes[i].Text;
+				Disabled[i] = !checkBoxes[i].Checked;
+			}
 
             completed = true;
             Close();
         }
 
-
+		/// <summary>
+		/// When one combo box is updated using drop-down menu, all combo boxes
+		/// are updated by this function.
+		/// </summary>
 		private void UpdateAllCombos()
 		{
-			if (WaterMetersCount >= 1)
+			for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
 			{
-				comboBox1.Text = Program.LocalSettings.LastSNTexts[0];
-				checkBox1.Checked = !string.IsNullOrEmpty(comboBox1.Text);
-			}
-			if (WaterMetersCount >= 2)
-			{
-				comboBox2.Text = Program.LocalSettings.LastSNTexts[1];
-				checkBox2.Checked = !string.IsNullOrEmpty(comboBox2.Text);
-			}
-			if (WaterMetersCount >= 3)
-			{
-				comboBox3.Text = Program.LocalSettings.LastSNTexts[2];
-				checkBox3.Checked = !string.IsNullOrEmpty(comboBox3.Text);
-			}
-			if (WaterMetersCount >= 4)
-			{
-				comboBox4.Text = Program.LocalSettings.LastSNTexts[3];
-				checkBox4.Checked = !string.IsNullOrEmpty(comboBox4.Text);
-			}
-			if (WaterMetersCount >= 5)
-			{
-				comboBox5.Text = Program.LocalSettings.LastSNTexts[4];
-				checkBox5.Checked = !string.IsNullOrEmpty(comboBox5.Text);
-			}
-			if (WaterMetersCount >= 6)
-			{
-				comboBox6.Text = Program.LocalSettings.LastSNTexts[5];
-				checkBox6.Checked = !string.IsNullOrEmpty(comboBox6.Text);
-			}
-			if (WaterMetersCount >= 7)
-			{
-				comboBox7.Text = Program.LocalSettings.LastSNTexts[6];
-				checkBox7.Checked = !string.IsNullOrEmpty(comboBox7.Text);
-			}
-			if (WaterMetersCount >= 8)
-			{
-				comboBox8.Text = Program.LocalSettings.LastSNTexts[7];
-				checkBox8.Checked = !string.IsNullOrEmpty(comboBox8.Text);
-			}
-			if (WaterMetersCount >= 9)
-			{
-				comboBox9.Text = Program.LocalSettings.LastSNTexts[8];
-				checkBox9.Checked = !string.IsNullOrEmpty(comboBox9.Text);
-			}
-			if (WaterMetersCount >= 10)
-			{
-				comboBox10.Text = Program.LocalSettings.LastSNTexts[9];
-				checkBox10.Checked = !string.IsNullOrEmpty(comboBox10.Text);
-			}
-			if (WaterMetersCount >=	11)
-			{
-				comboBox11.Text = Program.LocalSettings.LastSNTexts[10];
-				checkBox11.Checked = !string.IsNullOrEmpty(comboBox11.Text);
-			}
-			if (WaterMetersCount >= 12)
-			{
-				comboBox12.Text = Program.LocalSettings.LastSNTexts[11];
-				checkBox12.Checked = !string.IsNullOrEmpty(comboBox12.Text);
-			}
-			if (WaterMetersCount >= 13)
-			{
-				comboBox13.Text = Program.LocalSettings.LastSNTexts[12];
-				checkBox13.Checked = !string.IsNullOrEmpty(comboBox13.Text);
-			}
-			if (WaterMetersCount >= 14)
-			{
-				comboBox14.Text = Program.LocalSettings.LastSNTexts[13];
-				checkBox14.Checked = !string.IsNullOrEmpty(comboBox14.Text);
-			}
-			if (WaterMetersCount >= 15)
-			{
-				comboBox15.Text = Program.LocalSettings.LastSNTexts[14];
-				checkBox15.Checked = !string.IsNullOrEmpty(comboBox15.Text);
-			}
-			if (WaterMetersCount >= 16)
-			{
-				comboBox16.Text = Program.LocalSettings.LastSNTexts[15];
-				checkBox16.Checked = !string.IsNullOrEmpty(comboBox16.Text);
-			}
-			if (WaterMetersCount >= 17)
-			{
-				comboBox17.Text = Program.LocalSettings.LastSNTexts[16];
-				checkBox17.Checked = !string.IsNullOrEmpty(comboBox17.Text);
-			}
-			if (WaterMetersCount >= 18)
-			{
-				comboBox18.Text = Program.LocalSettings.LastSNTexts[17];
-				checkBox18.Checked = !string.IsNullOrEmpty(comboBox18.Text);
-			}
-			if (WaterMetersCount >= 19)
-			{
-				comboBox19.Text = Program.LocalSettings.LastSNTexts[18];
-				checkBox19.Checked = !string.IsNullOrEmpty(comboBox19.Text);
-			}
-			if (WaterMetersCount >= 20)
-			{
-				comboBox20.Text = Program.LocalSettings.LastSNTexts[19];
-				checkBox20.Checked = !string.IsNullOrEmpty(comboBox20.Text);
-			}
-			if (WaterMetersCount >= 21)
-			{
-				comboBox21.Text = Program.LocalSettings.LastSNTexts[20];
-				checkBox21.Checked = !string.IsNullOrEmpty(comboBox21.Text);
-			}
-			if (WaterMetersCount >= 22)
-			{
-				comboBox22.Text = Program.LocalSettings.LastSNTexts[21];
-				checkBox22.Checked = !string.IsNullOrEmpty(comboBox22.Text);
-			}
-			if (WaterMetersCount >= 23)
-			{
-				comboBox23.Text = Program.LocalSettings.LastSNTexts[22];
-				checkBox23.Checked = !string.IsNullOrEmpty(comboBox23.Text);
-			}
-			if (WaterMetersCount >= 24)
-			{
-				comboBox24.Text = Program.LocalSettings.LastSNTexts[23];
-				checkBox24.Checked = !string.IsNullOrEmpty(comboBox24.Text);
+				comboBoxes[i].Text = Program.LocalSettings.LastSNTexts[i];
+				checkBoxes[i].Checked = !string.IsNullOrEmpty(comboBoxes[i].Text);
 			}
 		}
 
 		private void clearButton_Click(object sender, EventArgs e)
 		{
-			if (WaterMetersCount >= 1) { comboBox1.Text = string.Empty; checkBox1.Checked = false; }
-			if (WaterMetersCount >= 2) { comboBox2.Text = string.Empty; checkBox2.Checked = false; }
-			if (WaterMetersCount >= 3) { comboBox3.Text = string.Empty; checkBox3.Checked = false; }
-			if (WaterMetersCount >= 4) { comboBox4.Text = string.Empty; checkBox4.Checked = false; }
-			if (WaterMetersCount >= 5) { comboBox5.Text = string.Empty; checkBox5.Checked = false; }
-			if (WaterMetersCount >= 6) { comboBox6.Text = string.Empty; checkBox6.Checked = false; }
-			if (WaterMetersCount >= 7) { comboBox7.Text = string.Empty; checkBox7.Checked = false; }
-			if (WaterMetersCount >= 8) { comboBox8.Text = string.Empty; checkBox8.Checked = false; }
-			if (WaterMetersCount >= 9) { comboBox9.Text = string.Empty; checkBox9.Checked = false; }
-			if (WaterMetersCount >= 10) { comboBox10.Text = string.Empty; checkBox10.Checked = false; }
-			if (WaterMetersCount >= 11) { comboBox11.Text = string.Empty; checkBox11.Checked = false; }
-			if (WaterMetersCount >= 12) { comboBox12.Text = string.Empty; checkBox12.Checked = false; }
-			if (WaterMetersCount >= 13) { comboBox13.Text = string.Empty; checkBox13.Checked = false; }
-			if (WaterMetersCount >= 14) { comboBox14.Text = string.Empty; checkBox14.Checked = false; }
-			if (WaterMetersCount >= 15) { comboBox15.Text = string.Empty; checkBox15.Checked = false; }
-			if (WaterMetersCount >= 16) { comboBox16.Text = string.Empty; checkBox16.Checked = false; }
-			if (WaterMetersCount >= 17) { comboBox17.Text = string.Empty; checkBox17.Checked = false; }
-			if (WaterMetersCount >= 18) { comboBox18.Text = string.Empty; checkBox18.Checked = false; }
-			if (WaterMetersCount >= 19) { comboBox19.Text = string.Empty; checkBox19.Checked = false; }
-			if (WaterMetersCount >= 20) { comboBox20.Text = string.Empty; checkBox20.Checked = false; }
-			if (WaterMetersCount >= 21) { comboBox21.Text = string.Empty; checkBox21.Checked = false; }
-			if (WaterMetersCount >= 22) { comboBox22.Text = string.Empty; checkBox22.Checked = false; }
-			if (WaterMetersCount >= 23) { comboBox23.Text = string.Empty; checkBox23.Checked = false; }
-			if (WaterMetersCount >= 24) { comboBox24.Text = string.Empty; checkBox24.Checked = false; }
+			for (int i = 0; i < Math.Min(WaterMetersCount, TextBoxesCount); i++)
+			{			
+				comboBoxes[i].Text = string.Empty;
+				checkBoxes[i].Checked = false;
+			}
 		}
 
 
@@ -359,7 +197,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox1.Text.Equals(Program.LocalSettings.LastSNTexts[0])) UpdateAllCombos();
+				if (comboBox1.Text.Equals(comboBox1.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -368,7 +206,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox2.Text.Equals(Program.LocalSettings.LastSNTexts[1])) UpdateAllCombos();
+				if (comboBox2.Text.Equals(comboBox2.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -377,7 +215,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox3.Text.Equals(Program.LocalSettings.LastSNTexts[2])) UpdateAllCombos();
+				if (comboBox3.Text.Equals(comboBox3.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -386,7 +224,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox4.Text.Equals(Program.LocalSettings.LastSNTexts[3])) UpdateAllCombos();
+				if (comboBox4.Text.Equals(comboBox4.Items[0])) UpdateAllCombos();
 			}
 		}
  
@@ -395,7 +233,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox5.Text.Equals(Program.LocalSettings.LastSNTexts[4])) UpdateAllCombos();
+				if (comboBox5.Text.Equals(comboBox5.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -404,7 +242,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox6.Text.Equals(Program.LocalSettings.LastSNTexts[5])) UpdateAllCombos();
+				if (comboBox6.Text.Equals(comboBox6.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -413,7 +251,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox7.Text.Equals(Program.LocalSettings.LastSNTexts[6])) UpdateAllCombos();
+				if (comboBox7.Text.Equals(comboBox7.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -422,7 +260,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox8.Text.Equals(Program.LocalSettings.LastSNTexts[7])) UpdateAllCombos();
+				if (comboBox8.Text.Equals(comboBox8.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -431,7 +269,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox9.Text.Equals(Program.LocalSettings.LastSNTexts[8])) UpdateAllCombos();
+				if (comboBox9.Text.Equals(comboBox9.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -440,7 +278,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox10.Text.Equals(Program.LocalSettings.LastSNTexts[9])) UpdateAllCombos();
+				if (comboBox10.Text.Equals(comboBox10.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -449,7 +287,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox11.Text.Equals(Program.LocalSettings.LastSNTexts[10])) UpdateAllCombos();
+				if (comboBox11.Text.Equals(comboBox11.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -458,7 +296,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox12.Text.Equals(Program.LocalSettings.LastSNTexts[11])) UpdateAllCombos();
+				if (comboBox12.Text.Equals(comboBox12.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -467,7 +305,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox13.Text.Equals(Program.LocalSettings.LastSNTexts[12])) UpdateAllCombos();
+				if (comboBox13.Text.Equals(comboBox13.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -476,7 +314,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox14.Text.Equals(Program.LocalSettings.LastSNTexts[13])) UpdateAllCombos();
+				if (comboBox14.Text.Equals(comboBox14.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -485,7 +323,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox15.Text.Equals(Program.LocalSettings.LastSNTexts[14])) UpdateAllCombos();
+				if (comboBox15.Text.Equals(comboBox15.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -494,7 +332,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox16.Text.Equals(Program.LocalSettings.LastSNTexts[15])) UpdateAllCombos();
+				if (comboBox16.Text.Equals(comboBox16.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -503,7 +341,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox17.Text.Equals(Program.LocalSettings.LastSNTexts[16])) UpdateAllCombos();
+				if (comboBox17.Text.Equals(comboBox17.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -512,7 +350,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox18.Text.Equals(Program.LocalSettings.LastSNTexts[17])) UpdateAllCombos();
+				if (comboBox18.Text.Equals(comboBox18.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -521,7 +359,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox19.Text.Equals(Program.LocalSettings.LastSNTexts[18])) UpdateAllCombos();
+				if (comboBox19.Text.Equals(comboBox19.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -530,7 +368,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox20.Text.Equals(Program.LocalSettings.LastSNTexts[19])) UpdateAllCombos();
+				if (comboBox20.Text.Equals(comboBox20.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -539,7 +377,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox21.Text.Equals(Program.LocalSettings.LastSNTexts[20])) UpdateAllCombos();
+				if (comboBox21.Text.Equals(comboBox21.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -548,7 +386,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox22.Text.Equals(Program.LocalSettings.LastSNTexts[21])) UpdateAllCombos();
+				if (comboBox22.Text.Equals(comboBox22.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -557,7 +395,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox23.Text.Equals(Program.LocalSettings.LastSNTexts[22])) UpdateAllCombos();
+				if (comboBox23.Text.Equals(comboBox23.Items[0])) UpdateAllCombos();
 			}
 		}
 
@@ -566,7 +404,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-				if (comboBox24.Text.Equals(Program.LocalSettings.LastSNTexts[23])) UpdateAllCombos();
+				if (comboBox24.Text.Equals(comboBox24.Items[0])) UpdateAllCombos();
 			}
 		}
 
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx
index bd8aaa35a..c6e9e344d 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/CycleBeginningForm.resx
@@ -146,6 +146,15 @@
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
     <value>74</value>
   </data>
+  <data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>90, 31</value>
+  </data>
+  <data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 31</value>
+  </data>
+  <data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
     <value>orderComboBox</value>
   </data>
@@ -185,27 +194,6 @@
   <data name="&gt;&gt;orderGroupBox.ZOrder" xml:space="preserve">
     <value>73</value>
   </data>
-  <data name="orderComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>90, 31</value>
-  </data>
-  <data name="orderComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>260, 31</value>
-  </data>
-  <data name="orderComboBox.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Name" xml:space="preserve">
-    <value>orderComboBox</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.Parent" xml:space="preserve">
-    <value>orderGroupBox</value>
-  </data>
-  <data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <data name="clearButton.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
   </data>
@@ -255,6 +243,9 @@
   <data name="label1.Text" xml:space="preserve">
     <value>Serial Number 1</value>
   </data>
+  <data name="label1.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label1.Name" xml:space="preserve">
     <value>label1</value>
   </data>
@@ -279,6 +270,9 @@
   <data name="comboBox1.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
   </data>
+  <data name="comboBox1.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox1.Name" xml:space="preserve">
     <value>comboBox1</value>
   </data>
@@ -303,6 +297,9 @@
   <data name="checkBox1.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
   </data>
+  <data name="checkBox1.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox1.Name" xml:space="preserve">
     <value>checkBox1</value>
   </data>
@@ -330,6 +327,9 @@
   <data name="checkBox2.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
   </data>
+  <data name="checkBox2.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox2.Name" xml:space="preserve">
     <value>checkBox2</value>
   </data>
@@ -354,6 +354,9 @@
   <data name="comboBox2.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
   </data>
+  <data name="comboBox2.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox2.Name" xml:space="preserve">
     <value>comboBox2</value>
   </data>
@@ -387,6 +390,9 @@
   <data name="label2.Text" xml:space="preserve">
     <value>Serial Number 2</value>
   </data>
+  <data name="label2.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label2.Name" xml:space="preserve">
     <value>label2</value>
   </data>
@@ -414,6 +420,9 @@
   <data name="checkBox3.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
   </data>
+  <data name="checkBox3.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox3.Name" xml:space="preserve">
     <value>checkBox3</value>
   </data>
@@ -438,6 +447,9 @@
   <data name="comboBox3.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
   </data>
+  <data name="comboBox3.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox3.Name" xml:space="preserve">
     <value>comboBox3</value>
   </data>
@@ -471,6 +483,9 @@
   <data name="label3.Text" xml:space="preserve">
     <value>Serial Number 3</value>
   </data>
+  <data name="label3.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label3.Name" xml:space="preserve">
     <value>label3</value>
   </data>
@@ -498,6 +513,9 @@
   <data name="checkBox4.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
   </data>
+  <data name="checkBox4.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox4.Name" xml:space="preserve">
     <value>checkBox4</value>
   </data>
@@ -522,6 +540,9 @@
   <data name="comboBox4.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
   </data>
+  <data name="comboBox4.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox4.Name" xml:space="preserve">
     <value>comboBox4</value>
   </data>
@@ -555,6 +576,9 @@
   <data name="label4.Text" xml:space="preserve">
     <value>Serial Number 4</value>
   </data>
+  <data name="label4.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label4.Name" xml:space="preserve">
     <value>label4</value>
   </data>
@@ -582,6 +606,9 @@
   <data name="checkBox5.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
   </data>
+  <data name="checkBox5.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox5.Name" xml:space="preserve">
     <value>checkBox5</value>
   </data>
@@ -606,6 +633,9 @@
   <data name="comboBox5.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
   </data>
+  <data name="comboBox5.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox5.Name" xml:space="preserve">
     <value>comboBox5</value>
   </data>
@@ -639,6 +669,9 @@
   <data name="label5.Text" xml:space="preserve">
     <value>Serial Number 5</value>
   </data>
+  <data name="label5.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label5.Name" xml:space="preserve">
     <value>label5</value>
   </data>
@@ -666,6 +699,9 @@
   <data name="checkBox6.TabIndex" type="System.Int32, mscorlib">
     <value>26</value>
   </data>
+  <data name="checkBox6.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox6.Name" xml:space="preserve">
     <value>checkBox6</value>
   </data>
@@ -690,6 +726,9 @@
   <data name="comboBox6.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
   </data>
+  <data name="comboBox6.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox6.Name" xml:space="preserve">
     <value>comboBox6</value>
   </data>
@@ -723,6 +762,9 @@
   <data name="label6.Text" xml:space="preserve">
     <value>Serial Number 6</value>
   </data>
+  <data name="label6.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label6.Name" xml:space="preserve">
     <value>label6</value>
   </data>
@@ -750,6 +792,9 @@
   <data name="checkBox7.TabIndex" type="System.Int32, mscorlib">
     <value>29</value>
   </data>
+  <data name="checkBox7.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox7.Name" xml:space="preserve">
     <value>checkBox7</value>
   </data>
@@ -774,6 +819,9 @@
   <data name="comboBox7.TabIndex" type="System.Int32, mscorlib">
     <value>28</value>
   </data>
+  <data name="comboBox7.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox7.Name" xml:space="preserve">
     <value>comboBox7</value>
   </data>
@@ -807,6 +855,9 @@
   <data name="label7.Text" xml:space="preserve">
     <value>Serial Number 7</value>
   </data>
+  <data name="label7.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label7.Name" xml:space="preserve">
     <value>label7</value>
   </data>
@@ -834,6 +885,9 @@
   <data name="checkBox8.TabIndex" type="System.Int32, mscorlib">
     <value>32</value>
   </data>
+  <data name="checkBox8.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox8.Name" xml:space="preserve">
     <value>checkBox8</value>
   </data>
@@ -858,6 +912,9 @@
   <data name="comboBox8.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
   </data>
+  <data name="comboBox8.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox8.Name" xml:space="preserve">
     <value>comboBox8</value>
   </data>
@@ -891,6 +948,9 @@
   <data name="label8.Text" xml:space="preserve">
     <value>Serial Number 8</value>
   </data>
+  <data name="label8.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label8.Name" xml:space="preserve">
     <value>label8</value>
   </data>
@@ -918,6 +978,9 @@
   <data name="checkBox9.TabIndex" type="System.Int32, mscorlib">
     <value>35</value>
   </data>
+  <data name="checkBox9.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox9.Name" xml:space="preserve">
     <value>checkBox9</value>
   </data>
@@ -942,6 +1005,9 @@
   <data name="comboBox9.TabIndex" type="System.Int32, mscorlib">
     <value>34</value>
   </data>
+  <data name="comboBox9.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox9.Name" xml:space="preserve">
     <value>comboBox9</value>
   </data>
@@ -975,6 +1041,9 @@
   <data name="label9.Text" xml:space="preserve">
     <value>Serial Number 9</value>
   </data>
+  <data name="label9.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label9.Name" xml:space="preserve">
     <value>label9</value>
   </data>
@@ -1002,6 +1071,9 @@
   <data name="checkBox10.TabIndex" type="System.Int32, mscorlib">
     <value>38</value>
   </data>
+  <data name="checkBox10.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox10.Name" xml:space="preserve">
     <value>checkBox10</value>
   </data>
@@ -1026,6 +1098,9 @@
   <data name="comboBox10.TabIndex" type="System.Int32, mscorlib">
     <value>37</value>
   </data>
+  <data name="comboBox10.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox10.Name" xml:space="preserve">
     <value>comboBox10</value>
   </data>
@@ -1059,6 +1134,9 @@
   <data name="label10.Text" xml:space="preserve">
     <value>Serial Number 10</value>
   </data>
+  <data name="label10.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label10.Name" xml:space="preserve">
     <value>label10</value>
   </data>
@@ -1086,6 +1164,9 @@
   <data name="checkBox11.TabIndex" type="System.Int32, mscorlib">
     <value>41</value>
   </data>
+  <data name="checkBox11.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox11.Name" xml:space="preserve">
     <value>checkBox11</value>
   </data>
@@ -1110,6 +1191,9 @@
   <data name="comboBox11.TabIndex" type="System.Int32, mscorlib">
     <value>40</value>
   </data>
+  <data name="comboBox11.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox11.Name" xml:space="preserve">
     <value>comboBox11</value>
   </data>
@@ -1143,6 +1227,9 @@
   <data name="label11.Text" xml:space="preserve">
     <value>Serial Number 11</value>
   </data>
+  <data name="label11.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label11.Name" xml:space="preserve">
     <value>label11</value>
   </data>
@@ -1170,6 +1257,9 @@
   <data name="checkBox12.TabIndex" type="System.Int32, mscorlib">
     <value>44</value>
   </data>
+  <data name="checkBox12.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox12.Name" xml:space="preserve">
     <value>checkBox12</value>
   </data>
@@ -1194,6 +1284,9 @@
   <data name="comboBox12.TabIndex" type="System.Int32, mscorlib">
     <value>43</value>
   </data>
+  <data name="comboBox12.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox12.Name" xml:space="preserve">
     <value>comboBox12</value>
   </data>
@@ -1227,6 +1320,9 @@
   <data name="label12.Text" xml:space="preserve">
     <value>Serial Number 12</value>
   </data>
+  <data name="label12.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label12.Name" xml:space="preserve">
     <value>label12</value>
   </data>
@@ -1254,6 +1350,9 @@
   <data name="checkBox13.TabIndex" type="System.Int32, mscorlib">
     <value>47</value>
   </data>
+  <data name="checkBox13.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox13.Name" xml:space="preserve">
     <value>checkBox13</value>
   </data>
@@ -1278,6 +1377,9 @@
   <data name="comboBox13.TabIndex" type="System.Int32, mscorlib">
     <value>46</value>
   </data>
+  <data name="comboBox13.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox13.Name" xml:space="preserve">
     <value>comboBox13</value>
   </data>
@@ -1311,6 +1413,9 @@
   <data name="label13.Text" xml:space="preserve">
     <value>Serial Number 13</value>
   </data>
+  <data name="label13.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label13.Name" xml:space="preserve">
     <value>label13</value>
   </data>
@@ -1338,6 +1443,9 @@
   <data name="checkBox14.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
   </data>
+  <data name="checkBox14.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox14.Name" xml:space="preserve">
     <value>checkBox14</value>
   </data>
@@ -1362,6 +1470,9 @@
   <data name="comboBox14.TabIndex" type="System.Int32, mscorlib">
     <value>49</value>
   </data>
+  <data name="comboBox14.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox14.Name" xml:space="preserve">
     <value>comboBox14</value>
   </data>
@@ -1395,6 +1506,9 @@
   <data name="label14.Text" xml:space="preserve">
     <value>Serial Number 14</value>
   </data>
+  <data name="label14.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label14.Name" xml:space="preserve">
     <value>label14</value>
   </data>
@@ -1422,6 +1536,9 @@
   <data name="checkBox15.TabIndex" type="System.Int32, mscorlib">
     <value>53</value>
   </data>
+  <data name="checkBox15.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox15.Name" xml:space="preserve">
     <value>checkBox15</value>
   </data>
@@ -1446,6 +1563,9 @@
   <data name="comboBox15.TabIndex" type="System.Int32, mscorlib">
     <value>52</value>
   </data>
+  <data name="comboBox15.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox15.Name" xml:space="preserve">
     <value>comboBox15</value>
   </data>
@@ -1479,6 +1599,9 @@
   <data name="label15.Text" xml:space="preserve">
     <value>Serial Number 15</value>
   </data>
+  <data name="label15.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label15.Name" xml:space="preserve">
     <value>label15</value>
   </data>
@@ -1506,6 +1629,9 @@
   <data name="checkBox16.TabIndex" type="System.Int32, mscorlib">
     <value>56</value>
   </data>
+  <data name="checkBox16.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox16.Name" xml:space="preserve">
     <value>checkBox16</value>
   </data>
@@ -1530,6 +1656,9 @@
   <data name="comboBox16.TabIndex" type="System.Int32, mscorlib">
     <value>55</value>
   </data>
+  <data name="comboBox16.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox16.Name" xml:space="preserve">
     <value>comboBox16</value>
   </data>
@@ -1563,6 +1692,9 @@
   <data name="label16.Text" xml:space="preserve">
     <value>Serial Number 16</value>
   </data>
+  <data name="label16.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label16.Name" xml:space="preserve">
     <value>label16</value>
   </data>
@@ -1590,6 +1722,9 @@
   <data name="checkBox17.TabIndex" type="System.Int32, mscorlib">
     <value>59</value>
   </data>
+  <data name="checkBox17.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox17.Name" xml:space="preserve">
     <value>checkBox17</value>
   </data>
@@ -1614,6 +1749,9 @@
   <data name="comboBox17.TabIndex" type="System.Int32, mscorlib">
     <value>58</value>
   </data>
+  <data name="comboBox17.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox17.Name" xml:space="preserve">
     <value>comboBox17</value>
   </data>
@@ -1647,6 +1785,9 @@
   <data name="label17.Text" xml:space="preserve">
     <value>Serial Number 17</value>
   </data>
+  <data name="label17.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label17.Name" xml:space="preserve">
     <value>label17</value>
   </data>
@@ -1674,6 +1815,9 @@
   <data name="checkBox18.TabIndex" type="System.Int32, mscorlib">
     <value>62</value>
   </data>
+  <data name="checkBox18.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox18.Name" xml:space="preserve">
     <value>checkBox18</value>
   </data>
@@ -1698,6 +1842,9 @@
   <data name="comboBox18.TabIndex" type="System.Int32, mscorlib">
     <value>61</value>
   </data>
+  <data name="comboBox18.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox18.Name" xml:space="preserve">
     <value>comboBox18</value>
   </data>
@@ -1731,6 +1878,9 @@
   <data name="label18.Text" xml:space="preserve">
     <value>Serial Number 18</value>
   </data>
+  <data name="label18.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label18.Name" xml:space="preserve">
     <value>label18</value>
   </data>
@@ -1758,6 +1908,9 @@
   <data name="checkBox19.TabIndex" type="System.Int32, mscorlib">
     <value>65</value>
   </data>
+  <data name="checkBox19.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox19.Name" xml:space="preserve">
     <value>checkBox19</value>
   </data>
@@ -1782,6 +1935,9 @@
   <data name="comboBox19.TabIndex" type="System.Int32, mscorlib">
     <value>64</value>
   </data>
+  <data name="comboBox19.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox19.Name" xml:space="preserve">
     <value>comboBox19</value>
   </data>
@@ -1815,6 +1971,9 @@
   <data name="label19.Text" xml:space="preserve">
     <value>Serial Number 19</value>
   </data>
+  <data name="label19.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label19.Name" xml:space="preserve">
     <value>label19</value>
   </data>
@@ -1842,6 +2001,9 @@
   <data name="checkBox20.TabIndex" type="System.Int32, mscorlib">
     <value>68</value>
   </data>
+  <data name="checkBox20.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox20.Name" xml:space="preserve">
     <value>checkBox20</value>
   </data>
@@ -1866,6 +2028,9 @@
   <data name="comboBox20.TabIndex" type="System.Int32, mscorlib">
     <value>67</value>
   </data>
+  <data name="comboBox20.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox20.Name" xml:space="preserve">
     <value>comboBox20</value>
   </data>
@@ -1899,6 +2064,9 @@
   <data name="label20.Text" xml:space="preserve">
     <value>Serial Number 20</value>
   </data>
+  <data name="label20.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label20.Name" xml:space="preserve">
     <value>label20</value>
   </data>
@@ -1926,6 +2094,9 @@
   <data name="checkBox21.TabIndex" type="System.Int32, mscorlib">
     <value>71</value>
   </data>
+  <data name="checkBox21.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox21.Name" xml:space="preserve">
     <value>checkBox21</value>
   </data>
@@ -1950,6 +2121,9 @@
   <data name="comboBox21.TabIndex" type="System.Int32, mscorlib">
     <value>70</value>
   </data>
+  <data name="comboBox21.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox21.Name" xml:space="preserve">
     <value>comboBox21</value>
   </data>
@@ -1983,6 +2157,9 @@
   <data name="label21.Text" xml:space="preserve">
     <value>Serial Number 21</value>
   </data>
+  <data name="label21.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label21.Name" xml:space="preserve">
     <value>label21</value>
   </data>
@@ -2010,6 +2187,9 @@
   <data name="checkBox22.TabIndex" type="System.Int32, mscorlib">
     <value>74</value>
   </data>
+  <data name="checkBox22.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox22.Name" xml:space="preserve">
     <value>checkBox22</value>
   </data>
@@ -2034,6 +2214,9 @@
   <data name="comboBox22.TabIndex" type="System.Int32, mscorlib">
     <value>73</value>
   </data>
+  <data name="comboBox22.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox22.Name" xml:space="preserve">
     <value>comboBox22</value>
   </data>
@@ -2067,6 +2250,9 @@
   <data name="label22.Text" xml:space="preserve">
     <value>Serial Number 22</value>
   </data>
+  <data name="label22.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label22.Name" xml:space="preserve">
     <value>label22</value>
   </data>
@@ -2094,6 +2280,9 @@
   <data name="checkBox23.TabIndex" type="System.Int32, mscorlib">
     <value>77</value>
   </data>
+  <data name="checkBox23.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox23.Name" xml:space="preserve">
     <value>checkBox23</value>
   </data>
@@ -2118,6 +2307,9 @@
   <data name="comboBox23.TabIndex" type="System.Int32, mscorlib">
     <value>76</value>
   </data>
+  <data name="comboBox23.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox23.Name" xml:space="preserve">
     <value>comboBox23</value>
   </data>
@@ -2151,6 +2343,9 @@
   <data name="label23.Text" xml:space="preserve">
     <value>Serial Number 23</value>
   </data>
+  <data name="label23.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label23.Name" xml:space="preserve">
     <value>label23</value>
   </data>
@@ -2178,6 +2373,9 @@
   <data name="checkBox24.TabIndex" type="System.Int32, mscorlib">
     <value>80</value>
   </data>
+  <data name="checkBox24.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;checkBox24.Name" xml:space="preserve">
     <value>checkBox24</value>
   </data>
@@ -2202,6 +2400,9 @@
   <data name="comboBox24.TabIndex" type="System.Int32, mscorlib">
     <value>79</value>
   </data>
+  <data name="comboBox24.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;comboBox24.Name" xml:space="preserve">
     <value>comboBox24</value>
   </data>
@@ -2235,6 +2436,9 @@
   <data name="label24.Text" xml:space="preserve">
     <value>Serial Number 24</value>
   </data>
+  <data name="label24.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="&gt;&gt;label24.Name" xml:space="preserve">
     <value>label24</value>
   </data>
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
index 705cb3d2a..e7c906ccd 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.cs
@@ -36,8 +36,9 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		float warningLimLo;		/// limit to display exclamation mark, typically 2x errLimLo
 		float warningLimHi;		/// limit to display exclamation mark, typically 2x errLimHi
 
-		const int TextBoxesCount = 24;
-		/// 
+		int TextBoxesCount;
+		///
+		Label[] labels;
 		TextBox[] startTextBoxes;
 		TextBox[] endTextBoxes;
 		IList<TextBox> enabledTextBoxes;
@@ -49,6 +50,13 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		{
 			InitializeComponent();
 
+			TextBoxesCount = 24;
+			labels = new Label[]
+				{
+					label1,  label2,  label3,  label4,  label5,  label6,  label7,  label8,  label9,  label10,
+					label11, label12, label13, label14, label15, label16, label17, label18, label19, label20,
+					label21, label22, label23, label24,
+				};
 			startTextBoxes = new TextBox[]
 				{
 					startTextBox1, startTextBox2, startTextBox3, startTextBox4, startTextBox5, startTextBox6,
@@ -80,6 +88,8 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.WaterMetersCount = waterMetersCount;
 			this.disabled = disabled;
 
+			ShuffleTextBoxes();
+
 			WMStartState = new float[waterMetersCount];
 			WMStartStateStr = new string[waterMetersCount];
 		}
@@ -103,39 +113,50 @@ namespace TBF.BenchControl.DataEntry.Standard24
             this.warningLimLo = 2 * errLimLo;
             this.warningLimHi = 2 * errLimHi;
 
+			ShuffleTextBoxes();
+
             WMEndState = new float[waterMetersCount];
 		}
 
+		/// <summary>
+		/// Make sure the layout of labels/text boxes on the screen
+		/// corresponds to the layout of watermeters of the test bench.
+		/// </summary>
+		void ShuffleTextBoxes()
+		{
+			if (Program.WMsCount < TextBoxesCount)
+			{
+				int nrLines = Program.WMsCount / Program.LineSize;
+				int gap = (TextBoxesCount - Program.WMsCount) / nrLines;
+
+				int dest = 0;
+				for (int l = 0; l < nrLines; l++)
+				{
+					for (int i = 0; i < Program.LineSize; i++)
+					{
+						labels[dest] = labels[l * Program.LineSize + l * gap + i];
+						startTextBoxes[dest] = startTextBoxes[l * Program.LineSize + l * gap + i];
+						endTextBoxes[dest] = endTextBoxes[l * Program.LineSize + l * gap + i];
+						dest++;
+					}
+				}
+				TextBoxesCount = Program.WMsCount;
+			}
+		}
+
 		private void CycleEndForm_Load(object sender, EventArgs e)
 		{
             Localize();
 
             //Height = 115 + 90 * WaterMetersCount;
 
-			if (WaterMetersCount < 1) { label1.Visible = startTextBox1.Visible = endTextBox1.Visible = false; }
-			if (WaterMetersCount < 2) { label2.Visible = startTextBox2.Visible = endTextBox2.Visible = false; }
-			if (WaterMetersCount < 3) { label3.Visible = startTextBox3.Visible = endTextBox3.Visible = false; }
-			if (WaterMetersCount < 4) { label4.Visible = startTextBox4.Visible = endTextBox4.Visible = false; }
-			if (WaterMetersCount < 5) { label5.Visible = startTextBox5.Visible = endTextBox5.Visible = false; }
-			if (WaterMetersCount < 6) { label6.Visible = startTextBox6.Visible = endTextBox6.Visible = false; }
-			if (WaterMetersCount < 7) { label7.Visible = startTextBox7.Visible = endTextBox7.Visible = false; }
-			if (WaterMetersCount < 8) { label8.Visible = startTextBox8.Visible = endTextBox8.Visible = false; }
-			if (WaterMetersCount < 9) { label9.Visible = startTextBox9.Visible = endTextBox9.Visible = false; }
-			if (WaterMetersCount < 10) { label10.Visible = startTextBox10.Visible = endTextBox10.Visible = false; }
-			if (WaterMetersCount < 11) { label11.Visible = startTextBox11.Visible = endTextBox11.Visible = false; }
-			if (WaterMetersCount < 12) { label12.Visible = startTextBox12.Visible = endTextBox12.Visible = false; }
-			if (WaterMetersCount < 13) { label13.Visible = startTextBox13.Visible = endTextBox13.Visible = false; }
-			if (WaterMetersCount < 14) { label14.Visible = startTextBox14.Visible = endTextBox14.Visible = false; }
-			if (WaterMetersCount < 15) { label15.Visible = startTextBox15.Visible = endTextBox15.Visible = false; }
-			if (WaterMetersCount < 16) { label16.Visible = startTextBox16.Visible = endTextBox16.Visible = false; }
-			if (WaterMetersCount < 17) { label17.Visible = startTextBox17.Visible = endTextBox17.Visible = false; }
-			if (WaterMetersCount < 18) { label18.Visible = startTextBox18.Visible = endTextBox18.Visible = false; }
-			if (WaterMetersCount < 19) { label19.Visible = startTextBox19.Visible = endTextBox19.Visible = false; }
-			if (WaterMetersCount < 20) { label20.Visible = startTextBox20.Visible = endTextBox20.Visible = false; }
-			if (WaterMetersCount < 21) { label21.Visible = startTextBox21.Visible = endTextBox21.Visible = false; }
-			if (WaterMetersCount < 22) { label22.Visible = startTextBox22.Visible = endTextBox22.Visible = false; }
-			if (WaterMetersCount < 23) { label23.Visible = startTextBox23.Visible = endTextBox23.Visible = false; }
-			if (WaterMetersCount < 24) { label24.Visible = startTextBox24.Visible = endTextBox24.Visible = false; }
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				if (i < WaterMetersCount)
+				{
+					labels[i].Visible = startTextBoxes[i].Visible = endTextBoxes[i].Visible = true;
+				}
+			}
 
 			if (endStates)
 			{
@@ -177,30 +198,10 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		void Localize()
 		{
 			Text = Strings.Water_Meter_States;
-			label1.Text = Strings.Water_Meter + " 1";
-			label2.Text = Strings.Water_Meter + " 2";
-			label3.Text = Strings.Water_Meter + " 3";
-			label4.Text = Strings.Water_Meter + " 4";
-			label5.Text = Strings.Water_Meter + " 5";
-			label6.Text = Strings.Water_Meter + " 6";
-			label7.Text = Strings.Water_Meter + " 7";
-			label8.Text = Strings.Water_Meter + " 8";
-			label9.Text = Strings.Water_Meter + " 9";
-			label10.Text = Strings.Water_Meter + " 10";
-			label11.Text = Strings.Water_Meter + " 11";
-			label12.Text = Strings.Water_Meter + " 12";
-			label13.Text = Strings.Water_Meter + " 13";
-			label14.Text = Strings.Water_Meter + " 14";
-			label15.Text = Strings.Water_Meter + " 15";
-			label16.Text = Strings.Water_Meter + " 16";
-			label17.Text = Strings.Water_Meter + " 17";
-			label18.Text = Strings.Water_Meter + " 18";
-			label19.Text = Strings.Water_Meter + " 19";
-			label20.Text = Strings.Water_Meter + " 20";
-			label21.Text = Strings.Water_Meter + " 21";
-			label22.Text = Strings.Water_Meter + " 22";
-			label23.Text = Strings.Water_Meter + " 23";
-			label24.Text = Strings.Water_Meter + " 24";
+			for (int i = 0; i < TextBoxesCount; i++)
+			{
+				labels[i].Text = Strings.Water_Meter + " " + (i + 1).ToString();
+			}
 			startLabel.Text = Strings.Start;
 			endLabel.Text = Strings.End;
 			okButton.Text = Strings.OkBtnText;
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs
index 0689828d4..6d5490291 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/TestStartEndForm.designer.cs
@@ -154,6 +154,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox1.Name = "startTextBox1";
 			this.startTextBox1.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox1.TabIndex = 3;
+			this.startTextBox1.Visible = false;
 			this.startTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox1_KeyPress);
 			// 
 			// endTextBox1
@@ -164,6 +165,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox1.Name = "endTextBox1";
 			this.endTextBox1.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox1.TabIndex = 4;
+			this.endTextBox1.Visible = false;
 			this.endTextBox1.TextChanged += new System.EventHandler(this.endTextBox1_TextChanged);
 			this.endTextBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox1_KeyPress);
 			// 
@@ -176,6 +178,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label1.Size = new System.Drawing.Size(145, 23);
 			this.label1.TabIndex = 2;
 			this.label1.Text = "Water Meter 1";
+			this.label1.Visible = false;
 			// 
 			// okButton
 			// 
@@ -209,6 +212,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox3.Name = "startTextBox3";
 			this.startTextBox3.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox3.TabIndex = 11;
+			this.startTextBox3.Visible = false;
 			this.startTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox3_KeyPress);
 			// 
 			// endTextBox3
@@ -219,6 +223,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox3.Name = "endTextBox3";
 			this.endTextBox3.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox3.TabIndex = 12;
+			this.endTextBox3.Visible = false;
 			this.endTextBox3.TextChanged += new System.EventHandler(this.endTextBox3_TextChanged);
 			this.endTextBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox3_KeyPress);
 			// 
@@ -231,6 +236,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label3.Size = new System.Drawing.Size(145, 23);
 			this.label3.TabIndex = 10;
 			this.label3.Text = "Water Meter 3";
+			this.label3.Visible = false;
 			// 
 			// exclamation4
 			// 
@@ -252,6 +258,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox4.Name = "startTextBox4";
 			this.startTextBox4.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox4.TabIndex = 15;
+			this.startTextBox4.Visible = false;
 			this.startTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox4_KeyPress);
 			// 
 			// endTextBox4
@@ -262,6 +269,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox4.Name = "endTextBox4";
 			this.endTextBox4.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox4.TabIndex = 16;
+			this.endTextBox4.Visible = false;
 			this.endTextBox4.TextChanged += new System.EventHandler(this.endTextBox4_TextChanged);
 			this.endTextBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox4_KeyPress);
 			// 
@@ -274,6 +282,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label4.Size = new System.Drawing.Size(145, 23);
 			this.label4.TabIndex = 14;
 			this.label4.Text = "Water Meter 4";
+			this.label4.Visible = false;
 			// 
 			// exclamation5
 			// 
@@ -295,6 +304,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox5.Name = "startTextBox5";
 			this.startTextBox5.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox5.TabIndex = 19;
+			this.startTextBox5.Visible = false;
 			this.startTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox5_KeyPress);
 			// 
 			// endTextBox5
@@ -305,6 +315,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox5.Name = "endTextBox5";
 			this.endTextBox5.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox5.TabIndex = 20;
+			this.endTextBox5.Visible = false;
 			this.endTextBox5.TextChanged += new System.EventHandler(this.endTextBox5_TextChanged);
 			this.endTextBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox5_KeyPress);
 			// 
@@ -317,6 +328,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label5.Size = new System.Drawing.Size(145, 23);
 			this.label5.TabIndex = 18;
 			this.label5.Text = "Water Meter 5";
+			this.label5.Visible = false;
 			// 
 			// exclamation6
 			// 
@@ -338,6 +350,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox6.Name = "startTextBox6";
 			this.startTextBox6.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox6.TabIndex = 23;
+			this.startTextBox6.Visible = false;
 			this.startTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox6_KeyPress);
 			// 
 			// endTextBox6
@@ -348,6 +361,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox6.Name = "endTextBox6";
 			this.endTextBox6.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox6.TabIndex = 24;
+			this.endTextBox6.Visible = false;
 			this.endTextBox6.TextChanged += new System.EventHandler(this.endTextBox6_TextChanged);
 			this.endTextBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox6_KeyPress);
 			// 
@@ -360,6 +374,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label6.Size = new System.Drawing.Size(145, 23);
 			this.label6.TabIndex = 22;
 			this.label6.Text = "Water Meter 6";
+			this.label6.Visible = false;
 			// 
 			// startLabel
 			// 
@@ -390,6 +405,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label2.Size = new System.Drawing.Size(145, 23);
 			this.label2.TabIndex = 6;
 			this.label2.Text = "Water Meter 2";
+			this.label2.Visible = false;
 			// 
 			// endTextBox2
 			// 
@@ -399,6 +415,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox2.Name = "endTextBox2";
 			this.endTextBox2.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox2.TabIndex = 8;
+			this.endTextBox2.Visible = false;
 			this.endTextBox2.TextChanged += new System.EventHandler(this.endTextBox2_TextChanged);
 			this.endTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox2_KeyPress);
 			// 
@@ -410,6 +427,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox2.Name = "startTextBox2";
 			this.startTextBox2.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox2.TabIndex = 7;
+			this.startTextBox2.Visible = false;
 			this.startTextBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox2_KeyPress);
 			// 
 			// exclamation2
@@ -444,6 +462,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox7.Name = "startTextBox7";
 			this.startTextBox7.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox7.TabIndex = 27;
+			this.startTextBox7.Visible = false;
 			this.startTextBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox7_KeyPress);
 			// 
 			// endTextBox7
@@ -454,6 +473,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox7.Name = "endTextBox7";
 			this.endTextBox7.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox7.TabIndex = 28;
+			this.endTextBox7.Visible = false;
 			this.endTextBox7.TextChanged += new System.EventHandler(this.endTextBox7_TextChanged);
 			this.endTextBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox7_KeyPress);
 			// 
@@ -466,6 +486,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label7.Size = new System.Drawing.Size(145, 23);
 			this.label7.TabIndex = 26;
 			this.label7.Text = "Water Meter 7";
+			this.label7.Visible = false;
 			// 
 			// exclamation8
 			// 
@@ -487,6 +508,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox8.Name = "startTextBox8";
 			this.startTextBox8.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox8.TabIndex = 31;
+			this.startTextBox8.Visible = false;
 			this.startTextBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox8_KeyPress);
 			// 
 			// endTextBox8
@@ -497,6 +519,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox8.Name = "endTextBox8";
 			this.endTextBox8.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox8.TabIndex = 32;
+			this.endTextBox8.Visible = false;
 			this.endTextBox8.TextChanged += new System.EventHandler(this.endTextBox8_TextChanged);
 			this.endTextBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox8_KeyPress);
 			// 
@@ -509,6 +532,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label8.Size = new System.Drawing.Size(145, 23);
 			this.label8.TabIndex = 30;
 			this.label8.Text = "Water Meter 8";
+			this.label8.Visible = false;
 			// 
 			// exclamation9
 			// 
@@ -530,6 +554,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox9.Name = "startTextBox9";
 			this.startTextBox9.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox9.TabIndex = 35;
+			this.startTextBox9.Visible = false;
 			this.startTextBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox9_KeyPress);
 			// 
 			// endTextBox9
@@ -540,6 +565,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox9.Name = "endTextBox9";
 			this.endTextBox9.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox9.TabIndex = 36;
+			this.endTextBox9.Visible = false;
 			this.endTextBox9.TextChanged += new System.EventHandler(this.endTextBox9_TextChanged);
 			this.endTextBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox9_KeyPress);
 			// 
@@ -552,6 +578,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label9.Size = new System.Drawing.Size(145, 23);
 			this.label9.TabIndex = 34;
 			this.label9.Text = "Water Meter 9";
+			this.label9.Visible = false;
 			// 
 			// exclamation10
 			// 
@@ -573,6 +600,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox10.Name = "startTextBox10";
 			this.startTextBox10.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox10.TabIndex = 39;
+			this.startTextBox10.Visible = false;
 			this.startTextBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox10_KeyPress);
 			// 
 			// endTextBox10
@@ -583,6 +611,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox10.Name = "endTextBox10";
 			this.endTextBox10.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox10.TabIndex = 40;
+			this.endTextBox10.Visible = false;
 			this.endTextBox10.TextChanged += new System.EventHandler(this.endTextBox10_TextChanged);
 			this.endTextBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox10_KeyPress);
 			// 
@@ -595,6 +624,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label10.Size = new System.Drawing.Size(157, 23);
 			this.label10.TabIndex = 38;
 			this.label10.Text = "Water Meter 10";
+			this.label10.Visible = false;
 			// 
 			// exclamation11
 			// 
@@ -616,6 +646,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox11.Name = "startTextBox11";
 			this.startTextBox11.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox11.TabIndex = 43;
+			this.startTextBox11.Visible = false;
 			this.startTextBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox11_KeyPress);
 			// 
 			// endTextBox11
@@ -626,6 +657,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox11.Name = "endTextBox11";
 			this.endTextBox11.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox11.TabIndex = 44;
+			this.endTextBox11.Visible = false;
 			this.endTextBox11.TextChanged += new System.EventHandler(this.endTextBox11_TextChanged);
 			this.endTextBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox11_KeyPress);
 			// 
@@ -638,6 +670,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label11.Size = new System.Drawing.Size(157, 23);
 			this.label11.TabIndex = 42;
 			this.label11.Text = "Water Meter 11";
+			this.label11.Visible = false;
 			// 
 			// exclamation12
 			// 
@@ -659,6 +692,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox12.Name = "startTextBox12";
 			this.startTextBox12.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox12.TabIndex = 47;
+			this.startTextBox12.Visible = false;
 			this.startTextBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox12_KeyPress);
 			// 
 			// endTextBox12
@@ -669,6 +703,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox12.Name = "endTextBox12";
 			this.endTextBox12.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox12.TabIndex = 48;
+			this.endTextBox12.Visible = false;
 			this.endTextBox12.TextChanged += new System.EventHandler(this.endTextBox12_TextChanged);
 			this.endTextBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox12_KeyPress);
 			// 
@@ -681,6 +716,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label12.Size = new System.Drawing.Size(157, 23);
 			this.label12.TabIndex = 46;
 			this.label12.Text = "Water Meter 12";
+			this.label12.Visible = false;
 			// 
 			// exclamation24
 			// 
@@ -702,6 +738,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox24.Name = "startTextBox24";
 			this.startTextBox24.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox24.TabIndex = 97;
+			this.startTextBox24.Visible = false;
 			this.startTextBox24.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox24_KeyPress);
 			// 
 			// endTextBox24
@@ -712,6 +749,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox24.Name = "endTextBox24";
 			this.endTextBox24.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox24.TabIndex = 98;
+			this.endTextBox24.Visible = false;
 			this.endTextBox24.TextChanged += new System.EventHandler(this.endTextBox24_TextChanged);
 			this.endTextBox24.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox24_KeyPress);
 			// 
@@ -724,6 +762,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label24.Size = new System.Drawing.Size(157, 23);
 			this.label24.TabIndex = 96;
 			this.label24.Text = "Water Meter 24";
+			this.label24.Visible = false;
 			// 
 			// exclamation23
 			// 
@@ -745,6 +784,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox23.Name = "startTextBox23";
 			this.startTextBox23.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox23.TabIndex = 93;
+			this.startTextBox23.Visible = false;
 			this.startTextBox23.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox23_KeyPress);
 			// 
 			// endTextBox23
@@ -755,6 +795,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox23.Name = "endTextBox23";
 			this.endTextBox23.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox23.TabIndex = 94;
+			this.endTextBox23.Visible = false;
 			this.endTextBox23.TextChanged += new System.EventHandler(this.endTextBox23_TextChanged);
 			this.endTextBox23.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox23_KeyPress);
 			// 
@@ -767,6 +808,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label23.Size = new System.Drawing.Size(157, 23);
 			this.label23.TabIndex = 92;
 			this.label23.Text = "Water Meter 23";
+			this.label23.Visible = false;
 			// 
 			// exclamation22
 			// 
@@ -788,6 +830,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox22.Name = "startTextBox22";
 			this.startTextBox22.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox22.TabIndex = 89;
+			this.startTextBox22.Visible = false;
 			this.startTextBox22.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox22_KeyPress);
 			// 
 			// endTextBox22
@@ -798,6 +841,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox22.Name = "endTextBox22";
 			this.endTextBox22.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox22.TabIndex = 90;
+			this.endTextBox22.Visible = false;
 			this.endTextBox22.TextChanged += new System.EventHandler(this.endTextBox22_TextChanged);
 			this.endTextBox22.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox22_KeyPress);
 			// 
@@ -810,6 +854,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label22.Size = new System.Drawing.Size(157, 23);
 			this.label22.TabIndex = 88;
 			this.label22.Text = "Water Meter 22";
+			this.label22.Visible = false;
 			// 
 			// exclamation21
 			// 
@@ -831,6 +876,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox21.Name = "startTextBox21";
 			this.startTextBox21.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox21.TabIndex = 85;
+			this.startTextBox21.Visible = false;
 			this.startTextBox21.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox21_KeyPress);
 			// 
 			// endTextBox21
@@ -841,6 +887,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox21.Name = "endTextBox21";
 			this.endTextBox21.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox21.TabIndex = 86;
+			this.endTextBox21.Visible = false;
 			this.endTextBox21.TextChanged += new System.EventHandler(this.endTextBox21_TextChanged);
 			this.endTextBox21.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox21_KeyPress);
 			// 
@@ -853,6 +900,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label21.Size = new System.Drawing.Size(157, 23);
 			this.label21.TabIndex = 84;
 			this.label21.Text = "Water Meter 21";
+			this.label21.Visible = false;
 			// 
 			// exclamation20
 			// 
@@ -874,6 +922,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox20.Name = "startTextBox20";
 			this.startTextBox20.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox20.TabIndex = 81;
+			this.startTextBox20.Visible = false;
 			this.startTextBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox20_KeyPress);
 			// 
 			// endTextBox20
@@ -884,6 +933,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox20.Name = "endTextBox20";
 			this.endTextBox20.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox20.TabIndex = 82;
+			this.endTextBox20.Visible = false;
 			this.endTextBox20.TextChanged += new System.EventHandler(this.endTextBox20_TextChanged);
 			this.endTextBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox20_KeyPress);
 			// 
@@ -896,6 +946,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label20.Size = new System.Drawing.Size(157, 23);
 			this.label20.TabIndex = 80;
 			this.label20.Text = "Water Meter 20";
+			this.label20.Visible = false;
 			// 
 			// exclamation19
 			// 
@@ -917,6 +968,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox19.Name = "startTextBox19";
 			this.startTextBox19.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox19.TabIndex = 77;
+			this.startTextBox19.Visible = false;
 			this.startTextBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox19_KeyPress);
 			// 
 			// endTextBox19
@@ -927,6 +979,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox19.Name = "endTextBox19";
 			this.endTextBox19.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox19.TabIndex = 78;
+			this.endTextBox19.Visible = false;
 			this.endTextBox19.TextChanged += new System.EventHandler(this.endTextBox19_TextChanged);
 			this.endTextBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox19_KeyPress);
 			// 
@@ -939,6 +992,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label19.Size = new System.Drawing.Size(157, 23);
 			this.label19.TabIndex = 76;
 			this.label19.Text = "Water Meter 19";
+			this.label19.Visible = false;
 			// 
 			// exclamation18
 			// 
@@ -972,6 +1026,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox18.Name = "startTextBox18";
 			this.startTextBox18.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox18.TabIndex = 73;
+			this.startTextBox18.Visible = false;
 			this.startTextBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox18_KeyPress);
 			// 
 			// exclamation16
@@ -994,6 +1049,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox18.Name = "endTextBox18";
 			this.endTextBox18.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox18.TabIndex = 74;
+			this.endTextBox18.Visible = false;
 			this.endTextBox18.TextChanged += new System.EventHandler(this.endTextBox18_TextChanged);
 			this.endTextBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox18_KeyPress);
 			// 
@@ -1006,6 +1062,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label18.Size = new System.Drawing.Size(157, 23);
 			this.label18.TabIndex = 72;
 			this.label18.Text = "Water Meter 18";
+			this.label18.Visible = false;
 			// 
 			// startTextBox17
 			// 
@@ -1015,6 +1072,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox17.Name = "startTextBox17";
 			this.startTextBox17.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox17.TabIndex = 69;
+			this.startTextBox17.Visible = false;
 			this.startTextBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox17_KeyPress);
 			// 
 			// exclamation15
@@ -1037,6 +1095,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox17.Name = "endTextBox17";
 			this.endTextBox17.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox17.TabIndex = 70;
+			this.endTextBox17.Visible = false;
 			this.endTextBox17.TextChanged += new System.EventHandler(this.endTextBox17_TextChanged);
 			this.endTextBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox17_KeyPress);
 			// 
@@ -1049,6 +1108,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label17.Size = new System.Drawing.Size(157, 23);
 			this.label17.TabIndex = 68;
 			this.label17.Text = "Water Meter 17";
+			this.label17.Visible = false;
 			// 
 			// startTextBox16
 			// 
@@ -1058,6 +1118,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox16.Name = "startTextBox16";
 			this.startTextBox16.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox16.TabIndex = 65;
+			this.startTextBox16.Visible = false;
 			this.startTextBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox16_KeyPress);
 			// 
 			// exclamation14
@@ -1080,6 +1141,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox16.Name = "endTextBox16";
 			this.endTextBox16.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox16.TabIndex = 66;
+			this.endTextBox16.Visible = false;
 			this.endTextBox16.TextChanged += new System.EventHandler(this.endTextBox16_TextChanged);
 			this.endTextBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox16_KeyPress);
 			// 
@@ -1092,6 +1154,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label16.Size = new System.Drawing.Size(157, 23);
 			this.label16.TabIndex = 64;
 			this.label16.Text = "Water Meter 16";
+			this.label16.Visible = false;
 			// 
 			// startTextBox15
 			// 
@@ -1101,6 +1164,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox15.Name = "startTextBox15";
 			this.startTextBox15.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox15.TabIndex = 61;
+			this.startTextBox15.Visible = false;
 			this.startTextBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox15_KeyPress);
 			// 
 			// exclamation13
@@ -1123,6 +1187,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox15.Name = "endTextBox15";
 			this.endTextBox15.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox15.TabIndex = 62;
+			this.endTextBox15.Visible = false;
 			this.endTextBox15.TextChanged += new System.EventHandler(this.endTextBox15_TextChanged);
 			this.endTextBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox15_KeyPress);
 			// 
@@ -1135,6 +1200,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label15.Size = new System.Drawing.Size(157, 23);
 			this.label15.TabIndex = 60;
 			this.label15.Text = "Water Meter 15";
+			this.label15.Visible = false;
 			// 
 			// startTextBox14
 			// 
@@ -1144,6 +1210,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox14.Name = "startTextBox14";
 			this.startTextBox14.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox14.TabIndex = 57;
+			this.startTextBox14.Visible = false;
 			this.startTextBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox14_KeyPress);
 			// 
 			// label35
@@ -1164,6 +1231,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox14.Name = "endTextBox14";
 			this.endTextBox14.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox14.TabIndex = 58;
+			this.endTextBox14.Visible = false;
 			this.endTextBox14.TextChanged += new System.EventHandler(this.endTextBox14_TextChanged);
 			this.endTextBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox14_KeyPress);
 			// 
@@ -1176,6 +1244,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label14.Size = new System.Drawing.Size(157, 23);
 			this.label14.TabIndex = 56;
 			this.label14.Text = "Water Meter 14";
+			this.label14.Visible = false;
 			// 
 			// startTextBox13
 			// 
@@ -1185,6 +1254,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.startTextBox13.Name = "startTextBox13";
 			this.startTextBox13.Size = new System.Drawing.Size(163, 31);
 			this.startTextBox13.TabIndex = 53;
+			this.startTextBox13.Visible = false;
 			this.startTextBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.startTextBox13_KeyPress);
 			// 
 			// label37
@@ -1205,6 +1275,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.endTextBox13.Name = "endTextBox13";
 			this.endTextBox13.Size = new System.Drawing.Size(163, 31);
 			this.endTextBox13.TabIndex = 54;
+			this.endTextBox13.Visible = false;
 			this.endTextBox13.TextChanged += new System.EventHandler(this.endTextBox13_TextChanged);
 			this.endTextBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.endTextBox13_KeyPress);
 			// 
@@ -1217,6 +1288,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 			this.label13.Size = new System.Drawing.Size(157, 23);
 			this.label13.TabIndex = 52;
 			this.label13.Text = "Water Meter 13";
+			this.label13.Visible = false;
 			// 
 			// TestStartEndForm
 			// 
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index c475ba8c4..6b2bbf886 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.5.51.1")]
-[assembly: AssemblyFileVersion("1.5.51.1")]
+[assembly: AssemblyVersion("1.5.52.1")]
+[assembly: AssemblyFileVersion("1.5.52.1")]