diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
index 116aba171..05f02ee88 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php
@@ -28,7 +28,6 @@ class BgpController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("BGP Settings");
         $this->view->bgpForm = $this->getForm("bgp");
         $this->view->formDialogEditBGPNeighbor = $this->getForm("dialogEditBGPNeighbor");
         $this->view->formDialogEditBGPASPaths = $this->getForm("dialogEditBGPASPath");
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
index 53ed82e2a..6c3e824ac 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php
@@ -28,28 +28,23 @@ class DiagnosticsController extends \OPNsense\Base\IndexController
 {
     public function bgpAction()
     {
-        $this->view->title = gettext("Diagnostics: BGP");
         $this->view->diagnosticsForm = $this->getForm("diagnostics");
         $this->view->pick('OPNsense/Quagga/diagnosticsbgp');
     }
     public function ospfAction()
     {
-        $this->view->title = gettext("Diagnostics: OSPF");
         $this->view->pick('OPNsense/Quagga/diagnosticsospf');
     }
     public function ospfv3Action()
     {
-        $this->view->title = gettext("Diagnostics: OSPFv3");
         $this->view->pick('OPNsense/Quagga/diagnosticsospfv3');
     }
     public function generalAction()
     {
-        $this->view->title = gettext("Diagnostics: General");
         $this->view->pick('OPNsense/Quagga/diagnosticsgeneral');
     }
     public function logAction()
     {
-        $this->view->title = gettext("Diagnostics: Log");
         $this->view->pick('OPNsense/Quagga/log');
     }
 }
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
index b030ea9d4..db963b90f 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php
@@ -31,7 +31,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Routing-Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->pick('OPNsense/Quagga/general');
     }
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
index 3eaaa05b3..501e99baf 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php
@@ -28,7 +28,6 @@ class Ospf6Controller extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("OSPFv3 Settings");
         $this->view->ospf6Form = $this->getForm("ospf6");
         $this->view->formDialogEditInterface = $this->getForm("dialogEditOSPF6Interface");
         $this->view->pick('OPNsense/Quagga/ospf6');
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
index 4d6fa815f..d445c3e6f 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php
@@ -31,7 +31,6 @@ class OspfController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("OSPF Settings");
         $this->view->generalForm = $this->getForm("ospf");
         $this->view->formDialogEditNetwork = $this->getForm("dialogEditOSPFNetwork");
         $this->view->formDialogEditInterface = $this->getForm("dialogEditOSPFInterface");
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
index 31eae7ba1..357da5c11 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php
@@ -31,7 +31,6 @@ class RipController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("RIP Settings");
         $this->view->ripForm = $this->getForm("rip");
         $this->view->pick('OPNsense/Quagga/rip');
     }
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
index fb3a3f866..9175b3966 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
@@ -39,10 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
     <div id="general" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':bgpForm,'id':'frm_bgp_settings'])}}
-
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
@@ -170,10 +169,12 @@ $(document).ready(function() {
   // link save button to API set action
   $("#saveAct").click(function(){
       saveFormToEndpoint(url="/api/quagga/bgp/set",formid='frm_bgp_settings',callback_ok=function(){
+        $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
           ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
             updateServiceStatusUI(data['status']);
           });
+          $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
         });
       });
   });
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
index 2da315072..4abab85fb 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt
@@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #}
 <div class="content-box" style="padding-bottom: 1.5em;">
     {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
-    <hr />
     <div class="col-md-12">
-        <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+        <hr />
+        <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>
 
@@ -48,12 +48,14 @@ POSSIBILITY OF SUCH DAMAGE.
         // link save button to API set action
         $("#saveAct").click(function(){
             saveFormToEndpoint(url="/api/quagga/general/set", formid='frm_general_settings',callback_ok=function(){
-                    ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
-                            ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
-                                    updateServiceStatusUI(data['status']);
-                            });
+                $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
+                ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
+                    ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
+                        updateServiceStatusUI(data['status']);
                     });
-            });
+                    $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
+                });
+            }, true);
         });
     });
 </script>
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
index 2b46723ae..77e774908 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt
@@ -38,10 +38,9 @@ POSSIBILITY OF SUCH DAMAGE.
         <div id="general" class="tab-pane fade in active">
             <div class="content-box" style="padding-bottom: 1.5em;">
                 {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_ospf_settings'])}}
-
                 <div class="col-md-12">
                     <hr />
-                    <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+                    <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
                 </div>
             </div>
         </div>
@@ -141,10 +140,12 @@ $( document ).ready(function() {
   // link save button to API set action
   $("#saveAct").click(function(){
       saveFormToEndpoint(url="/api/quagga/ospfsettings/set",formid='frm_ospf_settings',callback_ok=function(){
+        $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
           ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
             updateServiceStatusUI(data['status']);
           });
+          $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
         });
       });
   });
@@ -178,8 +179,7 @@ $( document ).ready(function() {
       'options':{selection:false, multiSelect:false}
     }
   );
-
-    });
+});
 </script>
 
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditNetwork,'id':'DialogEditNetwork','label':lang._('Edit Network')])}}
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
index 892627c5f..8cec1eb47 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt
@@ -37,10 +37,9 @@ POSSIBILITY OF SUCH DAMAGE.
         <div id="general" class="tab-pane fade in active">
             <div class="content-box" style="padding-bottom: 1.5em;">
                 {{ partial("layout_partials/base_form",['fields':ospf6Form,'id':'frm_ospf6_settings'])}}
-
                 <div class="col-md-12">
                     <hr />
-                    <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+                    <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
                 </div>
             </div>
         </div>
@@ -81,6 +80,7 @@ $( document ).ready(function() {
       formatTokenizersUI();
       $('.selectpicker').selectpicker('refresh');
   });
+
   ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
       updateServiceStatusUI(data['status']);
   });
@@ -88,13 +88,16 @@ $( document ).ready(function() {
   // link save button to API set action
   $("#saveAct").click(function(){
       saveFormToEndpoint(url="/api/quagga/ospf6settings/set",formid='frm_ospf6_settings',callback_ok=function(){
+        $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
           ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
             updateServiceStatusUI(data['status']);
           });
+          $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
         });
       });
   });
+
   $("#grid-interfaces").UIBootgrid(
     { 'search':'/api/quagga/ospf6settings/searchInterface',
       'get':'/api/quagga/ospf6settings/getInterface/',
@@ -105,9 +108,7 @@ $( document ).ready(function() {
       'options':{selection:false, multiSelect:false}
     }
   );
-
-
-    });
+});
 </script>
 
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditInterface,'id':'DialogEditInterface','label':lang._('Edit Interface')])}}
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
index 101ec4f6e..206d3f182 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt
@@ -26,12 +26,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 #}
+
 <div class="content-box" style="padding-bottom: 1.5em;">
     {{ partial("layout_partials/base_form",['fields':ripForm,'id':'frm_rip_settings'])}}
-
     <div class="col-md-12">
         <hr />
-        <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+        <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>
 
@@ -42,6 +42,7 @@ $(document).ready(function() {
       formatTokenizersUI();
       $('.selectpicker').selectpicker('refresh');
   });
+
   ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
       updateServiceStatusUI(data['status']);
   });
@@ -49,14 +50,14 @@ $(document).ready(function() {
   // link save button to API set action
   $("#saveAct").click(function(){
       saveFormToEndpoint(url="/api/quagga/rip/set",formid='frm_rip_settings',callback_ok=function(){
+        $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
         ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) {
           ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) {
             updateServiceStatusUI(data['status']);
           });
+          $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
         });
       });
   });
-
-
-    });
+});
 </script>