diff --git a/Page5-2.png b/Page5-2.png
index d3d2bc28..05eac39a 100644
Binary files a/Page5-2.png and b/Page5-2.png differ
diff --git a/esp8266/data - for 64K SPIFFS/printer.tpl b/esp8266/data - for 64K SPIFFS/printer.tpl
index ab2231b3..106f4f6f 100644
--- a/esp8266/data - for 64K SPIFFS/printer.tpl	
+++ b/esp8266/data - for 64K SPIFFS/printer.tpl	
@@ -5,7 +5,7 @@ $INCLUDE[header.inc]$
 <td><input class="form-control" id="numberinput1" type="number" min=0 max=270 step=1 value=0></td><td>&#176;C
 <input type="submit" value="Set" onclick="SendValue( 'M104 T0 S', '1');"></td></tr></table></div></td></tr>
 <tr ><td style="padding:0px;"><div id="Extruder2" style="visibility:hidden;height:0px;">
-	
+
 <table><tr><td>E2:&nbsp;</td><td id="data_extruder2"></td>
 <td><input class="form-control" id="numberinput2" type="number" min=0 max=270 step=1 value=0></td><td>&#176;C
 <input type="submit" value="Set" onclick="SendValue( 'M104 T1 S', '2');"></td></tr></table></div></td></tr>
@@ -33,10 +33,11 @@ $INCLUDE[header.inc]$
 <tr><td><hr></td></tr><tr><td><table><tr><td>Status:</td><td width=100% id="statusmsg" class="text-info"></td></tr></table></tr>
 <tr><td><hr></td></tr>
 <tr><td><table>
-<tr><td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M24');">Play</td><td>&nbsp;&nbsp;</td>
+<tr><td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M24');">Continue</td><td>&nbsp;&nbsp;</td>
 <td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M25');">Pause</td><td>&nbsp;&nbsp;</td>
 <td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M50');" >Stop</td><td>&nbsp;&nbsp;</td>
-<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="alert('Not yet implemented');">SD</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="getSDfiles();">Get SD Content</td><td>&nbsp;&nbsp;</td>
+<td id="SDLIST"></td>
 </tr></table></td></tr>
 <tr><td><table>
 <tr><td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28 X');">Home X</td><td>&nbsp;&nbsp;</td>
@@ -45,26 +46,26 @@ $INCLUDE[header.inc]$
 <td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28');">Home All</td>
 </tr></table></td></tr>
 <tr><td >
-	<form><table><tr><td>Axis:</td>
-	<td><input type="radio" id="X_axis" name="axis" value="X"><label class="control-label" for="X_axis">X</label></td>
-	<td><input type="radio" id="Y_axis" name="axis" value="Y"><label class="control-label" for="Y_axis">Y</label></td>
-	<td><input type="radio" id="Z_axis"name="axis" value="Z"><label class="control-label" for="Z_axis">Z</label></td>
-	<td id="radioE1"><input type="radio" id="E1_axis"name="axis" value="E0"><label class="control-label" for="E1_axis">E1</label></td>
-	<td id="radioE2"><input type="radio" id="E2_axis" name="axis" value="E1"><label class="control-label" for="E2_axis">E2</label></td></tr></table></form>
+<form><table><tr><td>Axis:</td>
+<td><input type="radio" id="X_axis" name="axis" value="X"><label class="control-label" for="X_axis">X</label></td>
+<td><input type="radio" id="Y_axis" name="axis" value="Y"><label class="control-label" for="Y_axis">Y</label></td>
+<td><input type="radio" id="Z_axis"name="axis" value="Z"><label class="control-label" for="Z_axis">Z</label></td>
+<td id="radioE1"><input type="radio" id="E1_axis"name="axis" value="E0"><label class="control-label" for="E1_axis">E1</label></td>
+<td id="radioE2"><input type="radio" id="E2_axis" name="axis" value="E1"><label class="control-label" for="E2_axis">E2</label></td></tr></table></form>
 </td><tr>
 <tr><td >
-	<form><table><tr><td>Steps:</td>
-	<td><input id="pos01" type="radio" name="position" value="0.1"><label class="control-label" for="pos01">0.1</label></td>
-	<td><input id="pos1" type="radio" name="position" value="1"><label class="control-label" for="pos1">1</label></td>
-	<td><input id="pos10"type="radio" name="position" value="10"><label class="control-label" for="pos10">10</label></td>
-	<td><input id="pos50"type="radio" name="position" value="50"><label class="control-label" for="pos50">50</label></td></tr></table></form>
+<form><table><tr><td>Steps:</td>
+<td><input id="pos01" type="radio" name="position" value="0.1"><label class="control-label" for="pos01">0.1</label></td>
+<td><input id="pos1" type="radio" name="position" value="1"><label class="control-label" for="pos1">1</label></td>
+<td><input id="pos10"type="radio" name="position" value="10"><label class="control-label" for="pos10">10</label></td>
+<td><input id="pos50"type="radio" name="position" value="50"><label class="control-label" for="pos50">50</label></td></tr></table></form>
 </td><tr>
 <tr><td >
-	<table><tr>
-	<td>Direction:</td>
-	<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('-');">&nbsp;&nbsp;-&nbsp;&nbsp;</td>
-	<td></td><td></td><td></td>
-	<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('+');" >&nbsp;&nbsp;+&nbsp;&nbsp;</td>
+<table><tr>
+<td>Direction:</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('-');">&nbsp;&nbsp;-&nbsp;&nbsp;</td>
+<td></td><td></td><td></td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('+');" >&nbsp;&nbsp;+&nbsp;&nbsp;</td>
 </td><tr>
 </table>
 <script type="text/javascript">
@@ -85,11 +86,11 @@ while (new Date() < ms){}
 
 function SendJog( direction){
 
-	var axischecked;
-	var feedrate;
-	var step;
-	var i;
-	for (i = 0; i < axis.length; i++) {
+var axischecked;
+var feedrate;
+var step;
+var i;
+for (i = 0; i < axis.length; i++) {
         if (axis[i].checked) {
             axischecked=axis[i].value;
         }
@@ -206,6 +207,50 @@ dispatchstatus(jsonresponse);}
 xmlhttp.open("GET", url, true);
 xmlhttp.send();
 }
+
+function printfile(){
+var filename = document.getElementById("sdfilelist").value;
+if (filename.length>0){
+Sendcommand("M23 " + filename);
+delay(100);
+Sendcommand("M24");}
+}
+
+function refreshfilelist(jsonresponse){
+var list2display="<select id=\"sdfilelist\">";
+var content="";
+var i;
+for (i = 0; i < jsonresponse.length; i++){ 
+content =jsonresponse[i].entry;
+var tcontent=content.split(" ");
+if (tcontent.length==2){
+list2display+="<OPTION value=\"";
+list2display+=tcontent[0];
+list2display+="\">";
+list2display+=tcontent[0] ;
+list2display+="</OPTION>";}
+}
+list2display+="</select>";
+if ( jsonresponse.length>0){
+list2display+="&nbsp;&nbsp;<input type=\"button\"  Onclick=\"printfile();\" value=\"Print\" />";}
+document.getElementById("SDLIST").innerHTML=list2display;
+}
+
+function getSDfiles(){
+document.getElementById("SDLIST").innerHTML="";
+Sendcommand("M20");
+delay(1000);
+var xmlhttp = new XMLHttpRequest();
+var url = "http://$WEB_ADDRESS$/SDFILES";
+xmlhttp.onreadystatechange = function() {
+if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+var jsonresponse = JSON.parse(xmlhttp.responseText);
+refreshfilelist(jsonresponse);}
+}
+xmlhttp.open("GET", url, true);
+xmlhttp.send();
+}
+
 setInterval(function(){getstatus();},$REFRESH_PAGE$);
 var axis = document.forms[0];
 var pos = document.forms[1];
