diff --git a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
index f8e6d58..d916233 100755
--- a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
+++ b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
@@ -104,22 +104,10 @@
             </ng-container>
 
             <div class="col-6">
-              <button 
-                class="btn btn-secondary w-100 number-button" 
-                [disabled]="!numericPadEnabled || maxRowsReached" 
-                (click)="onPadEnter()"
-              >
-                Enter
-              </button>
+              <button class="btn btn-secondary w-100 number-button" [disabled]="!numericPadEnabled" (click)="onPadEnter()">Enter</button>
             </div>
             <div class="col-6">
-              <button 
-                class="btn btn-secondary w-100 number-button" 
-                [disabled]="!canPrint || currentSelections.length === 0" 
-                (click)="print()"
-              >
-                Print
-              </button>
+              <button class="btn btn-secondary w-100 number-button" [disabled]="!canPrint" (click)="print()">Print</button>
             </div>
           </div>
         </div>
diff --git a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
index 46234b5..cea60ca 100755
--- a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
+++ b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
@@ -299,31 +299,9 @@ export class TouchPadMenuComponent implements OnInit, OnDestroy {
   }
 
   onPadEnter() {
-    // Only allows entry if less than 5 rows are filled
-    if (this.maxRowsReached) return;
-
-    const value = parseFloat(this.padValue) || 0;
-    if (!this.selectedLabel || !this.selectedNumbers.length || value === 0) return; // Basic validation
-
-    // Finalize current row selection
-    this.selectionService.finalizeCurrentRow();
-
-    // Clear current row selection, but do NOT clear the existing rows, 
-    // so user can keep filling rows up to 5
-    this.selectedLabel = null;
-    this.selectedNumbers = [];
-    this.padValue = '';
-    this.canPrint = false;
-    this.isBoxed = false;
-
-    // Reset all group stages
-    this.tanGroupStage = 0;
-    this.tanGroups = [[], [], []];
-    this.isFirstGroupComplete = false;
-    this.firstGroup = [];
-    this.secondGroup = [];
-    this.multiLegStage = 0;
-    this.multiLegGroups = [[], [], [], [], []];
+    if (this.canPrint) {
+      this.print();
+    }
   }
 
   onShashEnter() {
@@ -391,19 +369,13 @@ export class TouchPadMenuComponent implements OnInit, OnDestroy {
   }
 
   print() {
-    // Don't print if no rows
-    if (this.currentSelections.length === 0) return;
-
     const selectionsTotal = this.currentSelections.reduce((sum, sel) => sum + sel.total, 0);
     if (selectionsTotal + this.currentTotal > 5000) {
       this.showLimitPopup = true;
       return;
     }
-    // Submit all rows
     this.selectionService.finalizeCurrentRow();
-
-    // Clear everything after print
-    this.erase();
+    this.resetSelections();
   }
 
   erase() {