diff --git a/src/custom.htm b/src/custom.htm
index 4ad1215c0..1caa74265 100644
--- a/src/custom.htm
+++ b/src/custom.htm
@@ -165,7 +165,11 @@
     <div class="row text-center">
         <div class="col-md-8 col-md-offset-2">
             <h1>Dashboard</h1>
-            <p>Real-time values from the EMS-ESP device are shown here.</p>
+            <p>Real-time values from the EMS-ESP device are shown here.
+                <div class="row form-group">
+                    <button onclick="refreshEMS()" class="btn btn-primary">Refresh Data</button>
+                </div>
+            </p>
         </div>
         <div class="col-md-8 col-md-offset-2">
             <div class="panel panel-default table-responsive">
@@ -173,7 +177,7 @@
                     <caption>EMS Bus stats</caption>
                     <tr>
                         <td colspan="2">
-                            <h3><span id="msg"></span></h3>
+                            <b><div id="msg" role="alert"></div></b>
                         </td>
                     </tr>
                     <tr>
@@ -207,7 +211,7 @@
                 </table>
             </div>
 
-            <div class="panel panel-success table-responsive" id="thermostat_show">
+            <div class="panel panel-warning table-responsive" id="thermostat_show">
                 <div class="panel-heading">Thermostat</div>
                 <table class="table table-hover table-bordered table-condensed">
                     <tr>
@@ -228,12 +232,5 @@
             </div>
 
         </div>
-        <br>
-        <br>
-        <div class="row form-group">
-            <div class="col-xs-9 col-md-8">
-                <button onclick="refreshEMS()" class="btn btn-primary btn-sm pull-center">Refresh...</button>
-            </div>
-        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/custom.js b/src/custom.js
index 0d76f10e6..4fb6dde56 100644
--- a/src/custom.js
+++ b/src/custom.js
@@ -82,9 +82,9 @@ function savecustom() {
 function listCustomStats() {
     document.getElementById("msg").innerHTML = ajaxobj.emsbus.msg;
     if (ajaxobj.emsbus.ok) {
-        document.getElementById("msg").className = "label label-success";
+        document.getElementById("msg").className = "alert alert-success";
     } else {
-        document.getElementById("msg").className = "label label-danger";
+        document.getElementById("msg").className = "alert alert-danger";
         document.getElementById("thermostat_show").style.display = "none";
         document.getElementById("boiler_show").style.display = "none";
         return;
@@ -98,11 +98,7 @@ function listCustomStats() {
         if (type == 1) {
             var color = "info";
         } else if (type == 2) {
-            var color = "success";
-        } else if (type == 3) {
             var color = "warning";
-        } else if (type == 4) {
-            var color = "danger";
         } else {
             var color = "";
         }
diff --git a/src/websrc/myesp.htm b/src/websrc/myesp.htm
index 458f5523e..82bb29ed8 100644
--- a/src/websrc/myesp.htm
+++ b/src/websrc/myesp.htm
@@ -64,7 +64,7 @@
             <div class="col-md-8 col-md-offset-2">
                 <div class="panel panel-default">
                     <div class="panel-heading">
-                        <h3 class="panel-title">Please wait about 10 seconds while the system restarts...</h3>
+                        <h3 class="panel-title">Please wait a few seconds while the system restarts...</h3>
                     </div>
                     <div class="panel-body">
                         <div class="progress">
@@ -105,9 +105,9 @@
     </div>
 
     <div class="row form-group">
-        <label class="col-xs-3">Serial<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
+        <label class="col-xs-3">Serial Port<i style="margin-left: 10px;" class="glyphicon glyphicon-info-sign"
                 aria-hidden="true" data-toggle="popover" data-trigger="hover" data-placement="right"
-                data-content="Please choose if you want to enable Serial output for debugging"></i></label>
+                data-content="Please choose if you want to enable Serial port for debugging"></i></label>
         <div class="col-xs-9">
             <form>
                 <label class="radio-inline">