diff --git a/esp8266/data - for more than 64K SPIFFS/printer.tpl b/esp8266/data - for more than 64K SPIFFS/printer.tpl
index 2c119e9e..ba319486 100644
--- a/esp8266/data - for more than 64K SPIFFS/printer.tpl	
+++ b/esp8266/data - for more than 64K SPIFFS/printer.tpl	
@@ -24,7 +24,7 @@ $INCLUDE[header.inc]$
 <input type="submit" value="Set" onclick="SendValue( 'M220 S', 'speed');"></td>
 <td>&nbsp;&nbsp;</td><td>Status:</td><td id="status" align="center" valign="middle">
 <svg width="20" height="20"><circle cx="10" cy="10" r="8" stroke="black" stroke-width="2" fill="white"></circle></svg></td>
-<td id="status-text"></td><td>&nbsp;&nbsp;</td><td class="btnimg" onclick="OnclickEmergency();">
+<td id="status-text" style="width:100px;"></td><td>&nbsp;&nbsp;</td><td class="btnimg" onclick="OnclickEmergency();">
 <svg width="40" height="40" viewBox="0 0 40 40"><circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="red" />
 <circle cx="20" cy="20" r="10" stroke="black" stroke-width="4" fill="red" /><rect x="15" y="8" width="10" height="10" style="fill:red;stroke-width:1;stroke:red" />
 <rect x="18" y="6" rx="1" ry="1" width="4" height="14" style="fill:black;stroke-width:1;stroke:black" /></svg></td></tr></table></td></tr>
@@ -46,9 +46,10 @@ $INCLUDE[header.inc]$
 <rect x="10" y="10" width="7" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /> <rect x="23" y="10" width="7" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /></svg></td>
 <td class="btnimg" onclick="Sendcommand('M50');"><svg width="40" height="40" viewBox="0 0 40 40"><circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="white" />
 <rect x="10" y="10" width="20" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /></svg></td>
-<td class="btnimg" onclick="alert('Not yet implemented');"><svg width="40" height="40" viewBox="0 0 40 40"><rect x="5" y="10" width="30" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" />
+<td class="btnimg" onclick="getSDfiles();"><svg width="40" height="40" viewBox="0 0 40 40"><rect x="5" y="10" width="30" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" />
 <rect x="20" y="5" width="15" height="15" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /><text x="10" y="25" font-family="Verdana" font-size="14" fill="white">SD</text></svg></td>
-<td>&nbsp;</td></tr></table></td></tr><tr><td><table><tr align="center" valign="middle"><td class="btnimg" onclick=" Sendcommand('G28 X');">
+<td>&nbsp;&nbsp;</td>
+<td id="SDLIST"></td></tr></table></td></tr><tr><td><table><tr align="center" valign="middle"><td class="btnimg" onclick=" Sendcommand('G28 X');">
 <svg width="40" height="40" viewBox="0 0 40 40" ><polygon points="7,40 7,25 4,28 0,24 20,4 26,10 26,6 32,6 32,16 40,24 36,28 33,25 33,40" fill="black" stroke-width:"1" stroke:"black" />
 <line x1="25" y1="8" x2="33" y2="16" style="stroke:white;stroke-width:1" /><polyline points="4,28 20,12 36,28" style="fill:none;stroke:white;stroke-width:1" />
 <text x="15" y="35" font-family="Verdana" font-size="14" fill="white">X</text></svg></td><td>
@@ -298,6 +299,57 @@ dispatchstatus(jsonresponse);}
 xmlhttp.open("GET", url, true);
 xmlhttp.send();
 }
+function printfile(){
+var filename = document.getElementById("sdfilelist").value;
+if (filename.length>0){
+Sendcommand("M23 " + filename);
+delay(100);
+Sendcommand("M24");}
+}
+
+function refreshfilelist(jsonresponse){
+var list2display="<table><tr><td><select class=\"form-control\"  id=\"sdfilelist\">";
+var content="";
+var i;
+for (i = 0; i < jsonresponse.length; i++){ 
+content =jsonresponse[i].entry;
+var tcontent=content.split(" ");
+if (tcontent.length==2){
+list2display+="<OPTION value=\"";
+list2display+=tcontent[0];
+list2display+="\">";
+list2display+=tcontent[0] ;
+list2display+="</OPTION>";}
+}
+list2display+="</select>";
+if ( jsonresponse.length>0){
+list2display+="</td><td>&#8667;</td><td>";
+list2display+="<div class=\"btnimg\" Onclick=\"printfile();\" ><svg width=\"40\" height=\"40\">";
+list2display+="<rect width=\"40\" height=\"40\" style=\"fill:black;\"/>";
+list2display+="<rect x=\"3\" y=\"3\" rx=\"5\" ry=\"5\" width=\"34\" height=\"34\"  style=\"fill:white;\"/>";
+list2display+="<line x1=\"0\" y1=\"15\" x2=\"15\" y2=\"15\" style=\"stroke:black;stroke-width:2\"/>";
+list2display+="<line x1=\"25\" y1=\"15\" x2=\"40\" y2=\"15\" style=\"stroke:black;stroke-width:2\"/>";
+list2display+="<polygon points=\"12,10 20,18 28,10\" style=\"fill:black;stroke-width:1\"/>";
+list2display+="<polyline points=\"20,18 25,25\" style=\"stroke:black;stroke-width:1\" />";
+list2display+="<text x=\"10\" y=\"35\" fill=\"black\">3D</text></svg></div>";}
+list2display+="</td></tr></table>";
+document.getElementById("SDLIST").innerHTML=list2display;
+}
+
+function getSDfiles(){
+document.getElementById("SDLIST").innerHTML="";
+Sendcommand("M20");
+delay(1000);
+var xmlhttp = new XMLHttpRequest();
+var url = "http://$WEB_ADDRESS$/SDFILES";
+xmlhttp.onreadystatechange = function() {
+if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+var jsonresponse = JSON.parse(xmlhttp.responseText);
+refreshfilelist(jsonresponse);}
+}
+xmlhttp.open("GET", url, true);
+xmlhttp.send();
+}
 setInterval(function(){getstatus();},$REFRESH_PAGE$);
 </script>
 $INCLUDE[footer.inc]$
diff --git a/esp8266/data/404.tpl b/esp8266/data/404.tpl
deleted file mode 100644
index a4672d77..00000000
--- a/esp8266/data/404.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-<HEAD>
-<title>Redirecting...</title> 
-</HEAD>
-<BODY>
-<CENTER>Unknown page - you will be redirected...
-<BR><BR>
-if not redirected, <a href='http://$WEB_ADDRESS$'>click here</a>
-<BR><BR>
-<PROGRESS name='prg' id='prg'>
-
-<script>
-var i = 0; 
-var x = document.getElementById("prg"); 
-x.max=5; 
-var interval=setInterval(function(){
-	i=i+1; 
-	var x = document.getElementById("prg"); 
-	x.value=i; 
-	if (i>5) 
-		{
-		clearInterval(interval);
-		window.location.href='/';
-		}
-	},1000);
-</script>
-</CENTER>
-</BODY>
-</HTML>
-
diff --git a/esp8266/data/config_ap.tpl b/esp8266/data/config_ap.tpl
index 5eab053c..f94722a8 100644
--- a/esp8266/data/config_ap.tpl
+++ b/esp8266/data/config_ap.tpl
@@ -22,20 +22,15 @@ $CHANNEL_OPTION_LIST$
 $AUTH_OPTION_LIST$
 </select></div>
 <script  type="text/javascript">
