diff --git a/esp8266/data/config_ap.tpl b/esp8266/data/config_ap.tpl
index 5eab053c..49e95d8b 100644
--- a/esp8266/data/config_ap.tpl
+++ b/esp8266/data/config_ap.tpl
@@ -6,7 +6,7 @@ $INCLUDE[header.inc]$
 <div class="form-group $AP_SSID_STATUS$">
 <label class="control-label" for="CONFIG1">SSID: </label><br>
 <input type="text" class="form-control" id="CONFIG1" name="SSID" placeholder="SSID (8~32)" max="32"  value="$AP_SSID$" style="width: auto;"></div>
-<div class="form-group $AP_PASSWORD_STATUS$"><label class="control-label" for="CONFIG2">Password :</label><br>
+<div class="form-group $AP_PASSWORD_STATUS$"><label class="control-label" for="CONFIG2">Password:</label><br>
 <input type="password" class="form-control" id="CONFIG2" name="PASSWORD" placeholder="Password (0~64)" max="64"  value="$AP_PASSWORD$" style="width: auto;"></div>
 <div class="checkbox $IS_SSID_VISIBLE_STATUS$"><label class="control-label"><input type="checkbox" name="SSID_VISIBLE" $IS_SSID_VISIBLE$>Visible</label></div>
 <div class="form-group $NETWORK_OPTION_LIST_STATUS$"><label class="control-label" for="CONFIG3">Network: </label><br>
diff --git a/esp8266/data/config_sta.tpl b/esp8266/data/config_sta.tpl
index d830f1f5..f4a06d2a 100644
--- a/esp8266/data/config_sta.tpl
+++ b/esp8266/data/config_sta.tpl
@@ -12,7 +12,7 @@ $INCLUDE[header.inc]$
 </DIV>
 <div class="form-group $STA_SSID_STATUS$" ><label class="control-label"  for="CONFIG1">SSID: </label><br>
 <input type="text" class="form-control" id="CONFIG1" name="SSID" placeholder="SSID (8~32)" value="$STA_SSID$" max="32" style="width: auto;"></div>
-<div class="form-group $STA_PASSWORD_STATUS$"><label class="control-label"for="CONFIG2">Password :</label><br>
+<div class="form-group $STA_PASSWORD_STATUS$"><label class="control-label"for="CONFIG2">Password:</label><br>
 <input type="password" class="form-control" id="CONFIG2" name="PASSWORD" placeholder="Password (0~64)" max="64" value="$STA_PASSWORD$" style="width: auto;"></div>
 <div class="form-group $HOSTNAME_STATUS$" ><label class="control-label"  for="CONFIG7">Hostname: </label><br>
 <input type="text" class="form-control" id="CONFIG7" name="HOSTNAME" placeholder="Hostname (1~32)" value="$HOSTNAME$" max="32" style="width: auto;"></div>
diff --git a/esp8266/data/settings.tpl b/esp8266/data/settings.tpl
index 65db26e1..33ca6b3e 100644
--- a/esp8266/data/settings.tpl
+++ b/esp8266/data/settings.tpl
@@ -73,7 +73,7 @@ content +="</div></TD><td></td></TR>";
 }
  document.getElementById('file_list').innerHTML=content;}
 function Delete(filename){
-if (confirm("Confirm deletion of :" + filename))SendCommand("delete",filename);
+if (confirm("Confirm deletion of:" + filename))SendCommand("delete",filename);
 }
 function SendCommand(action,filename){
 var xmlhttp = new XMLHttpRequest();
diff --git a/esp8266/esp8266.ino b/esp8266/esp8266.ino
index 7083b355..653f5d29 100644
--- a/esp8266/esp8266.ino
+++ b/esp8266/esp8266.ino
@@ -56,7 +56,7 @@ WiFiServer * data_server;
 WiFiClient serverClients[MAX_SRV_CLIENTS];
 
 void setup() {
-  // init :
+  // init:
    web_interface = NULL;
   data_server = NULL;
  // ESP.wdtDisable();
@@ -86,7 +86,7 @@ void setup() {
     //update EEPROM with default settings
     Serial.begin(9600);
     delay(2000);
-    Serial.println("M117 Reset requested");
+	Serial.println(F("M117 ESP EEPROM reset"));
     CONFIG::reset_config();
     delay(1000);
     //put some default value to a void some exception at first start