diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/IndexController.php
index f9e68dd81..0be437645 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\CaptivePortal;
 
 /**
@@ -36,7 +38,7 @@ class IndexController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "Captive Portal";
+        $this->view->title = gettext('Captive Portal');
         // link rule dialog
         $this->view->formDialogZone = $this->getForm("dialogZone");
         // choose template
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/SessionController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/SessionController.php
index 36b504ae6..c44cc0702 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/SessionController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/SessionController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\CaptivePortal;
 
 /**
@@ -36,7 +38,7 @@ class SessionController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "Captive Portal / Sessions";
+        $this->view->title = gettext('Captive Portal Sessions');
         // choose template
         $this->view->pick('OPNsense/CaptivePortal/clients');
     }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/VoucherController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/VoucherController.php
index 43dd62704..8a15209d3 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/VoucherController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/VoucherController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\CaptivePortal;
 
 /**
@@ -36,7 +38,7 @@ class VoucherController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "Captive Portal / Vouchers";
+        $this->view->title = gettext('Captive Portal Vouchers');
         // choose template
         $this->view->pick('OPNsense/CaptivePortal/vouchers');
     }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/FirmwareController.php
index 1ff18b7fd..126c10016 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/FirmwareController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/FirmwareController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Core;
 
 /**
@@ -39,7 +41,7 @@ class FirmwareController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = "Firmware";
+        $this->view->title = gettext('Firmware');
         $this->view->pick('OPNsense/Core/firmware');
         return;
     }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
index 289e925d6..0b3af52cc 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,7 +27,8 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
- namespace OPNsense\Core;
+
+namespace OPNsense\Core;
 
 /**
  * Class IndexController Index controller for core package
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Cron/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Cron/IndexController.php
index baf7eb77e..5cfc6d74c 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Cron/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Cron/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Cron;
 
 /**
@@ -40,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = "Cron settings";
+        $this->view->title = gettext('Cron Settings');
         // include dialog form definitions
         $this->view->formDialogEdit = $this->getForm("dialogEdit");
         $this->view->pick('OPNsense/Cron/index');
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Cron/ItemController.php b/src/opnsense/mvc/app/controllers/OPNsense/Cron/ItemController.php
index 263768359..ecfc8eabc 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Cron/ItemController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Cron/ItemController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Cron;
 
 /**
@@ -41,7 +43,7 @@ class ItemController extends \OPNsense\Base\IndexController
      */
     public function openAction($uuid = null)
     {
-        $this->view->title = "Cron settings";
+        $this->view->title = gettext('Cron Settings');
         $this->view->selected_uuid = $uuid;
         // include dialog form definitions
         $this->view->formDialogEdit = $this->getForm("dialogEdit");
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php
index 64cc3bc04..cc647db48 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/ActivityController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\IndexController;
@@ -38,7 +40,7 @@ class ActivityController extends IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "System Activity";
+        $this->view->title = gettext('System Activity');
         $this->view->pick('OPNsense/Diagnostics/systemactivity');
     }
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
index 1978832cc..0c5e8969d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2016 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\IndexController;
@@ -41,7 +43,7 @@ class InterfaceController extends IndexController
      */
     public function arpAction()
     {
-        $this->view->title = "System ARP table";
+        $this->view->title = gettext('Interfaces ARP Table');
         $this->view->pick('OPNsense/Diagnostics/arp');
     }
 
@@ -50,7 +52,7 @@ class InterfaceController extends IndexController
      */
     public function ndpAction()
     {
-        $this->view->title = "System NDP table";
+        $this->view->title = gettext('Interfaces NDP Table');
         $this->view->pick('OPNsense/Diagnostics/ndp');
     }
 
@@ -59,7 +61,7 @@ class InterfaceController extends IndexController
      */
     public function routesAction()
     {
-        $this->view->title = "System Routing table";
+        $this->view->title = gettext('System Routing Table');
         $this->view->pick('OPNsense/Diagnostics/routes');
     }
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetflowController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetflowController.php
index 82006b0ac..49e594e4d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetflowController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetflowController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2016 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\IndexController;
@@ -38,7 +40,7 @@ class NetflowController extends IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "Netflow";
+        $this->view->title = gettext('NetFlow');
         $this->view->pick('OPNsense/Diagnostics/netflow');
         $this->view->captureForm = $this->getForm("netflow_capture");
     }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetworkinsightController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetworkinsightController.php
index b4b76b3b2..0582823af 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetworkinsightController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/NetworkinsightController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2016 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\IndexController;
@@ -38,7 +40,7 @@ class NetworkinsightController extends IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "Network Insight";
+        $this->view->title = gettext('Network Insight');
         $this->view->pick('OPNsense/Diagnostics/networkinsight');
     }
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php
index 2b9698132..18bf6a64a 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/SystemhealthController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V. - J.Schellevis
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Diagnostics;
 
 use OPNsense\Base\IndexController;
@@ -38,7 +40,7 @@ class SystemhealthController extends IndexController
 {
     public function indexAction()
     {
-        $this->view->title = "System Health";
+        $this->view->title = gettext('System Health');
         $this->view->pick('OPNsense/Diagnostics/systemhealth');
     }
 }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php
index 3cab65133..e2b8d59d5 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IDS/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\IDS;
 
 /**
@@ -40,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = "Intrusion Detection";
+        $this->view->title = gettext('Intrusion Detection');
         // link rule dialog
         $this->view->formDialogRule = $this->getForm("dialogRule");
         // link alert info dialog
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
index 21a54f37c..995c5b0c7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\Proxy;
 
 /**
@@ -40,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = "Proxy Server";
+        $this->view->title = gettext('Proxy Server');
         $this->view->mainForm = $this->getForm("main");
         $this->view->formDialogEditBlacklist = $this->getForm("dialogEditBlacklist");
         $this->view->pick('OPNsense/Proxy/index');
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php
index b00fe6ff4..49ea91659 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/IndexController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 Deciso B.V.
  *
@@ -26,6 +27,7 @@
  *    POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 namespace OPNsense\TrafficShaper;
 
 /**
@@ -40,7 +42,7 @@ class IndexController extends \OPNsense\Base\IndexController
      */
     public function indexAction()
     {
-        $this->view->title = "Traffic Shaper";
+        $this->view->title = gettext('Traffic Shaper');
         // include dialog form definitions
         $this->view->formDialogPipe = $this->getForm("dialogPipe");
         $this->view->formDialogQueue = $this->getForm("dialogQueue");