diff --git a/extras/WiFiManager.template.html b/extras/WiFiManager.template.html
index aa83cc2..52f9660 100644
--- a/extras/WiFiManager.template.html
+++ b/extras/WiFiManager.template.html
@@ -178,7 +178,7 @@ td {
 			<div><a href='#p' onclick='c(this)'>{v}</a><div role='img' aria-label='{r}%' title='{r}%' class='q q-{q} {i}'></div></div>
 			<!-- /HTTP_ITEM -->
 			<!-- HTTP_FORM_START -->
-			<form method='get' action='wifisave'><label for='s'>SSID</label><input id='s' name='s' length=32 placeholder='SSID'><br/><label for='p'>Password</label><input id='p' name='p' length=64 type='password' placeholder='password'><br/>
+			<form method='get' action='wifisave'><label for='s'>SSID</label><br/><input id='s' name='s' length=32 placeholder='SSID'><br/><label for='p'>Password</label><input id='p' name='p' length=64 type='password' placeholder='password'><br/>
 			<!-- /HTTP_FORM_START -->
 			<!-- SAMPLE -->
 			<h3>custom parameter</h3><hr>
@@ -198,10 +198,32 @@ td {
 			<br/><form action='/wifi' method='get'><button>Refresh</button></form>
 			<!-- /HTTP_SCAN_LINK -->
 			<!-- HTTP_SAVED -->
-			<div class='msg P'><h4>Saving Credentials</h4>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>
+			<div class='msg'><h4>Saving Credentials</h4>Trying to connect ESP to network.<br />If it fails reconnect to AP to try again</div>
 			<!-- /HTTP_SAVED -->
+			<!-- HTTP_STATUS_ON> -->
+			<div class='msg P'><strong>Connected</strong> to {v}<br/><em><small>with IP {i}</small></em></div>
+			<!-- /HTTP_STATUS_ON> -->     	
+			<!-- HTTP_STATUS_OFF -->
+			<div class='msg {c}'><strong>Not Connected</strong> to {v}{r}</div>
+			<!-- /HTTP_STATUS_OFF> --> 
+			<!-- sample -->
+			<div class='msg D'><strong>Not Connected</strong> to apname
+			<!-- /sample -->
+			<!-- HTTP_STATUS_OFF -->
+				<br/>Wrong Password
+			<!-- /HTTP_STATUS_OFFPW> -->
+			<!-- HTTP_STATUS_OFF -->
+				<br/>AP not found
+			<!-- /HTTP_STATUS_OFFNOAP> -->	
+			<!-- HTTP_STATUS_OFF -->
+				<br/>Could not Connect
+			<!-- /HTTP_STATUS_OFFFAIL> -->	
+			</div>
 			<!-- SAMPLE -->
-			<div class='msg'><h4>Information</h4>Connected to AP: homeAP</div>
+			<!-- HTTP_STATUS_NON -->
+			<div class='msg'>No AP set</div>
+			<!-- /HTTP_STATUS_NONE> -->
+			<div class='msg P'><h4>Information</h4>Connected to AP: homeAP</div>
 			<div class='msg D'><h4>Connect Failed</h4>An error occured</div>
 			<!-- /SAMPLE -->
 			<!-- SAMPLE -->
@@ -238,7 +260,7 @@ td {
 		 		<tr><td><a href='/erase'>/erase</a></td>
 		 		<td>Erase WiFi configuration and reboot Device. Device will not reconnect to a network until new WiFi configuration data is entered.</td></tr>
 		 		</table>
-		 		<p/>More information about WiFiManager at <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.;
+		 		<p/>More information about WiFiManager at <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>
 			<!-- /HTTP_HELP -->
 <!-- HTTP_END -->
     </div>
diff --git a/strings_en.h b/strings_en.h
index 0212a2c..2d3ea9d 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -44,9 +44,9 @@ const char HTTP_ERASEBTN[]         PROGMEM = "<br/><form action='/erase' method=
 
 const char HTTP_STATUS_ON[]        PROGMEM = "<div class='msg P'><strong>Connected</strong> to {v}<br/><em><small>with IP {i}</small></em></div>";
 const char HTTP_STATUS_OFF[]       PROGMEM = "<div class='msg {c}'><strong>Not Connected</strong> to {v}{r}</div>";
-const char HTTP_STATUS_OFFPW[]     PROGMEM = "<br/>Wrong Password";
-const char HTTP_STATUS_OFFNOAP[]   PROGMEM = "<br/>AP not found";
-const char HTTP_STATUS_OFFFAIL[]   PROGMEM = "<br/>Could not Connect";
+const char HTTP_STATUS_OFFPW[]     PROGMEM = "<br/>Wrong Password"; // STATION_WRONG_PASSWORD,  no eps32
+const char HTTP_STATUS_OFFNOAP[]   PROGMEM = "<br/>AP not found";   // WL_NO_SSID_AVAIL
+const char HTTP_STATUS_OFFFAIL[]   PROGMEM = "<br/>Could not Connect"; // WL_CONNECT_FAILED
 const char HTTP_STATUS_NONE[]      PROGMEM = "<div class='msg'>No AP set</div>";
 const char HTTP_BR[]               PROGMEM = "<br/>";