diff --git a/lib/WiFiConnect/WiFiConnect.cpp b/lib/WiFiConnect/WiFiConnect.cpp
index 8ef305b..fb6d366 100644
--- a/lib/WiFiConnect/WiFiConnect.cpp
+++ b/lib/WiFiConnect/WiFiConnect.cpp
@@ -392,11 +392,11 @@ boolean WiFiConnect::startConfigurationPortal(AP_Continue apcontinue, const char
   _lastAPPage = millis();
   _readyToConnect = false;	  
   while (true) {
-	
-	if (apcontinue != AP_WAIT)	// Stay here if the AP_LOOP enabled	
-		if (millis() - (unsigned long int)_lastAPPage >= ( (unsigned int)_apTimeoutMins * 60 * 1000)) {
-		  break;
-		}
+    if (apcontinue != AP_WAIT) {
+      if (millis() - (unsigned long int)_lastAPPage >= ( (unsigned int)_apTimeoutMins * 60 * 1000)) {
+        break;
+      }
+    }
 		
     dnsServer->processNextRequest();
     server->handleClient();
diff --git a/src/gui.cpp b/src/gui.cpp
index 7a6cf17..7e4234f 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -4462,7 +4462,7 @@ void DoMenu() {
           case 7: tft.pushImage(0, 0, 320, 240, configurationbackground_wo); break;
           default: tft.pushImage(0, 0, 320, 240, configurationbackground); break;
         }
-        tftPrint(ACENTER, textUI(189 + menupage - 1), 160, 6, ActiveColor, ActiveColorSmooth, 16);
+        tftPrint(ACENTER, textUI(43 + menupage - 1), 160, 6, ActiveColor, ActiveColorSmooth, 16);
       }
     }
 
@@ -5218,9 +5218,9 @@ void DoMenu() {
                 wifi = false;
                 tryWiFi();
               }
-              WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)");
               WiFiConnectParam XDRGTK_key_input("XDRGTK_key", "Password", key, 9);
               if (!setWiFiConnectParam) {
+                WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)");
                 wc.addParameter(&XDRGTK_key_text);
                 wc.addParameter(&XDRGTK_key_input);
                 setWiFiConnectParam = true;
@@ -5235,7 +5235,6 @@ void DoMenu() {
               menuopen = false;
               BuildMenu();
             } break;
-
           case ITEM4:
             if (wifi) {
               Infoboxprint(textUI(55));