diff --git a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt
index beaee78c4..f651c04f3 100644
--- a/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt
+++ b/net/relayd/src/opnsense/mvc/app/views/OPNsense/Relayd/index.volt
@@ -26,7 +26,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #}
 
-<script type="text/javascript">
+<script>
+
    $( document ).ready(function() {
 
 	   $('#btnConfigTest').unbind('click').click(function(){
@@ -46,9 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 	         $('#btnReload').blur();
 	         $("#responseMsg").removeClass("hidden");
 	         $("#responseMsg").html(data['result']);
-	         ajaxCall(url="/api/relayd/service/status", sendData={}, callback=function(data,status) {
-	            updateServiceStatusUI(data['status']);
-	         });
+                 updateServiceControlUI('relayd');
 	      });
 	   });
 	   /**
@@ -57,17 +56,13 @@ POSSIBILITY OF SUCH DAMAGE.
 	   mapDataToFormUI({'frm_GeneralSettings':"/api/relayd/settings/get/general/"}).done(function(){
 		   formatTokenizersUI();
 	      $('#relayd\\.general\\.log').selectpicker('refresh');
-	      ajaxCall(url="/api/relayd/service/status", sendData={}, callback=function(data,status) {
-		       updateServiceStatusUI(data['status']);
-	      });
+              updateServiceControlUI('relayd');
 	   });
 	   $('#btn_ApplyGeneralSettings').unbind('click').click(function(){
 		   $("#frm_GeneralSettings_progress").addClass("fa fa-spinner fa-pulse");
 	      var frm_id = 'frm_GeneralSettings';
 	      saveFormToEndpoint(url = "/api/relayd/settings/set/general/",formid=frm_id,callback_ok=function(){
-		         ajaxCall(url="/api/relayd/service/status", sendData={}, callback=function(data,status) {
-               updateServiceStatusUI(data['status']);
-            });
+                  updateServiceControlUI('relayd');
 	      });
 	      $("#"+frm_id+"_progress").removeClass("fa fa-spinner fa-pulse");
 	      $("#btn_ApplyGeneralSettings").blur();