diff --git a/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json b/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
index 9c0387d..611eff3 100644
--- a/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
+++ b/LSL2/OIWIN/NDW_MAKEUP_WAFERS.json
@@ -18,7 +18,7 @@
                 "<1,5>": "95",
                 "<1,6>": "179",
                 "<1,7>": "-793",
-                "<1,8>": "-313",
+                "<1,8>": "-306",
                 "<1,9>": "Makeup Wafers",
                 "<1,10>": {
                     "<1,10,1>": "0x84C80000",
@@ -197,7 +197,7 @@
                 "<1,3>": "OLECONTROL.SRP.ReportTable.1",
                 "<1,4>": "NDW_MAKEUP_WAFERS",
                 "<1,5>": "10",
-                "<1,6>": "267",
+                "<1,6>": "247",
                 "<1,7>": "-107",
                 "<1,8>": "47",
                 "<1,9>": "SRP.ReportTable.1",
@@ -334,7 +334,7 @@
                 "<2,3>": "OLECONTROL.SRP.Picture.1",
                 "<2,4>": "NDW_MAKEUP_WAFERS",
                 "<2,5>": "10",
-                "<2,6>": "251",
+                "<2,6>": "231",
                 "<2,7>": "-107",
                 "<2,8>": "14",
                 "<2,9>": "SRP.Picture.1",
diff --git a/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt b/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
index fe3fa90..e56b5f2 100644
--- a/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
+++ b/LSL2/STPROC/NDW_MAKEUP_WAFERS_EVENTS.txt
@@ -414,6 +414,16 @@ Setup_OLE_Controls:
                 PicNoLabelCtrlSize<2>  = PicNoLabelCtrlSize<2> + (20 * (NumUnsignedWafers - 1))
             end
         end
+        If NumNoBatchWafers EQ 0 then
+            RptNoLabelCtrlSize<2>  = RptNoLabelCtrlSize<2> - 74
+            PicNoLabelCtrlSize<2>  = PicNoLabelCtrlSize<2> - 74
+        end else
+            If NumNoBatchWafers GT 1 then
+                // Unsigned wafers has been made taller. Move the no Label ReportTable down further.
+                RptNoLabelCtrlSize<2>  = RptNoLabelCtrlSize<2> + (20 * (NumNoBatchWafers - 1))
+                PicNoLabelCtrlSize<2>  = PicNoLabelCtrlSize<2> + (20 * (NumNoBatchWafers - 1))
+            end
+        end
         Set_Property(RptNoLabelCtrl, 'SIZE', RptNoLabelCtrlSize)
         Set_Property(PicNoLabelCtrl, 'SIZE', PicNoLabelCtrlSize)
     end
@@ -449,3 +459,4 @@ Setup_OLE_Controls:
 return
 
 
+