-function update_ip_set()
-{
-	if (document.getElementById("STATIC_IP").checked)
-		{
-			document.getElementById("IP_SET").style.visibility="visible";
-			document.getElementById("IP_SET").style.width="auto";
-			document.getElementById("IP_SET").style.height="auto";
-		}
-	else
-		{
-			document.getElementById("IP_SET").style.visibility="hidden";
-			document.getElementById("IP_SET").style.width="0px";
-			document.getElementById("IP_SET").style.height="0px";
-		}
+function update_ip_set(){
+if (document.getElementById("STATIC_IP").checked){
+document.getElementById("IP_SET").style.visibility="visible";
+document.getElementById("IP_SET").style.width="auto";
+document.getElementById("IP_SET").style.height="auto";}
+else{
+document.getElementById("IP_SET").style.visibility="hidden";
+document.getElementById("IP_SET").style.width="0px";
+document.getElementById("IP_SET").style.height="0px";}
 }
 </script>
 <div class="checkbox $AP_STATIC_IP_STATUS$"><label class="control-label"><input type="checkbox"  id="STATIC_IP" name="STATIC_IP"  onclick="update_ip_set();" $IS_STATIC_IP$>Static IP</label></div>
@@ -60,5 +55,8 @@ $SUCCESS_MSG$
 <script  type="text/javascript">
 update_ip_set();
 </script>
-$INCLUDE[footer.inc]$
+$SERVICE_PAGE$
+</body>
+</html>
+
 
diff --git a/esp8266/data/config_sta.tpl b/esp8266/data/config_sta.tpl
index d830f1f5..9e21d504 100644
--- a/esp8266/data/config_sta.tpl
+++ b/esp8266/data/config_sta.tpl
@@ -21,26 +21,20 @@ $INCLUDE[header.inc]$
 $NETWORK_OPTION_LIST$
 </select></div>
 <script  type="text/javascript">
-function update_ip_set()
-{
-	if (document.getElementById("STATIC_IP").checked)
-		{
-			document.getElementById("IP_SET").style.visibility="visible";
-			document.getElementById("IP_SET").style.width="auto";
-			document.getElementById("IP_SET").style.height="auto";
-		}
-	else
-		{
-			document.getElementById("IP_SET").style.visibility="hidden";
-			document.getElementById("IP_SET").style.width="0px";
-			document.getElementById("IP_SET").style.height="0px";
-		}
+function update_ip_set(){
+if (document.getElementById("STATIC_IP").checked){
+document.getElementById("IP_SET").style.visibility="visible";
+document.getElementById("IP_SET").style.width="auto";
+document.getElementById("IP_SET").style.height="auto";}
+else{
+document.getElementById("IP_SET").style.visibility="hidden";
+document.getElementById("IP_SET").style.width="0px";
+document.getElementById("IP_SET").style.height="0px";}
 }
 </script>
 <div class="checkbox $STA_STATIC_IP_STATUS$"><label class="control-label">
 <input type="checkbox" id="STATIC_IP" name="STATIC_IP" onclick="update_ip_set();" $IS_STATIC_IP$ >Static IP
-</label>
-</div>
+</label></div>
 <div id="IP_SET" name="IP_SET">
 <div class="form-group $STA_IP_STATUS$"><label class="control-label" for="CONFIG4">IP: </label><br>
 <input type="text" class="form-control" id="CONFIG4" name="IP" placeholder="IP" value="$STA_IP$" max="15" style="width: auto;"></div>
@@ -50,16 +44,13 @@ function update_ip_set()
 <input type="text" class="form-control" id="CONFIG6" name="SUBNET" placeholder="Subnet" value="$STA_SUBNET$" max="15"  style="width: auto;"></div>
 </div>
 <div class="alert alert-danger" role="alert" style="$ERROR_MSG_VISIBILITY$" >
-$ERROR_MSG$
-</div>
+$ERROR_MSG$</div>
 <hr><input style="$SUBMIT_BUTTON_VISIBILITY$" type="submit" class="btn btn-primary" name="SUBMIT" value="Apply">
 </form>
 <div class="alert alert-success" role="alert" style="$SUCCESS_MSG_VISIBILITY$" >
-$SUCCESS_MSG$
-</div>
-</div>
-</div>
-<script  type="text/javascript">
-update_ip_set();
-</script>
-$INCLUDE[footer.inc]$
+$SUCCESS_MSG$</div></div></div>
+<script  type="text/javascript">update_ip_set();</script>
+$SERVICE_PAGE$
+</body>
+</html>
+
diff --git a/esp8266/data/css.inc b/esp8266/data/css.inc
deleted file mode 100644
index f4aff0c9..00000000
--- a/esp8266/data/css.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%; font-size:10px;}
-body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333333;background-color:#ffffff;}
-.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px;}
-table{border:0px;border-spacing:0;max-width:100%;}
-.table-bordered{ width:100%; border:1px solid #dddddd;margin-bottom:20px;}
-td{white-space:nowrap; padding:2mm;}
-th{text-align:left;}
-.table>thead>tr>th,.table>tbody>tr>th,.table>thead>tr>td,.table>tbody>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #dddddd;}
-.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td{border:1px solid #dddddd;}
-.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px;}
-.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9;}
-@media (min-width:768px){.container{width:750px;}}
-@media (min-width:992px){.container{width:970px;}}
-@media (min-width:1200px){.container{width:1170px;}}
-.nav{ width:100%; color:#cccccc;padding-left:10;padding-right:10;list-style:none;background-color:#333333;border-radius:6px ;margin-bottom:20px;}
-a{position:relative;display:block;padding:10px 15px;text-decoration:none;color:#cccccc;}
- .active{color:#ffffff;background-color:#000000;}
-.active a,a:hover,a:focus{color:#FFFFFF;}
-.panel{margin-bottom:20px;background-color:#ffffff;border:1px solid #dddddd;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05);}
-.panel-body{padding:15px;}
-.panel-heading{padding:10px 15px;color:#333333;background-color:#f5f5f5;border-color:#dddddd;border-top-right-radius:3px;border-top-left-radius:3px;border-bottom:1px solid #dddddd;}
-label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:bold;}
-.text-info{color:#31708f;}
-.form-control{display:block;width:auto;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555555;background-color:#ffffff
-;background-image:none;border:1px solid #cccccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);
-* -webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-* transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,0.6);
-* box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,0.6);}
-.form-group{margin-bottom:15px;}
-.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;-ms-touch-action:manipulation;  touch-action:manipulation;cursor:pointer;
-background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;
-* -webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}
-.btn-primary{color:#ffffff;background-color:#337ab7;border-color:#2e6da4;}
-.btn-primary:focus,.btn-primary:active,.btn-primary:hover,.btn-primary.focus,.btn-primary.active,.btn-primary.hover{color:#ffffff;background-color:#286090;border-color:#122b40;}
-caption{padding-top:8px;padding-bottom:8px;color:#777777;text-align:left;}
-.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px;}
-.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d;}
-.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442;}
-.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);}
-.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;}
-.has-error .control-label{color:#a94442;}
-.has-success .form-control {border-color: #3c763d;-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);}
-.has-success .form-control:focus {border-color: #2b542c;-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;}
-.has-success .control-label{color: #3c763d;}
-.btn-danger{color:#ffffff;background-color:#d9534f;border-color:#d43f3a;}
-.btn-danger:focus,.btn-danger:active,.btn-danger:hover,.btn-danger.focus,.btn-danger.active,.btn-danger.hover{color: #ffffff;background-color:#c9302c;border-color:#761c19;}
-.btnimg {cursor:hand; border-radius:6px ;;border:1px solid #FFFFFF;}
-.btnimg:hover{background-color:#F0F0F0;border-color:#00FFFF;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;}
diff --git a/esp8266/data/footer.inc b/esp8266/data/footer.inc
deleted file mode 100644
index ba870a64..00000000
--- a/esp8266/data/footer.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-$SERVICE_PAGE$
-</body>
-</html>
diff --git a/esp8266/data/header.inc b/esp8266/data/header.inc
index 1fbdee0c..24750c3a 100644
--- a/esp8266/data/header.inc
+++ b/esp8266/data/header.inc
@@ -4,20 +4,31 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <style>
-$INCLUDE[css.inc]$
-</style>
-<title>$PAGE_TITLE$</title> </head>
-<body>
-<div class="container"><table class="nav">
-<tr width=100%>
-	<td class="$MENU_HOME$"><a href="http://$WEB_ADDRESS$">Home</a></td>
-	<td class="$MENU_SYSTEM$"><a href="http://$WEB_ADDRESS$/CONFIGSYS">System Configuration</a></td>
-	<td class="$MENU_AP$"><a href="http://$WEB_ADDRESS$/CONFIGAP">AP Configuration</a></td>
-	<td class="$MENU_STA$"><a href="http://$WEB_ADDRESS$/CONFIGSTA">Station Configuration</a></td>
-	<td class="$MENU_PRINTER$"><a href="http://$WEB_ADDRESS$/PRINTER">Printer Status</a></td>
-	<td class="$MENU_SETTINGS$"><a href="http://$WEB_ADDRESS$/SETTINGS">Extra Settings</a></td>
-	<td width=100%>&nbsp;</td>
-	<td>FW:  V$FW_VER$</td>
-	<td><a href="https://github.com/luc-github/ESP8266" >Github</a></td>
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%; font-size:10px;}
+body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333333;background-color:#ffffff;}
+table{border:0px;border-spacing:0;max-width:100%;}
+.table-bordered{ width:100%; border:1px solid #dddddd;margin-bottom:20px;}
+th{text-align:left;}
+td{white-space:nowrap; padding:2mm;}
+.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9;}
+.nav{ width:100%; color:#cccccc;padding-left:10;padding-right:10;list-style:none;background-color:#333333;border-radius:6px ;margin-bottom:20px;}
+.panel{margin-bottom:20px;background-color:#ffffff;border:1px solid #dddddd;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05);}
+.panel-body{padding:15px;}
+.panel-heading{padding:10px 15px;color:#333333;background-color:#f5f5f5;border-color:#dddddd;border-top-right-radius:3px;border-top-left-radius:3px;border-bottom:1px solid #dddddd;}
+a{position:relative;display:block;padding:10px 15px;text-decoration:none;color:#cccccc;}
+.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px;}
+@media (min-width:768px){.container{width:750px;}}
+@media (min-width:992px){.container{width:970px;}}
+@media (min-width:1200px){.container{width:1170px;}}
+.text-info{color:#31708f;}
+.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tbody>tr>td{border:1px solid #dddddd;}
+ .active{color:#ffffff;background-color:#000000;}
+ caption{text-align:left;}
+ .btnimg {cursor:hand; border-radius:6px ;;border:1px solid #FFFFFF;}
+</style><title>$PAGE_TITLE$</title> </head><body><div class="container"><table class="nav"><tr width=100%>
+<td class="$MENU_HOME$"><a href="http://$WEB_ADDRESS$">Home</a></td><td class="$MENU_SYSTEM$"><a href="http://$WEB_ADDRESS$/CONFIGSYS">System Configuration</a></td>
+<td class="$MENU_AP$"><a href="http://$WEB_ADDRESS$/CONFIGAP">AP Configuration</a></td><td class="$MENU_STA$"><a href="http://$WEB_ADDRESS$/CONFIGSTA">Station Configuration</a></td>
+<td class="$MENU_PRINTER$"><a href="http://$WEB_ADDRESS$/PRINTER">Printer Status</a></td><td class="$MENU_SETTINGS$"><a href="http://$WEB_ADDRESS$/SETTINGS">Extra Settings</a></td>
+<td width=100%>&nbsp;</td><td>FW:  V$FW_VER$</td><td><a href="https://github.com/luc-github/ESP8266" >Github</a></td>
 </tr>
 </table>
diff --git a/esp8266/data/home.tpl b/esp8266/data/home.tpl
index 5959b314..6001fc8b 100644
--- a/esp8266/data/home.tpl
+++ b/esp8266/data/home.tpl
@@ -50,5 +50,8 @@ $INCLUDE[header.inc]$
 </div>
 </div>
 </div>
-$INCLUDE[footer.inc]$
+$SERVICE_PAGE$
+</body>
+</html>
+
 
diff --git a/esp8266/data/printer.tpl b/esp8266/data/printer.tpl
index 2c119e9e..106f4f6f 100644
--- a/esp8266/data/printer.tpl
+++ b/esp8266/data/printer.tpl
@@ -1,134 +1,80 @@
 $INCLUDE[header.inc]$
 <table>
 <tr><td style="padding:0px;"><div id="Extruder1" style="visibility:hidden;height:0px;"> 
-<table><tr><td><label>E1:&nbsp;</label></td>
-<td id="data_extruder1"></td><td>0<input id="rangeinput1" type="range" min=0 max=270 onchange="Updatenumber('1');">270</td>
-<td><input class="form-control" id="numberinput1" type="number" min=0 max=270 step=1 value=0 onchange="Updaterange('1');"></td><td> &#176;C
-<td><input type="submit" value="Set" onclick="SendValue( 'M104 T0 S', '1');"></td></tr></table></div></td></tr>
+<table><tr><td>E1:&nbsp;</td><td id="data_extruder1"></td>
+<td><input class="form-control" id="numberinput1" type="number" min=0 max=270 step=1 value=0></td><td>&#176;C
+<input type="submit" value="Set" onclick="SendValue( 'M104 T0 S', '1');"></td></tr></table></div></td></tr>
 <tr ><td style="padding:0px;"><div id="Extruder2" style="visibility:hidden;height:0px;">
-<table><tr><td><label>E2:&nbsp;</label></td>
-<td id="data_extruder2"></td><td>0<input id="rangeinput2" type="range" min=0 max=270 onchange="Updatenumber('2');">270</td>
-<td><input class="form-control" id="numberinput2" type="number" min=0 max=270 step=1 value=0 onchange="Updaterange('2');"></td><td>&#176;C
-<input type="submit" value="Set" onclick="SendValue( 'M104 T1 S', '2');">
-</td></tr></table></div></td></tr>
+
+<table><tr><td>E2:&nbsp;</td><td id="data_extruder2"></td>
+<td><input class="form-control" id="numberinput2" type="number" min=0 max=270 step=1 value=0></td><td>&#176;C
+<input type="submit" value="Set" onclick="SendValue( 'M104 T1 S', '2');"></td></tr></table></div></td></tr>
 <tr><td style="padding:0px;"><div id="Bed" style="visibility:hidden;height:0px;">
-<table><tr><td><label>Bed:</label></td>
-<td id="data_bed"></td><td>0<input id="rangeinputbed" type="range" min=0 max=130 onchange="Updatenumber('bed');">130</td>
-<td><input class="form-control" id="numberinputbed"type="number" min=0 max=270 step=1 value=0 onchange="Updaterange('bed');"></td><td>&#176;C
-<input type="submit" value="Set" onclick="SendValue( 'M140 S', 'bed');">
-</td></tr></table></div></td></tr>
+
+<table><tr><td>Bed:</td><td id="data_bed"></td>
+<td><input class="form-control" id="numberinputbed"type="number" min=0 max=270 step=1 value=0></td><td>&#176;C
+<input type="submit" value="Set" onclick="SendValue( 'M140 S', 'bed');"></td></tr></table></div></td></tr>
 <tr><td id="speed"><table><tr>
-<td><label>Speed:</label></td><td class="text-info" id="currentspeed"></td>
-<td>0<input id="rangeinputspeed" type="range" min=0 max=300 onchange="Updatenumber('speed');">300</td>
-<td><input class="form-control" id="numberinputspeed" type="number" size="3" min=0 max=300 step=1 value=0 onchange="Updaterange('speed');"></td><td>%
+<td>Speed:</td><td class="text-info" id="currentspeed"></td>
+<td><input class="form-control" id="numberinputspeed" type="number" size="3" min=0 max=300 step=1 value=0></td><td>%
 <input type="submit" value="Set" onclick="SendValue( 'M220 S', 'speed');"></td>
-<td>&nbsp;&nbsp;</td><td>Status:</td><td id="status" align="center" valign="middle">
-<svg width="20" height="20"><circle cx="10" cy="10" r="8" stroke="black" stroke-width="2" fill="white"></circle></svg></td>
-<td id="status-text"></td><td>&nbsp;&nbsp;</td><td class="btnimg" onclick="OnclickEmergency();">
-<svg width="40" height="40" viewBox="0 0 40 40"><circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="red" />
-<circle cx="20" cy="20" r="10" stroke="black" stroke-width="4" fill="red" /><rect x="15" y="8" width="10" height="10" style="fill:red;stroke-width:1;stroke:red" />
-<rect x="18" y="6" rx="1" ry="1" width="4" height="14" style="fill:black;stroke-width:1;stroke:black" /></svg></td></tr></table></td></tr>
-<tr><td id="flow"><table><tr><td><label>Flow:</label></td><td class="text-info" id="currentflow"></td>
-<td>0<input id="rangeinputflow" type="range" min=0 max=300 onchange="Updatenumber('flow');">300</td>
-<td><input class="form-control" id="numberinputflow" size="3" type="number" min=0 max=300 step=1 value=0 onchange="Updaterange('flow');"></td><td>%
+<td>&nbsp;&nbsp;</td><td>Status:</td><td id="status">&#9711;</td>
+<td style="height:50px;width:100px;"  id="status-text"></td><td>&nbsp;&nbsp;</td><td class="btnimg" style="color:#ffffff;background-color:#d9534f;border:1px solid #d43f3a;" onclick="OnclickEmergency();">Emergency</td></tr></table></td></tr>
+<tr><td id="flow"><table><tr><td>Flow:</td><td class="text-info" id="currentflow"></td>
+<td><input class="form-control" id="numberinputflow" size="3" type="number" min=0 max=300 step=1 value=0 ></td><td>%
 <input type="submit" value="Set" onclick="SendValue( 'M221 S', 'flow');"></td><td>&nbsp;&nbsp;</td>
-<td><label>X:</label></td><td class="text-info" id="posx"></td><td>&nbsp;&nbsp;</td><td><label>Y:</label></td><td class="text-info" id="posy"></td><td>&nbsp;&nbsp;</td>
-<td><label>Z:</label></td><td class="text-info" id="posz" ></td></tr></table></td></tr>
-<tr><td><table width="100%"><tr><td width="auto"><label>Command:</label></td>
+<td>X:</td><td class="text-info" id="posx"></td><td>&nbsp;&nbsp;</td><td>Y:</td><td class="text-info" id="posy"></td><td>&nbsp;&nbsp;</td>
+<td>Z:</td><td class="text-info" id="posz" ></td></tr></table></td></tr>
+<tr><td><table width="100%"><tr><td width="auto">Command:</td>
 <td width="100%"><input class="form-control" id="cmd" type="text" style="width: 100%;"></td>
 <td width="auto"><input type="submit" value="Send" onclick="Sendcustomcommand();"></td></tr></table></td></tr>
-<tr><td><hr></td></tr><tr><td><table><tr><td><label>Info:</label></td><td width=100% id="infomsg" class="text-info"></td></tr></table></tr>
-<tr><td><hr></td></tr><tr><td><table><tr><td><label>Error:</label></td><td width=100% id="errormsg" class="text-info"></td></tr></table></tr>
-<tr><td><hr></td></tr><tr><td><table><tr><td><label>Status:</label></td><td width=100% id="statusmsg" class="text-info"></td></tr></table></tr>
-<tr><td><hr></td></tr><tr><td><table><tr><td class="btnimg" onclick="Sendcommand('M24');">
-<svg width="40" height="40" viewBox="0 0 40 40"><circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="white" /><polygon points="15,10 30,20 15,30" fill:"white" stroke:"white" stroke-width:"1" /></svg></td>
-<td class="btnimg" onclick="Sendcommand('M25');"><svg width="40" height="40" viewBox="0 0 40 40"> <circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="white" />
-<rect x="10" y="10" width="7" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /> <rect x="23" y="10" width="7" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /></svg></td>
-<td class="btnimg" onclick="Sendcommand('M50');"><svg width="40" height="40" viewBox="0 0 40 40"><circle cx="20" cy="20" r="18" stroke="black" stroke-width="2" fill="white" />
-<rect x="10" y="10" width="20" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /></svg></td>
-<td class="btnimg" onclick="alert('Not yet implemented');"><svg width="40" height="40" viewBox="0 0 40 40"><rect x="5" y="10" width="30" height="20" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" />
-<rect x="20" y="5" width="15" height="15" rx="2" ry="2" style="fill:rgb(0,0,0);stroke-width:1;stroke:rgb(0,0,0)" /><text x="10" y="25" font-family="Verdana" font-size="14" fill="white">SD</text></svg></td>
-<td>&nbsp;</td></tr></table></td></tr><tr><td><table><tr align="center" valign="middle"><td class="btnimg" onclick=" Sendcommand('G28 X');">
-<svg width="40" height="40" viewBox="0 0 40 40" ><polygon points="7,40 7,25 4,28 0,24 20,4 26,10 26,6 32,6 32,16 40,24 36,28 33,25 33,40" fill="black" stroke-width:"1" stroke:"black" />
-<line x1="25" y1="8" x2="33" y2="16" style="stroke:white;stroke-width:1" /><polyline points="4,28 20,12 36,28" style="fill:none;stroke:white;stroke-width:1" />
-<text x="15" y="35" font-family="Verdana" font-size="14" fill="white">X</text></svg></td><td>
-<table><tr><td class="btnimg" onclick="SendJogcommand( 'Y-10',XYfeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:7"/><text x="13" y="20" font-family="Verdana" font-size="7" fill="black">-10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Y-1',XYfeedrate);"><svg width="40" height="20" viewBox="0 2 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:5"/><text x="15" y="20" font-family="Verdana" font-size="7" fill="black">-1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Y-0.1',XYfeedrate);"><svg width="40" height="20" viewBox="0 4 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:2"/><text x="12" y="20" font-family="Verdana" font-size="7" fill="black">-0.1</text></svg></td></tr></table></td>
-<td class="btnimg" onclick=" Sendcommand('G28 Y');"><svg width="40" height="40" viewBox="0 0 40 40">
-<polygon points="7,40 7,25 4,28 0,24 20,4 26,10 26,6 32,6 32,16 40,24 36,28 33,25 33,40" fill="blue" stroke-width:"1" stroke:"black" /><line x1="25" y1="8" x2="33" y2="16" style="stroke:white;stroke-width:1" />
-<polyline points="4,28 20,12 36,28" style="fill:none;stroke:white;stroke-width:1" /><text x="15" y="35" font-family="Verdana" font-size="14" fill="white">Y</text></svg></td>
-<td></td><td><table><tr><td class="btnimg" onclick="SendJogcommand( 'Z-10',Zfeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:7"/><text x="13" y="20" font-family="Verdana" font-size="7" fill="black">-10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Z-1',Zfeedrate);"><svg width="40" height="20" viewBox="0 2 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:5"/><text x="15" y="20" font-family="Verdana" font-size="7" fill="black">-1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Z-0.1',Zfeedrate);"><svg width="40" height="20" viewBox="0 4 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:2"/>
-<text x="12" y="20" font-family="Verdana" font-size="7" fill="black">-0.1</text></svg></td></tr></table></td>
-<td></td><td id="JogExtruder1-1" style="visibility:hidden;"><table><tr><td class="btnimg" onclick="SendJogcommand( 'E0-50',Efeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:7"/><text x="13" y="20" font-family="Verdana" font-size="7" fill="black">-50</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E0-10',Efeedrate);"><svg width="40" height="20" viewBox="0 2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:5"/>
-<text x="14" y="20" font-family="Verdana" font-size="7" fill="black">-10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E0-1',Efeedrate);"><svg width="40" height="20" viewBox="0 4 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:2"/>
-<text x="14" y="20" font-family="Verdana" font-size="7" fill="black">-1</text></svg></td></tr></table></td>
-<td></td><td id="JogExtruder2-1" style="visibility:hidden;"><table><tr><td class="btnimg" onclick="SendJogcommand( 'E1-50',Efeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:7"/><text x="13" y="20" font-family="Verdana" font-size="7" fill="black">-50</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E1-10',Efeedrate);"><svg width="40" height="20" viewBox="0 2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:5"/>
-<text x="14" y="20" font-family="Verdana" font-size="7" fill="black">-10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E1-1',Efeedrate);"><svg width="40" height="20" viewBox="0 4 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:2"/>
-<text x="15" y="20" font-family="Verdana" font-size="7" fill="black">-1</text></svg></td></tr></table></td></tr>
-<tr align="center" valign="middle"><td><table><tr><td class="btnimg" onclick="SendJogcommand( 'X10',XYfeedrate);"><svg width="20" height="40" viewBox="12 -10 20 40">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:7" transform="rotate(-90 20 10)"/><text x="22" y="13" font-family="Verdana" font-size="7" fill="black">10</text></svg></td>
-<td class="btnimg" onclick="SendJogcommand( 'X1',XYfeedrate);"><svg width="20" height="40" viewBox="10 -10 20 40"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:5" transform="rotate(-90 20 10)"/>
-<text x="21" y="13" font-family="Verdana" font-size="7" fill="black">1</text></svg></td>
-<td class="btnimg" onclick="SendJogcommand( 'X0.1',XYfeedrate);"><svg width="20" height="40" viewBox="14 -10 20 40">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:2" transform="rotate(-90 20 10)"/><text x="19" y="13" font-family="Verdana" font-size="7" fill="black">0.1</text></svg></td></tr>
-</table></td><td></td><td><table><tr><td class="btnimg" onclick="SendJogcommand( 'X-0.1',XYfeedrate);"><svg width="20" height="40" viewBox="6 -10 20 40">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:3" transform="rotate(90 20 10)"/><text x="7" y="12" font-family="Verdana" font-size="7" fill="black">-0.1</text></svg></td>
-<td class="btnimg" onclick="SendJogcommand( 'X-1',XYfeedrate);"><svg width="20" height="40" viewBox="8 -10 20 40"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:5" transform="rotate(90 20 10)"/>
-<text x="11" y="13" font-family="Verdana" font-size="7" fill="black">-1</text></svg></td><td class="btnimg" onclick="SendJogcommand( 'X-10',XYfeedrate);">
-<svg width="20" height="40" viewBox="8 -10 20 40"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:black;stroke-width:7" transform="rotate(90 20 10)"/>
-<text x="7" y="12" font-size="7" fill="black">-10</text></svg></td></tr></table></td>
-<td></td><td><svg width="20" height="20" viewBox="0 0 20 20"><text x="1" y="18" font-family="Verdana" font-size="22" fill="green">Z</text></svg></td>
-<td></td><td id="JogExtruder1-2" style="visibility:hidden;"><svg width="20" height="20" viewBox="0 0 20 20"><text x="1" y="18" font-family="Verdana" font-size="22" fill="orange">1</text></svg></td>
-<td></td><td id="JogExtruder2-2" style="visibility:hidden;"><svg width="20" height="20" viewBox="0 0 20 20"><text x="1" y="18" font-family="Verdana" font-size="22" fill="pink">2</text></svg></td></tr>
-<tr align="center" valign="middle"><td class="btnimg" onclick=" Sendcommand('G28');"><svg width="40" height="40" viewBox="0 0 40 40"><polygon points="7,40 7,25 4,28 0,24 20,4 26,10 26,6 32,6 32,16 40,24 36,28 33,25 33,40" fill="purple" stroke-width:"1" stroke:"black" />
-<line x1="25" y1="8" x2="33" y2="16" style="stroke:white;stroke-width:1" /><polyline points="4,28 20,12 36,28" style="fill:none;stroke:white;stroke-width:1" /></svg></td><td>
-<table><tr><td class="btnimg" onclick="SendJogcommand( 'Y0.1',XYfeedrate);"><svg width="40" height="20" viewBox="0 -4 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:3" transform="rotate(180 20 10)"/><text x="15" y="6" font-family="Verdana" font-size="7" fill="black">0.1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Y1',XYfeedrate);"><svg width="40" height="20" viewBox="0 -2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:5" transform="rotate(180 20 10)"/>
-<text x="17" y="7" font-family="Verdana" font-size="7" fill="black">1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Y10',XYfeedrate);"><svg width="40" height="20" viewBox="0 0 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:blue;stroke-width:7" transform="rotate(180 20 10)"/>
-<text x="15" y="6" font-family="Verdana" font-size="7" fill="black">10</text></svg></td></tr></table></td>
-<td class="btnimg" onclick=" Sendcommand('G28 Z');"><svg width="40" height="40" viewBox="0 0 40 40"><polygon points="7,40 7,25 4,28 0,24 20,4 26,10 26,6 32,6 32,16 40,24 36,28 33,25 33,40" fill="green" stroke-width:"1" stroke:"black" />
-<line x1="25" y1="8" x2="33" y2="16" style="stroke:white;stroke-width:1" /><polyline points="4,28 20,12 36,28" style="fill:none;stroke:white;stroke-width:1" /><text x="15" y="35" font-family="Verdana" font-size="14" fill="white">Z</text></svg></td>
-<td></td><td><table><tr><td class="btnimg" onclick="SendJogcommand( 'Z0.1',Zfeedrate);"><svg width="40" height="20" viewBox="0 -4 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:3" transform="rotate(180 20 10)"/><text x="14" y="6" font-family="Verdana" font-size="7" fill="black">0.1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Z1',Zfeedrate);"><svg width="40" height="20" viewBox="0 -2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:5" transform="rotate(180 20 10)"/>
-<text x="18" y="7" font-family="Verdana" font-size="7" fill="black">1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'Z10',Zfeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:green;stroke-width:7" transform="rotate(180 20 10)"/><text x="15" y="6" font-family="Verdana" font-size="7" fill="black">10</text></svg></td></tr></table></td>
-<td></td><td id="JogExtruder1-3" style="visibility:hidden;"><table><tr><td class="btnimg" onclick="SendJogcommand( 'E0+1',Efeedrate);"><svg width="40" height="20" viewBox="0 -4 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:3" transform="rotate(180 20 10)"/><text x="18" y="6" font-family="Verdana" font-size="7" fill="black">1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E0+10',Efeedrate);"><svg width="40" height="20" viewBox="0 -2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:5" transform="rotate(180 20 10)"/>
-<text x="14" y="7" font-family="Verdana" font-size="7" fill="black">10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E0+50',Efeedrate);"><svg width="40" height="20" viewBox="0 0 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:orange;stroke-width:7" transform="rotate(180 20 10)"/><text x="15" y="6" font-family="Verdana" font-size="7" fill="black">50</text></svg></td></tr></table></td>
-<td></td><td id="JogExtruder2-3" style="visibility:hidden;"><table><tr><td class="btnimg" onclick="SendJogcommand( 'E1+1',Efeedrate);"><svg width="40" height="20" viewBox="0 -4 40 20">
-<polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:3" transform="rotate(180 20 10)"/><text x="18" y="6" font-family="Verdana" font-size="7" fill="black">1</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E1+10',Efeedrate);"><svg width="40" height="20" viewBox="0 -2 40 20"><polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:5" transform="rotate(180 20 10)"/>
-<text x="14" y="7" font-family="Verdana" font-size="7" fill="black">10</text></svg></td></tr>
-<tr><td class="btnimg" onclick="SendJogcommand( 'E1+50',Efeedrate);"><svg width="40" height="20" viewBox="0 0 40 20" ><polyline points="5,18 20,5 35,18" style="fill:none;stroke:pink;stroke-width:7" transform="rotate(180 20 10)"/>
-<text x="15" y="6" font-family="Verdana" font-size="7" fill="black">50</text></svg></td></tr></table></td></tr></table></td></tr></table>
+<tr><td><hr></td></tr><tr><td><table><tr><td>Info:</td><td width=100% id="infomsg" class="text-info"></td></tr></table></tr>
+<tr><td><hr></td></tr><tr><td><table><tr><td>Error:</td><td width=100% id="errormsg" class="text-info"></td></tr></table></tr>
+<tr><td><hr></td></tr><tr><td><table><tr><td>Status:</td><td width=100% id="statusmsg" class="text-info"></td></tr></table></tr>
+<tr><td><hr></td></tr>
+<tr><td><table>
+<tr><td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M24');">Continue</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M25');">Pause</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="Sendcommand('M50');" >Stop</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="getSDfiles();">Get SD Content</td><td>&nbsp;&nbsp;</td>
+<td id="SDLIST"></td>
+</tr></table></td></tr>
+<tr><td><table>
+<tr><td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28 X');">Home X</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28 Y');">Home Y</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28 Z');" >Home Z</td><td>&nbsp;&nbsp;</td>
+<td class="btnimg" style="color:#ffffff;background-color:#00A058;border-color:#00FF90;" onclick="Sendcommand('G28');">Home All</td>
+</tr></table></td></tr>
+<tr><td >
+<form><table><tr><td>Axis:</td>
+<td><input type="radio" id="X_axis" name="axis" value="X"><label class="control-label" for="X_axis">X</label></td>
+<td><input type="radio" id="Y_axis" name="axis" value="Y"><label class="control-label" for="Y_axis">Y</label></td>
+<td><input type="radio" id="Z_axis"name="axis" value="Z"><label class="control-label" for="Z_axis">Z</label></td>
+<td id="radioE1"><input type="radio" id="E1_axis"name="axis" value="E0"><label class="control-label" for="E1_axis">E1</label></td>
+<td id="radioE2"><input type="radio" id="E2_axis" name="axis" value="E1"><label class="control-label" for="E2_axis">E2</label></td></tr></table></form>
+</td><tr>
+<tr><td >
+<form><table><tr><td>Steps:</td>
+<td><input id="pos01" type="radio" name="position" value="0.1"><label class="control-label" for="pos01">0.1</label></td>
+<td><input id="pos1" type="radio" name="position" value="1"><label class="control-label" for="pos1">1</label></td>
+<td><input id="pos10"type="radio" name="position" value="10"><label class="control-label" for="pos10">10</label></td>
+<td><input id="pos50"type="radio" name="position" value="50"><label class="control-label" for="pos50">50</label></td></tr></table></form>
+</td><tr>
+<tr><td >
+<table><tr>
+<td>Direction:</td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('-');">&nbsp;&nbsp;-&nbsp;&nbsp;</td>
+<td></td><td></td><td></td>
+<td class="btnimg" style="color:#ffffff;background-color:#337ab7;border-color:#2e6da4;" onclick="SendJog('+');" >&nbsp;&nbsp;+&nbsp;&nbsp;</td>
+</td><tr>
+</table>
 <script type="text/javascript">
 var XYfeedrate=$XY_FEEDRATE$;
 var Zfeedrate=$Z_FEEDRATE$;
 var Efeedrate=$E_FEEDRATE$;
 function Sendcommand(commandtxt){
 var xmlhttp = new XMLHttpRequest();
-var url = "http://$WEB_ADDRESS$/CMD?COM="+encodeURIComponent(commandtxt);;
+var url = "http://$WEB_ADDRESS$/CMD?COM="+encodeURIComponent(commandtxt);
 xmlhttp.open("POST", url, true);
 xmlhttp.send();
 }
@@ -138,6 +84,29 @@ ms += new Date().getTime();
 while (new Date() < ms){}
 } 
 
+function SendJog( direction){
+
+var axischecked;
+var feedrate;
+var step;
+var i;
+for (i = 0; i < axis.length; i++) {
+        if (axis[i].checked) {
+            axischecked=axis[i].value;
+        }
+    }
+    for (i = 0; i < pos.length; i++) {
+        if (pos[i].checked) {
+            step=pos[i].value;
+        }
+    }
+   if (axischecked=="X")feedrate=XYfeedrate;
+   else if (axischecked=="Y")feedrate=XYfeedrate;
+   else if (axischecked=="Z")feedrate=Zfeedrate;
+   else feedrate=Efeedrate;
+   SendJogcommand( axischecked+direction+step, feedrate);
+}
+
 function SendJogcommand( cmd, feedrate){
 Sendcommand("G91");
 delay(100);
@@ -156,61 +125,20 @@ document.getElementById("cmd").value="";
 function OnclickEmergency(){
 Sendcommand("M112");
 }
-function Updatenumber(item){
-document.getElementById("numberinput"+item).value=document.getElementById("rangeinput"+item).value;
-}
-function Updaterange(item){
-document.getElementById("rangeinput"+item).value=document.getElementById("numberinput"+item).value;
-}
-Updaterange('1');
-Updaterange('2');
-Updaterange('bed');
-Updaterange('speed');
-Updaterange('flow');
 var pulse=true;
 var initialization_done = false;
+
 function displaytemp(temperature, target,item){
-var displaypicture = "<svg height=\"30px \" width=\"300px \" xmlns=\"http://wwww.w3.org/2000/svg\">\n<linearGradient id=\"gradient\">\n";
 var description = String (temperature) + "/";
 if (target>0)description += String (target);
 else description += "Off ";
-displaypicture+="<stop class=\"begin\" style=\"stop-color:green;\" offset=\"0%\"/>\n";
-displaypicture+="<stop class=\"middle\" style=\"stop-color:yellow;\" offset=\"100%\"/>\n</linearGradient>\n<linearGradient id=\"gradient2\">\n";
-displaypicture+="<stop class=\"middle\" style=\"stop-color:yellow;\" offset=\"0%\"/>\n<stop class=\"end\" style=\"stop-color:red;\" offset=\"100%\"/>\n";
-displaypicture+="</linearGradient>\n<rect x=\"10\" y=\"4\" width=\"24\" height=\"21\" style=\"fill:url(#gradient)\" />\n";
-displaypicture+="<rect x=\"34\" y=\"4\" width=\"280\" height=\"21\" style=\"fill:url(#gradient2)\" />\n<line x1=\"";
-displaypicture+=String(target+10);
-displaypicture+="\" y1=\"4\" x2=\"";
-displaypicture+=String(target+10);
-displaypicture+="\" y2=\"25\" style=\"stroke:rgb(255,255,255);stroke-width:1\" />\n<path d=\"M";
-displaypicture+=String(temperature+5);
-displaypicture+=" 0 L";
-displaypicture+=String(temperature+15);
-displaypicture+=" 0 L";
-displaypicture+=String(temperature+10);
-displaypicture+=" 8 Z\" stroke=\"white\" stroke-width=\"1\" />\n<path d=\"M";
-displaypicture+=String(temperature+5);
-displaypicture+=" 30 L";
-displaypicture+=String(temperature+15);
-displaypicture+=" 30 L";
-displaypicture+=String(temperature+10);
-displaypicture+=" 22 Z\" stroke=\"white\" stroke-width=\"1\"/>\n<text x=\"30\" y=\"19\" fill=\"black\" style=\"font-family: calibri; font-size:10pt;\">\n";
-displaypicture+=description;
-displaypicture+=" &#176;C</text>\n</svg>";
-document.getElementById(item).innerHTML=displaypicture;
+description+=" &#176;C";
+document.getElementById(item).innerHTML=description;
 }
 function displaystatus(status){
-var content ="<svg width=\"20\" height=\"20\"><circle cx=\"10\" cy=\"10\" r=\"8\" stroke=\"black\" stroke-width=\"2\" fill=\"";
-if (status=="Connected"){
-if (pulse)content +="#00FF00";
-else content +="#007F0E";}
-else if (status=="Busy"){
-if (pulse)content +="#FFD800";
-else content +="#7F6A00";}
-else{
-if (pulse)content +="#FF0000";
-else content +="#7F0000";}
-content +="\"></circle></svg>";
+var content ;
+if (pulse)content ="&#10752;";
+else content ="&#10687;";
 pulse=!pulse;
 document.getElementById("status").innerHTML=content;
 document.getElementById("status-text").innerHTML=status;
@@ -220,36 +148,25 @@ function dispatchstatus(jsonresponse){
 if(jsonresponse.heater[0].active==1){
 document.getElementById("Extruder1").style.visibility="visible";
 document.getElementById("Extruder1").style.height="auto";
-document.getElementById("JogExtruder1-1").style.visibility="visible";
-document.getElementById("JogExtruder1-2").style.visibility="visible";
-document.getElementById("JogExtruder1-3").style.visibility="visible";
-displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1");
-Updaterange('1');}
+document.getElementById("radioE1").style.visibility="visible";
+displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1");}
 else {
 document.getElementById("Extruder1").style.visibility="hidden";
 document.getElementById("Extruder1").style.height="0px";
-document.getElementById("JogExtruder1-1").style.visibility="hidden";
-document.getElementById("JogExtruder1-2").style.visibility="hidden";
-document.getElementById("JogExtruder1-3").style.visibility="hidden";}
+document.getElementById("radioE1").style.visibility="hidden";}
 if(jsonresponse.heater[1].active==1){
 document.getElementById("Extruder2").style.visibility="visible";
 document.getElementById("Extruder2").style.height="auto";
-document.getElementById("JogExtruder2-1").style.visibility="visible";
-document.getElementById("JogExtruder2-2").style.visibility="visible";
-document.getElementById("JogExtruder2-3").style.visibility="visible";
-displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2");
-Updaterange('2');}
+document.getElementById("radioE2").style.visibility="visible";
+displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2");}
 else {
 document.getElementById("Extruder2").style.visibility="hidden";
 document.getElementById("Extruder2").style.height="0px";
-document.getElementById("JogExtruder2-1").style.visibility="hidden";
-document.getElementById("JogExtruder2-2").style.visibility="hidden";
-document.getElementById("JogExtruder2-3").style.visibility="hidden";}
+document.getElementById("radioE2").style.visibility="hidden";}
 if(jsonresponse.heater[2].active==1){
 document.getElementById("Bed").style.visibility="visible";
 document.getElementById("Bed").style.height="auto";
-displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed");
-Updaterange('bed');}
+displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed");}
 else {
 document.getElementById("Bed").style.visibility="hidden";
 document.getElementById("Bed").style.height="0px";}
@@ -259,29 +176,21 @@ document.getElementById("posz").innerHTML=jsonresponse.Zpos;
 displaystatus(jsonresponse.status);
 var content="";
 for (i = 0; i < jsonresponse.InformationMsg.length; i++) { 
-if (i==jsonresponse.InformationMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.InformationMsg[i].line+ "</b>";
-else content +="<li style='list-style-type: circle;'>"+jsonresponse.InformationMsg[i].line;
-content += "</li>";}
+content +="<li style='list-style-type: circle;'>"+jsonresponse.InformationMsg[i].line+"</li>";}
 document.getElementById("infomsg").innerHTML=content;
 content="";
 for (i = 0; i < jsonresponse.ErrorMsg.length; i++){ 
-if (i==jsonresponse.ErrorMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.ErrorMsg[i].line+ "</b>";
-else content +="<li style='list-style-type: circle;'>"+jsonresponse.ErrorMsg[i].line;
-content +="</li>";}
+content +="<li style='list-style-type: circle;'>"+jsonresponse.ErrorMsg[i].line+"</li>";}
 document.getElementById("errormsg").innerHTML=content;
 content="";
 for (i = 0; i < jsonresponse.StatusMsg.length; i++) 
 { 
-if (i==jsonresponse.StatusMsg.length-1)content +="<li style='list-style-type: disc;'><b>" +jsonresponse.StatusMsg[i].line+ "</b>";
-else content +="<li style='list-style-type: circle;'>"+jsonresponse.StatusMsg[i].line;
-content +="</li>";
+content +="<li style='list-style-type: circle;'>"+jsonresponse.StatusMsg[i].line+"</li>";
 }
 document.getElementById("statusmsg").innerHTML=content;
 if (!initialization_done){
 document.getElementById("numberinputspeed").value=jsonresponse.speed;
-Updaterange('speed');
 document.getElementById("numberinputflow").value=jsonresponse.flow;
-Updaterange('flow');
 initialization_done=true;}
 document.getElementById("currentspeed").innerHTML=jsonresponse.speed + "%";
 document.getElementById("currentflow").innerHTML=jsonresponse.flow + "%";
@@ -298,6 +207,57 @@ dispatchstatus(jsonresponse);}
 xmlhttp.open("GET", url, true);
 xmlhttp.send();
 }
+
+function printfile(){
+var filename = document.getElementById("sdfilelist").value;
+if (filename.length>0){
+Sendcommand("M23 " + filename);
+delay(100);
+Sendcommand("M24");}
+}
+
+function refreshfilelist(jsonresponse){
+var list2display="<select id=\"sdfilelist\">";
+var content="";
+var i;
+for (i = 0; i < jsonresponse.length; i++){ 
+content =jsonresponse[i].entry;
+var tcontent=content.split(" ");
+if (tcontent.length==2){
+list2display+="<OPTION value=\"";
+list2display+=tcontent[0];
+list2display+="\">";
+list2display+=tcontent[0] ;
+list2display+="</OPTION>";}
+}
+list2display+="</select>";
+if ( jsonresponse.length>0){
+list2display+="&nbsp;&nbsp;<input type=\"button\"  Onclick=\"printfile();\" value=\"Print\" />";}
+document.getElementById("SDLIST").innerHTML=list2display;
+}
+
+function getSDfiles(){
+document.getElementById("SDLIST").innerHTML="";
+Sendcommand("M20");
+delay(1000);
+var xmlhttp = new XMLHttpRequest();
+var url = "http://$WEB_ADDRESS$/SDFILES";
+xmlhttp.onreadystatechange = function() {
+if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+var jsonresponse = JSON.parse(xmlhttp.responseText);
+refreshfilelist(jsonresponse);}
+}
+xmlhttp.open("GET", url, true);
+xmlhttp.send();
+}
+
 setInterval(function(){getstatus();},$REFRESH_PAGE$);
+var axis = document.forms[0];
+var pos = document.forms[1];
+axis[0].checked=true;
+pos[0].checked=true;
 </script>
-$INCLUDE[footer.inc]$
+$SERVICE_PAGE$
+</body>
+</html>
+
diff --git a/esp8266/data/restart.tpl b/esp8266/data/restart.tpl
deleted file mode 100644
index 973cd65b..00000000
--- a/esp8266/data/restart.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<HTML>
-<HEAD>
-<title>Restarting...</title> 
-</HEAD>
-<BODY>
-<CENTER>Restarting, please wait....
-<BR>
-<PROGRESS name='prg' id='prg'>
-</CENTER>
-<script>
-var i = 0;
-var interval; 
-var x = document.getElementById("prg"); 
-x.max=40; 
-interval = setInterval(function(){
-	i=i+1; 
-	var x = document.getElementById("prg"); 
-	x.value=i; 
-	if (i>40) 
-		{
-		clearInterval(interval);
-		window.location.href='/';
-		}
-	},1000);
-</script>
-</BODY>
-</HTML>
diff --git a/esp8266/data/settings.tpl b/esp8266/data/settings.tpl
index 438be91f..1dc90c58 100644
--- a/esp8266/data/settings.tpl
+++ b/esp8266/data/settings.tpl
@@ -41,7 +41,7 @@ content +="<TR><TD style=\"cursor:hand;\"  onclick=\"window.open('"+jsonresponse
 content +=jsonresponse.files[i].name;
 content +="</TD><TD>";
 content +=jsonresponse.files[i].size;
-content +="</TD><TD width='0%'><div style=\"cursor:hand; background:red; color:white;border-radius:12px ;\" onclick=\"Delete('"+jsonresponse.files[i].name+"')\">&nbsp;&#215;&nbsp;";
+content +="</TD><TD width='0%'><div style=\"cursor:hand; background:red; color:white;border-radius:12px ;\" onclick=\"Delete('"+jsonresponse.files[i].name+"')\">&nbsp;&#215;&nbsp;"; 
 content +="</div></TD></TR>";
 }
  document.getElementById('file_list').innerHTML=content;}
diff --git a/esp8266/data/system.tpl b/esp8266/data/system.tpl
index 8fe99276..a5fe1420 100644
--- a/esp8266/data/system.tpl
+++ b/esp8266/data/system.tpl
@@ -27,4 +27,7 @@ $SUCCESS_MSG$
 </div>
 </div>
 </div>
-$INCLUDE[footer.inc]$
+$SERVICE_PAGE$
+</body>
+</html>
+
diff --git a/page5.png b/page5.png
index 9814821f..6bc16847 100644
Binary files a/page5.png and b/page5.png differ