diff --git a/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs b/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs
index 3d30693..47163f6 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogAlarm.cs
@@ -100,8 +100,11 @@ namespace INT_PT002.Controls
         }
         private void UpdateListBoxCount()
         {
-            this.labelTotalIndex.Text = this.ListBoxCount.ToString();
-            this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
+            this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
+            if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
+                this.labelRemainIndex.Text = "0";
+            else
+                this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
         }
         private void UpdateListBoxDataDisplay(string data)
         {
diff --git a/INT_PT002/Controls/Log/ControlMenuLogHistory.cs b/INT_PT002/Controls/Log/ControlMenuLogHistory.cs
index 64d8896..76e5fa6 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogHistory.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogHistory.cs
@@ -104,8 +104,11 @@ namespace INT_PT002.Controls
         }
         private void UpdateListBoxCount()
         {
-            this.labelTotalIndex.Text = this.ListBoxCount.ToString();
-            this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
+            this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
+            if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
+                this.labelRemainIndex.Text = "0";
+            else
+                this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
         }
         private void UpdateListBoxDataDisplay(string data)
         {
diff --git a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
index 81b9b84..c1f0302 100644
--- a/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
+++ b/INT_PT002/Controls/Log/ControlMenuLogInspection.cs
@@ -157,8 +157,11 @@ namespace INT_PT002.Controls
         }
         private void UpdateListBoxCount()
         {
-            this.labelTotalIndex.Text = this.ListBoxCount.ToString();            
-            this.labelRemainIndex.Text = (this.ListBoxCount - this.listBoxTime.ViewRemainCount).ToString();
+            this.labelTotalIndex.Text = (this.ListBoxCount - 1).ToString();
+            if (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount < 0)
+                this.labelRemainIndex.Text = "0";
+            else
+                this.labelRemainIndex.Text = (this.ListBoxCount - 1 - this.listBoxTime.ViewRemainCount).ToString();
         }
         private void UpdateListBoxDataDisplay(string data)
         {
@@ -312,8 +315,8 @@ namespace INT_PT002.Controls
             this.ListBoxCount = 0;
             for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
             {
-                this.ListPassCount[i] = 0;
-                this.ListLeakCount[i] = 0;
+                this.CollectionPassCount[i].Text = "0";
+                this.CollectionLeakCount[i].Text = "0";
             }
 
             if (int.Parse(this.labelCount.Text) == 0)
diff --git a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs
index f88d06d..94a33b7 100644
--- a/INT_PT002/Controls/System/ControlMenuSystemStatus.cs
+++ b/INT_PT002/Controls/System/ControlMenuSystemStatus.cs
@@ -325,8 +325,6 @@ namespace INT_PT002.Controls
                     this.timerOn.Stop();
                     this.timerOff.Stop();
 
-                    this.ParentForm.Set_Equipment_ButtonEnable(true);
-
                     //if (this.CollectionLabelResult[0].Text == "Measuring..")
                     //{
                     //    for (int i = 0; i < this.ParentForm.ParentForm.CurrentSystemStatus.EquipmentColumn; i++)
@@ -340,8 +338,6 @@ namespace INT_PT002.Controls
                     break;
                 case Define.E_ProcessStatus._2_ProductEntry:
                     this.SelectProcessLabelRefresh(1);
-
-                    this.ParentForm.Set_Equipment_ButtonEnable(false);
                     break;
                 case Define.E_ProcessStatus._3_ChamberConbined:
                     this.SelectProcessLabelRefresh(2);
diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs
index 389f97a..e44c003 100644
--- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs
+++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs
@@ -1680,7 +1680,7 @@
             this.labelProgress4_1.RoundRectFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(101)))), ((int)(((byte)(103)))));
             this.labelProgress4_1.Size = new System.Drawing.Size(150, 24);
             this.labelProgress4_1.TabIndex = 198;
-            this.labelProgress4_1.Text = "Measuerment";
+            this.labelProgress4_1.Text = "Measurement";
             this.labelProgress4_1.TextColor = System.Drawing.Color.Black;
             this.labelProgress4_1.TextColorDisable = System.Drawing.Color.Gray;
             this.labelProgress4_1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs
index 3be7b7d..8ef9bbd 100644
--- a/INT_PT002/Forms/FormMainDisplay2.cs
+++ b/INT_PT002/Forms/FormMainDisplay2.cs
@@ -239,7 +239,7 @@ namespace INT_PT002.Forms
                     this.labelProgress1_1.Text = "Entry";
                     this.labelProgress2_1.Text = "Linkage";
                     this.labelProgress3_1.Text = "V. Start";
-                    this.labelProgress4_1.Text = "Measuerment";
+                    this.labelProgress4_1.Text = "Measurement";
                     this.labelProgress6_1.Text = "V. Break";
                     this.labelProgress7_1.Text = "Separation";
                     this.labelProgress8_1.Text = "Release";
diff --git a/INT_PT002/Forms/FormMenu.cs b/INT_PT002/Forms/FormMenu.cs
index ff81b77..4226ee8 100644
--- a/INT_PT002/Forms/FormMenu.cs
+++ b/INT_PT002/Forms/FormMenu.cs
@@ -602,6 +602,8 @@ namespace INT_PT002.Forms
                 this.labelStart.Visible = true;
                 this.labelStop.Visible = false;
                 #endregion
+
+                this.Set_Equipment_ButtonEnable(false);
             }
             else
             {
@@ -609,6 +611,8 @@ namespace INT_PT002.Forms
                 this.labelStart.Visible = false;
                 this.labelStop.Visible = true;
                 #endregion
+
+                this.Set_Equipment_ButtonEnable(true);
             }
         }
         public void Set_Equipment_ButtonEnable(bool data)