diff --git a/static/js/tpos.js b/static/js/tpos.js
index e64523a..254d71d 100644
--- a/static/js/tpos.js
+++ b/static/js/tpos.js
@@ -1459,7 +1459,6 @@ window.app = Vue.createApp({
         type: 'positive',
         message: 'Print request sent to wrapper.'
       })
-      this.closePrintDialog()
     },
     async printReceipt(paymentHash) {
       try {
diff --git a/templates/tpos/dialogs.html b/templates/tpos/dialogs.html
index 5f25803..8652079 100644
--- a/templates/tpos/dialogs.html
+++ b/templates/tpos/dialogs.html
@@ -77,30 +77,32 @@ <h5 class="q-mt-none q-mb-sm">
     </q-card>
   </q-dialog>
 
-  <q-dialog v-model="printDialog.show" @hide="closePrintDialog">
+  <q-dialog v-model="printDialog.show" persistent @hide="closePrintDialog">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-card-section class="row items-center q-pb-none">
         <div class="text-h6">Print Receipt</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
       </q-card-section>
-      <q-card-actions align="right">
-        <q-btn
-          round
-          icon="receipt_long"
-          color="secondary"
-          @click.stop="printOrderReceipt(printDialog.paymentHash)"
-        >
-          <q-tooltip>Print order receipt</q-tooltip>
-        </q-btn>
-        <q-btn
-          round
-          icon="print"
-          color="primary"
-          @click.stop="printReceipt(printDialog.paymentHash)"
-        >
-          <q-tooltip>Print receipt</q-tooltip>
-        </q-btn>
+      <q-card-actions align="between">
+        <div>
+          <q-btn
+            round
+            icon="receipt_long"
+            color="secondary"
+            class="q-mr-sm"
+            @click.stop="printOrderReceipt(printDialog.paymentHash)"
+          >
+            <q-tooltip>Print order receipt</q-tooltip>
+          </q-btn>
+          <q-btn
+            round
+            icon="print"
+            color="primary"
+            @click.stop="printReceipt(printDialog.paymentHash)"
+          >
+            <q-tooltip>Print receipt</q-tooltip>
+          </q-btn>
+        </div>
+        <q-btn outline color="grey" @click="closePrintDialog">CLOSE</q-btn>
       </q-card-actions>
     </q-card>
   </q-dialog>
diff --git a/templates/tpos/index.html b/templates/tpos/index.html
index 9db2b82..acc11b3 100644
--- a/templates/tpos/index.html
+++ b/templates/tpos/index.html
@@ -766,44 +766,46 @@ <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} TPoS extension</h6>
           <strong v-text="urlDialog.data.name"></strong>
         </p>
       </div>
-      <div v-if="urlDialog.data.stripe_card_payments">
-        <div class="row q-mt-lg">
-          <div class="col">
-            <q-toggle
-              v-model="urlDialog.data.useWrapper"
-              label="Use with TPoS-Wrapper Android app"
-            ></q-toggle>
-          </div>
+      <div class="row q-mt-lg">
+        <div class="col">
+          <q-toggle
+            v-model="urlDialog.data.useWrapper"
+            label="Use with TPoS-Wrapper Android app"
+          ></q-toggle>
         </div>
-        <div class="row q-mt-sm" v-if="urlDialog.data.useWrapper">
-          <div class="col">
-            <q-btn
-              outline
-              color="primary"
-              type="a"
-              href="https://github.com/lnbits/TPoS-Stripe-Tap-to-Pay-Wrapper-Stripev5"
-              target="_blank"
-              rel="noopener noreferrer"
-              label="GET THE TPOS-WRAPPER"
-            ></q-btn>
-          </div>
+      </div>
+      <div class="row q-mt-sm" v-if="urlDialog.data.useWrapper">
+        <div class="col">
+          <q-btn
+            outline
+            color="primary"
+            type="a"
+            href="https://github.com/lnbits/TPoS-Stripe-Tap-to-Pay-Wrapper-Stripev5"
+            target="_blank"
+            rel="noopener noreferrer"
+            label="GET THE TPOS-WRAPPER"
+          ></q-btn>
         </div>
+      </div>
+      <div
+        v-if="urlDialog.data.useWrapper && urlDialog.data.stripe_card_payments"
+      >
         <div class="row q-mt-lg">
-          <div class="col" v-if="urlDialog.data.useWrapper">
+          <div class="col">
             <q-input
               v-model="urlDialog.data.posLocation"
               label="PoS Stripe Location"
             >
             </q-input>
           </div>
-          <div class="col q-pl-md" v-if="urlDialog.data.useWrapper">
+          <div class="col q-pl-md">
             <small>
               If accepting Stripe payments, visit
               https://dashboard.stripe.com/terminal and grab a new location ID
             </small>
           </div>
         </div>
-        <div class="row q-mt-lg" v-if="urlDialog.data.useWrapper">
+        <div class="row q-mt-lg">
           <div class="col">
             <q-btn
               outline