diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 3034a9d..4ee0e90 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -971,8 +971,8 @@ String WiFiManager::getInfoData(String id){
   else if(id=="uptime"){
     // subject to rollover!
     p = FPSTR(HTTP_INFO_uptime);
-    p.replace("{1}",(String)(system_get_time() / 1000000 / 60));
-    p.replace("{2}",(String)((system_get_time() / 1000000)%60));
+    p.replace("{1}",(String)(millis() / 1000 / 60));
+    p.replace("{2}",(String)((millis() / 1000)%60));
   }
   else if(id=="chipid"){
     p = FPSTR(HTTP_INFO_chipid);
diff --git a/extras/WiFiManager.template.html b/extras/WiFiManager.template.html
index 327c17f..aa83cc2 100644
--- a/extras/WiFiManager.template.html
+++ b/extras/WiFiManager.template.html
@@ -134,6 +134,9 @@ dd {
 	margin: 0;
 	padding: 0 0 0.5em 0;
 }
+td {
+	vertical-align: top;
+}
 </style>
 <!-- /HTTP_STYLE -->
 <!-- HTTP_SCRIPT -->
@@ -208,11 +211,35 @@ dd {
 				<dt>Flash Chip ID</dt><dd>1234556</dd>
 				<dt>IDE Flash Size</dt><dd>4194304 bytes</dd>
 				<dt>Real Flash Size</dt><dd>4194304 bytes</dd>
+				<dt>Empty</dt><dd></dd>
 				<dt>Soft AP IP</dt><dd>192.168.4.1</dd>
 				<dt>Soft AP MAC</dt><dd>00:00:00:00:00:00</dd>
 				<dt>Station MAC</dt><dd>00:00:00:00:00:00</dd>
 			</dl>
 			<!-- /SAMPLE -->
+			<!-- HTTP_HELP -->
+		 		<br/><h3>Available Pages</h3><hr>
+		 		<table class='table'>
+		 		<thead><tr><th>Page</th><th>Function</th></tr></thead><tbody>
+		 		<tr><td><a href='/'>/</a></td>
+		 		<td>Menu page.</td></tr>
+		 		<tr><td><a href='/wifi'>/wifi</a></td>
+		 		<td>Show WiFi scan results and enter WiFi configuration.(/0wifi noscan)</td></tr>
+		 		<tr><td><a href='/wifisave'>/wifisave</a></td>
+		 		<td>Save WiFi configuration information and configure device. Needs variables supplied.</td></tr>
+		 		<tr><td><a href='/close'>/close</a></td>
+		 		<td>Close the configuration server and configuration WiFi network.</td></tr>
+		 		<tr><td><a href='/i'>/i</a></td>
+		 		<td>Information page</td></tr>
+		 		<tr><td><a href='/exit'>/exit</a></td>
+		 		<td>Exit Config Portal, configportal will close</td></tr>
+		 		<tr><td><a href='/r'>/r</a></td>
+		 		<td>Reboot the device</td></tr>
+		 		<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>.;
+			<!-- /HTTP_HELP -->
 <!-- HTTP_END -->
     </div>
 	</body>
diff --git a/strings_en.h b/strings_en.h
index dcc13c9..3767942 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -42,7 +42,8 @@ const char HTTP_STYLE[]            PROGMEM = "<style>"
 // msg callouts
 ".msg{padding:20px;margin:20px 0;border:1px solid #eee;border-left-width:5px;border-radius:3px;border-left-color:#777}.msg h4{margin-top:0;margin-bottom:5px}.msg.P{border-left-color:#1fa3ec}.msg.P h4{color:#1fa3ec}.msg.D{border-left-color:#d9534f}.msg.D h4{color:#d9534f}"
 // lists
-"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0}"
+"dt{font-weight:bold}dd{margin:0;padding:0 0 0.5em 0;min-height:12px}"
+"td{vertical-align: top;}"
 "</style>";
 
 const char HTTP_HELP[]             PROGMEM =
@@ -95,8 +96,8 @@ const char HTTP_JS[] PROGMEM =
 const char HTTP_INFO_esphead[]    PROGMEM = "<h3>esp8266</h3><hr><dl>";
 const char HTTP_INFO_wifihead[]   PROGMEM = "<br/><h3>WiFi</h3><hr>";
 
-const char HTTP_INFO_uptime[]     PROGMEM = "<dt>Uptime</dt>{1} Mins {2} Secs<dd></dd>";
-const char HTTP_INFO_chipid[]     PROGMEM = "<dt>Chip ID</dt>{1}<dd></dd>";
+const char HTTP_INFO_uptime[]     PROGMEM = "<dt>Uptime</dt><dd>{1} Mins {2} Secs</dd>";
+const char HTTP_INFO_chipid[]     PROGMEM = "<dt>Chip ID</dt><dd>{1}</dd>";
 const char HTTP_INFO_fchipid[]    PROGMEM = "<dt>Flash Chip ID</dt><dd>{1}</dd>";
 const char HTTP_INFO_idesize[]    PROGMEM = "<dt>IDE Flash Size</dt><dd>{1} bytes</dd>";
 const char HTTP_INFO_flashsize[]  PROGMEM = "<dt>Actual Flash Size</dt><dd>{1} bytes</dd>";