diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
index 6ae1bb15c..63355dc4d 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
@@ -48,8 +48,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("collectd start", true);
+            $response = $backend->configdRun("collectd start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -63,6 +65,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("collectd stop");
             return array("response" => $response);
@@ -78,6 +82,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("collectd restart");
             return array("response" => $response);
@@ -111,7 +117,6 @@ class ServiceController extends ApiControllerBase
             $status = "unkown";
         }
 
-
         return array("status" => $status);
     }
 
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
index 56e7bebfa..402315275 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Collectd Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->pick('OPNsense/Collectd/general');
     }
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
index 15bb6d3a2..d093033e2 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/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><i id="saveAct_progress" class=""></i></button>
+        <hr />
+        <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>
 
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/ServiceController.php b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/ServiceController.php
index 6405ae545..a2f04714d 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/ServiceController.php
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/ServiceController.php
@@ -49,8 +49,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("telegraf start", true);
+            $response = $backend->configdRun("telegraf start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -64,6 +66,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("telegraf stop");
             return array("response" => $response);
@@ -79,6 +83,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("telegraf restart");
             return array("response" => $response);
@@ -112,7 +118,6 @@ class ServiceController extends ApiControllerBase
             $status = "unkown";
         }
 
-
         return array("status" => $status);
     }
 
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/GeneralController.php b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/GeneralController.php
index 6fe9fdb69..81bd5bed0 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/GeneralController.php
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Telegraf Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->pick('OPNsense/Telegraf/general');
     }
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/InputController.php b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/InputController.php
index 9e8379c0b..3d0150f90 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/InputController.php
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/InputController.php
@@ -32,7 +32,6 @@ class InputController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Telegraf Inputs");
         $this->view->inputForm = $this->getForm("input");
         $this->view->pick('OPNsense/Telegraf/input');
     }
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/OutputController.php b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/OutputController.php
index d4b299c1c..542fc1b88 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/OutputController.php
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/OutputController.php
@@ -32,7 +32,6 @@ class OutputController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Telegraf Outputs");
         $this->view->outputForm = $this->getForm("output");
         $this->view->pick('OPNsense/Telegraf/output');
     }
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/general.volt b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/general.volt
index 3909801d2..e7622f55c 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/general.volt
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/general.volt
@@ -34,9 +34,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_general_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/input.volt b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/input.volt
index 9df20427b..bee93474d 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/input.volt
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/input.volt
@@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE.
     <div id="input" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':inputForm,'id':'frm_input_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/output.volt b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/output.volt
