diff --git a/lnbits/extensions/watchonly/static/js/index.js b/lnbits/extensions/watchonly/static/js/index.js
index ec1034dc..424f8604 100644
--- a/lnbits/extensions/watchonly/static/js/index.js
+++ b/lnbits/extensions/watchonly/static/js/index.js
@@ -49,6 +49,7 @@ new Vue({
         authenticated: false,
         showPasswordDialog: false,
         showConsole: false,
+        showSignedPsbt: false,
         sendingPsbt: false,
         psbtSent: false
       },
@@ -781,9 +782,9 @@ new Vue({
         })
       }
     },
-    hwwToggleAuth: function () {
+    hwwExecuteDefaultCommand: function () {
       if (this.hww.authenticated) {
-        this.hwwLogout()
+        this.hwwSendPsbt()
       } else {
         this.hwwShowPasswordDialog()
       }
diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html
index d81cb2e0..afc56bc8 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/index.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/index.html
@@ -1129,8 +1129,8 @@
                         split
                         class="btn-full"
                         color="secondary"
-                        :label="hww.authenticated ? 'Logout' : 'Login'"
-                        @click="hwwToggleAuth()"
+                        :label="hww.authenticated ? 'Sign' : 'Login'"
+                        @click="hwwExecuteDefaultCommand()"
                       >
                         <q-list>
                           <q-item
@@ -1165,8 +1165,15 @@
                             :disabled="!hww.authenticated"
                             clickable
                             v-close-popup
-                            @click="hwwShowPasswordDialog()"
+                            @click="hwwSendPsbt()"
                           >
+                            <q-item-section>
+                              <q-item-label>Sign</q-item-label>
+                              <q-item-label caption
+                                >Sign transaction on Hardware
+                                Wallet</q-item-label
+                              >
+                            </q-item-section>
                           </q-item>
                           <q-item clickable v-close-popup>
                             <q-item-section>
@@ -1205,7 +1212,13 @@
                         v-model="hww.showConsole"
                       ></q-toggle>
                     </div>
-                    <div class="col-3"></div>
+                    <div class="col-3">
+                      <q-spinner
+                        v-if="hww.sendingPsbt == true"
+                        color="primary"
+                        size="2.55em"
+                      ></q-spinner>
+                    </div>
                     <div class="col-3"></div>
                   </div>
                   <div
@@ -1231,31 +1244,6 @@
                     class="row items-center no-wrap q-mb-md"
                   >
                     <div class="col-3 q-pr-lg">
-                      <q-btn
-                        @click="hwwSendPsbt()"
-                        unelevated
-                        color="secondary"
-                        class="btn-full"
-                        >Sign
-                        <q-spinner
-                          v-if="hww.sendingPsbt == true"
-                          color="primary"
-                        ></q-spinner>
-                      </q-btn>
-                    </div>
-
-                    <div class="col-6">
-                      <q-badge
-                        v-if="hww.psbtSent"
-                        color="yellow"
-                        text-color="black"
-                        multi-line
-                        class="text-subtitle2"
-                        >Please check transaction data on the Hardware Wallet
-                        display</q-badge
-                      >
-                    </div>
-                    <div class="col-3 q-pl-lg">
                       <q-btn
                         v-if="hww.psbtSent"
                         @click="hwwSignPsbt()"
@@ -1265,9 +1253,28 @@
                         >Confirm</q-btn
                       >
                     </div>
+                    <div class="col-3 q-pl-lg">
+                      <q-toggle
+                        v-if="serial.psbtBase64Signed"
+                        label="Show Console"
+                        color="secodary float-left"
+                        v-model="hww.showSignedPsbt"
+                      ></q-toggle>
+                    </div>
+                    <div class="col-6">
+                      <q-badge
+                        v-if="hww.psbtSent"
+                        color="yellow"
+                        text-color="black"
+                        multi-line
+                        class="text-subtitle2"
+                        >Check transaction data on the Hardware Wallet
+                        display</q-badge
+                      >
+                    </div>
                   </div>
                   <div
-                    v-if="payment.psbtBase64Signed"
+                    v-if="hww.showSignedPsbt"
                     class="row items-center no-wrap q-mb-md"
                   >
                     <div class="col-3 q-pr-lg"></div>