diff --git a/printermonitor/Settings.h b/printermonitor/Settings.h
index 1053fc3..0c973b2 100644
--- a/printermonitor/Settings.h
+++ b/printermonitor/Settings.h
@@ -43,6 +43,8 @@ SOFTWARE.
 #include "TimeClient.h"
 #include "OctoPrintClient.h"
 #include "FS.h"
+#include "SH1106Wire.h"
+#include "SSD1306Wire.h"
 #include "OLEDDisplayUi.h"
 
 //******************************
@@ -75,11 +77,4 @@ boolean ENABLE_OTA = true;     // this will allow you to load firmware to the de
 // End Settings
 //******************************
 
-String themeColor = "light-green"; // this can be changed later in the web interface.
-
-// SSD1306 is default - if DISPLAY_SH1106 is defined then it will use SH1106
-#if defined(DISPLAY_SH1106)
-  #include "SH1106Wire.h"
-#else
-  #include "SSD1306Wire.h"
-#endif
+String themeColor = "light-green"; // this can be changed later in the web interface.
diff --git a/printermonitor/printermonitor.ino b/printermonitor/printermonitor.ino
index 3c87a48..cdf0628 100644
--- a/printermonitor/printermonitor.ino
+++ b/printermonitor/printermonitor.ino
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #define VERSION "1.4"
 
-#define HOSTNAME "OctoMon-" 
+#define HOSTNAME "OctMon-" 
 #define CONFIG "/conf.txt"
 
 /* Useful Constants */
@@ -172,23 +172,15 @@ void setup() {
   //wifiManager.resetSettings();
   wifiManager.setAPCallback(configModeCallback);
   
-  //or use this for auto generated name ESP + ChipID
-  wifiManager.autoConnect();
-  
-  //Manual Wifi
   String hostname(HOSTNAME);
   hostname += String(ESP.getChipId(), HEX);
-  WiFi.hostname(hostname);
-
-  int cnt = 0;
-  while (WiFi.status() != WL_CONNECTED) {
-    digitalWrite(externalLight, LOW);
-    delay(500);
-    Serial.print(".");
-    cnt++;
-    digitalWrite(externalLight, HIGH);
+  if (!wifiManager.autoConnect((const char *)hostname.c_str())) {// new addition
+    delay(3000);
+    WiFi.disconnect(true);
+    ESP.reset();
+    delay(5000);
   }
-
+  
   // You can change the transition that is used
   // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_TOP, SLIDE_DOWN
   ui.setFrameAnimation(SLIDE_LEFT);
@@ -558,7 +550,19 @@ void displayPrinterStatus() {
 
 void configModeCallback (WiFiManager *myWiFiManager) {
   Serial.println("Entered config mode");
-  Serial.println(WiFi.softAPIP());  
+  Serial.println(WiFi.softAPIP());
+
+  display.clear();
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(64, 0, "Wifi Manager");
+  display.drawString(64, 10, "Please connect to AP");
+  display.setFont(ArialMT_Plain_16);
+  display.drawString(64, 23, myWiFiManager->getConfigPortalSSID());
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(64, 42, "To setup Wifi connection");
+  display.display();
+  
   Serial.println("Wifi Manager");
   Serial.println("Please connect to AP");
   Serial.println(myWiFiManager->getConfigPortalSSID());