index 631a38815..2028c4c13 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/output.volt
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/views/OPNsense/Telegraf/output.volt
@@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE.
     <div id="output" class="tab-pane fade in active">
         <div class="content-box" style="padding-bottom: 1.5em;">
             {{ partial("layout_partials/base_form",['fields':outputForm,'id':'frm_output_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile
index 550bf2fe2..a2a4a959d 100644
--- a/net-mgmt/zabbix-proxy/Makefile
+++ b/net-mgmt/zabbix-proxy/Makefile
@@ -1,8 +1,7 @@
 PLUGIN_NAME=		zabbix-proxy
 PLUGIN_VERSION=		1.0
-PLUGIN_COMMENT=		Zabbix-Proxy enables decentralized monitoring
+PLUGIN_COMMENT=		Zabbix Proxy enables decentralized monitoring
 PLUGIN_DEPENDS=		zabbix3-proxy
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
-PLUGIN_DEVEL=		yes
 
 .include "../../Mk/plugins.mk"
diff --git a/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc b/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc
index 1229ec897..b357447e9 100644
--- a/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc
+++ b/net-mgmt/zabbix-proxy/src/etc/inc/plugins.inc.d/zabbixproxy.inc
@@ -34,7 +34,7 @@ function zabbixproxy_services()
 
     if (isset($config['OPNsense']['zabbixproxy']['general']['enabled']) && $config['OPNsense']['zabbixproxy']['general']['enabled'] == 1) {
         $services[] = array(
-            'description' => gettext('Zabbix-Proxy Daemon'),
+            'description' => gettext('Zabbix Proxy'),
             'configd' => array(
                 'restart' => array('zabbixproxy restart'),
                 'start' => array('zabbixproxy start'),
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php
index df610d923..e96c386cc 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/Api/ServiceController.php
@@ -48,8 +48,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("zabbixproxy start", true);
+            $response = $backend->configdRun("zabbixproxy start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -63,6 +65,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("zabbixproxy stop");
             return array("response" => $response);
@@ -78,6 +82,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("zabbixproxy restart");
             return array("response" => $response);
@@ -111,7 +117,6 @@ class ServiceController extends ApiControllerBase
             $status = "unkown";
         }
 
-
         return array("status" => $status);
     }
 
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php
index acb4b2fff..4c424b497 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Zabbix-Proxy Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->pick('OPNsense/Zabbixproxy/general');
     }
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
index 5e3723dc6..5df2c2987 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
@@ -3,7 +3,7 @@
         <id>general.enabled</id>
         <label>Enable</label>
         <type>checkbox</type>
-        <help>This will activate the Zabbix-Proxy service.</help>
+        <help>This will activate the Zabbix Proxy service.</help>
     </field>
     <field>
         <id>general.proxymode</id>
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml
index b2a9b16af..6166a2c68 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/ACL/ACL.xml
@@ -1,6 +1,6 @@
 <acl>
    <page-services-zabbixproxy>
-      <name>Services: Zabbix-Proxy</name>
+      <name>Services: Zabbix Proxy</name>
       <patterns>
          <pattern>ui/zabbixproxy/*</pattern>
          <pattern>api/zabbixproxy/*</pattern>
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
index 2dc205a9d..386ab994a 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/zabbixproxy/general</mount>
-    <description>Zabbix-Proxy configuration</description>
+    <description>Zabbix Proxy configuration</description>
     <version>1.0.0</version>
     <items>
         <enabled type="BooleanField">
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml
index 5e657a83c..7b5301743 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
   <Services>
-    <Zabbixproxy VisibleName="Zabbix-Proxy" cssClass="fa fa-eye" url="/ui/zabbixproxy/general/index" />
+    <Zabbixproxy VisibleName="Zabbix Proxy" cssClass="fa fa-eye" url="/ui/zabbixproxy/general/index" />
   </Services>
 </menu>
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt
index 237563fe2..2ee34fd4f 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/general.volt
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/views/OPNsense/Zabbixproxy/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><i id="saveAct_progress" class=""></i></button>
+        <hr />
+        <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>
 
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf b/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf
index 4b117c456..90a81baa1 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf
+++ b/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf
@@ -2,28 +2,28 @@
 command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy start
 parameters:
 type:script
-message:starting Zabbix-Proxy
+message:starting Zabbix Proxy
 
 [stop]
 command:/usr/local/etc/rc.d/zabbix_proxy stop; exit 0
 parameters:
 type:script
-message:stopping Zabbix-Proxy
+message:stopping Zabbix Proxy
 
 [restart]
 command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy restart
 parameters:
 type:script
-message:restarting Zabbix-Proxy
+message:restarting Zabbix Proxy
 
 [reconfigure]
 command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy restart
 parameters:
 type:script
-message:reconfigure Zabbix-Proxy
+message:reconfigure Zabbix Proxy
 
 [status]
 command:/usr/local/etc/rc.d/zabbix_proxy status;exit 0
 parameters:
 type:script_output
-message:request Zabbix-Proxy status
+message:request Zabbix Proxy status
diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
index 27d7cafaf..73ac5afce 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/ServiceController.php
@@ -59,8 +59,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("siproxd start", true);
+            $response = $backend->configdRun("siproxd start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -74,6 +76,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("siproxd stop");
             return array("response" => $response);
@@ -89,6 +93,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("siproxd restart");
             return array("response" => $response);
@@ -122,7 +128,6 @@ class ServiceController extends ApiControllerBase
             $status = "unkown";
         }
 
-
         return array("status" => $status);
     }
 
diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/GeneralController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/GeneralController.php
index d3de941e0..4bc4d2e6b 100644
--- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/GeneralController.php
+++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/GeneralController.php
@@ -32,7 +32,6 @@ class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("Siproxd Settings");
         $this->view->generalForm = $this->getForm("general");
         $this->view->formDialogEditSiproxdUser = $this->getForm("dialogEditSiproxdUser");
         $this->view->formDialogEditSiproxdDomain = $this->getForm("dialogEditSiproxdDomain");
diff --git a/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt b/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
index ef7da04b0..8a53bc367 100644
--- a/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
+++ b/net/siproxd/src/opnsense/mvc/app/views/OPNsense/Siproxd/general.volt
@@ -39,9 +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':generalForm,'id':'frm_general_settings'])}}
-            <hr />
             <div class="col-md-12">
-                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
+                <hr />
+                <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress"></i></button>
             </div>
         </div>
     </div>
@@ -67,7 +67,7 @@ POSSIBILITY OF SUCH DAMAGE.
         </table>
         <div class="col-md-12">
             <hr />
-            <button class="btn btn-primary"  id="saveAct_user" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_user_progress" class=""></i></button>
+            <button class="btn btn-primary"  id="saveAct_user" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_user_progress"></i></button>
             <br /><br />
         </div>
     </div>
@@ -94,7 +94,7 @@ POSSIBILITY OF SUCH DAMAGE.
         </table>
         <div class="col-md-12">
             <hr />
-            <button class="btn btn-primary"  id="saveAct_domain" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_domain_progress" class=""></i></button>
+            <button class="btn btn-primary"  id="saveAct_domain" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_domain_progress"></i></button>
             <br /><br />
         </div>
     </div>
diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
index 0da9416a3..ab8618bb4 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
@@ -60,8 +60,10 @@ class ServiceController extends ApiControllerBase
     public function startAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
-            $response = $backend->configdRun("tinc start", true);
+            $response = $backend->configdRun("tinc start");
             return array("response" => $response);
         } else {
             return array("response" => array());
@@ -75,6 +77,8 @@ class ServiceController extends ApiControllerBase
     public function stopAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("tinc stop");
             return array("response" => $response);
@@ -90,6 +94,8 @@ class ServiceController extends ApiControllerBase
     public function restartAction()
     {
         if ($this->request->isPost()) {
+            // close session for long running action
+            $this->sessionClose();
             $backend = new Backend();
             $response = $backend->configdRun("tinc restart");
             return array("response" => $response);
diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
index b284d1be3..e39afcedd 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/IndexController.php
@@ -38,7 +38,6 @@ class IndexController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext('Tinc VPN');
         // link dialogs
         $this->view->formDialogNetwork = $this->getForm("dialogNetwork");
         $this->view->formDialogHost = $this->getForm("dialogHost");