diff --git a/src/components/Connect.vue b/src/components/Connect.vue
index 612a636..13c9c1d 100644
--- a/src/components/Connect.vue
+++ b/src/components/Connect.vue
@@ -62,23 +62,14 @@
                 </p>
               </q-expansion-item>
 
-              <div class="row q-mt-lg">
-                <q-btn v-if="hasActiveUser" @click="disconnect" color="red-10" unelevated
-                  >Disconnect</q-btn
-                >
-
-                <q-btn
-                  v-if="!hasActiveUser"
-                  @click="connect"
-                  color="deep-purple"
-                  type="submit"
-                  unelevated
-                  >Connect</q-btn
-                >
+              <div v-if="!hasActiveUser" class="row q-mt-lg">
+                <q-btn @click="connect" color="deep-purple" type="submit" unelevated>Connect</q-btn>
+                <q-space />
+                <q-btn @click="connectNewUser" color="purple" unelevated>New User</q-btn>
+              </div>
+              <div v-else class="row q-mt-lg">
+                <q-btn @click="disconnect" color="red-10" unelevated>Disconnect</q-btn>
                 <q-space />
-                <q-btn v-if="!hasActiveUser" @click="connectNewUser" color="purple" unelevated
-                  >New User</q-btn
-                >
                 <q-btn
                   v-if="requestDisconnect"
                   @click="cancelDisconnect"
@@ -87,6 +78,14 @@
                   class="q-ml-auto"
                   >Cancel</q-btn
                 >
+                <q-btn
+                  v-if="!requestDisconnect"
+                  @click="connect"
+                  flat
+                  color="grey"
+                  class="q-ml-auto"
+                  >Back</q-btn
+                >
               </div>
             </div>
           </q-card-section>
@@ -194,7 +193,6 @@ export default {
       }
     },
     async connect() {
-      console.log('!!!!!!!! connect')
       try {
         const user = await lnBitsConnect.checkUser(this.serverUrl, this.userId)
 
diff --git a/src/components/LNbitsWrapper.vue b/src/components/LNbitsWrapper.vue
index 4f512db..c515059 100644
--- a/src/components/LNbitsWrapper.vue
+++ b/src/components/LNbitsWrapper.vue
@@ -56,7 +56,7 @@ export default {
       message: 'Loading...',
       caption: serverUrl,
       position: 'center',
-      timeout: 5000,
+      timeout: 1500,
       spinner: true,
     })