diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index be78b6187..23948f599 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -73,7 +73,7 @@
     </div>
     <div class="cbi-page-actions">
 	<input type="hidden" name="token" value="<%=token%>" />
-	<button class="btn" type="submit">Submit</button>
+	<input class="cbi-button cbi-button-apply" type="submit" value="<%:Save & Apply%>" /> <input class="cbi-button cbi-button-reset" type="button" value="Reset" onclick="location.href='<%=url('admin/system/openmptcprouter/settings')%>'" />
     </div>
 </form>
 <%+footer%>
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index dd4ecd95b..62822139a 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -247,7 +247,7 @@
 					}
 					if(server_ping == 'DOWN')
 					{
-						statusMessage += 'Can\'t ping server<br />'
+						statusMessage += 'No Server ping response after 1 second<br />'
 					}
 					if(multipath == 'master' && master > 1)
 					{
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index f0fa07510..6c350168f 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -169,7 +169,7 @@
     </div>
     <div class="cbi-page-actions">
 	<input type="hidden" name="token" value="<%=token%>" />
-	<button class="btn" type="submit">Submit</button>
+	<input class="cbi-button cbi-button-apply" type="submit" value="<%:Save & Apply%>" /> <input class="cbi-button cbi-button-reset" type="button" value="Reset" onclick="location.href='<%=url('admin/system/openmptcprouter/wizard')%>'" />
     </div>
 </form>
 <script type="text/javascript">cbi_init();</script>