diff --git a/front/css/pialert.css b/front/css/pialert.css
index 2ad250f0..8b7ff99b 100755
--- a/front/css/pialert.css
+++ b/front/css/pialert.css
@@ -820,25 +820,35 @@ height: 50px;
     text-overflow: ellipsis;
 }
 
-.plugin-content
-{
-    padding-bottom: 7px;
-}
-.plugin-content #tabs-content-location
-{
-    margin-top: 20px;
-    margin-left: 7px;
+.plugin-filters
+{    
+    margin: 7px;
     margin-right: 7px;
     margin-bottom: 9px;
     padding-bottom: 8px;
 }
 
+.plugin-content
+{
+    padding-bottom: 0px;
+}
+
+.plugin-content .left-nav{
+    width: 100%;
+    padding-right: 0px;
+}
+
+.plugin-content #tabs-content-location
+{    
+    margin: 0px;
+
+}
+
 .plugins-description
 {
     padding-top: 20px;
 }
 
-
   
 .login-page .login-custom
 {
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
index 1038c793..36aa17a0 100755
--- a/front/php/templates/language/en_us.php
+++ b/front/php/templates/language/en_us.php
@@ -507,6 +507,7 @@ $lang['en_us'] = array(
 'Plugins_Objects' => 'Plugin Objects',
 'Plugins_DeleteAll' => 'Delete all (filters are ignored)',
 'Plugins_History' => 'Events History',
+'Plugins_Filters_Mac' => 'Mac Filter',
 
 //////////////////////////////////////////////////////////////////
 // Settings
diff --git a/front/pluginsCore.php b/front/pluginsCore.php
index c026852d..0c9b3e58 100755
--- a/front/pluginsCore.php
+++ b/front/pluginsCore.php
@@ -4,16 +4,18 @@
 
 <!-- Main content ---------------------------------------------------------- -->
 <section class="content">
-    <div>
-        <div class="input-group">
-            <input class="form-control" id="txtMacFilter" type="text" value="--">
+    <div class="plugin-filters">
+        <div class="input-group col-sm-4">
+            <label class="control-label col-sm-3"><?= lang('Plugins_Filters_Mac');?></label>
+            <input class="form-control col-sm-3" id="txtMacFilter" type="text" value="--" readonly>
         </div>
     </div>
     <div class="nav-tabs-custom plugin-content" style="margin-bottom: 0px;">
-        <ul id="tabs-location" class="nav nav-tabs">
+        
+        <ul id="tabs-location" class="nav nav-tabs col-sm-2 ">
             <!-- PLACEHOLDER -->
         </ul>  
-        <div id="tabs-content-location" class="tab-content"> 
+        <div id="tabs-content-location" class="tab-content col-sm-10"> 
             <!-- PLACEHOLDER -->
         </div>   
     
@@ -217,8 +219,8 @@ function generateTabs()
         if(pluginObj.data_source != "template") // hiding template-based plugins as they don't produce any output
         {
             $('#tabs-location').append(
-                `<li class=" ${activetab}">
-                    <a href="#${pluginObj.unique_prefix}" data-plugin-prefix="${pluginObj.unique_prefix}" id="${pluginObj.unique_prefix}_id" data-toggle="tab" >
+                `<li class=" left-nav ${activetab}">
+                    <a class=" col-sm-12  " href="#${pluginObj.unique_prefix}" data-plugin-prefix="${pluginObj.unique_prefix}" id="${pluginObj.unique_prefix}_id" data-toggle="tab" >
                     ${localize(pluginObj, 'icon')} ${localize(pluginObj, 'display_name')}
                     </a>
                 </li>`
diff --git a/pialert/database.py b/pialert/database.py
index 69d2e744..b78d2e80 100755
--- a/pialert/database.py
+++ b/pialert/database.py
@@ -10,10 +10,6 @@ from helper import json_struc, initOrSetParam, row_to_json, timeNow #, updateSta
 
 
 
-
-
-
-
 class DB():
     """
     DB Class to provide the basic database interactions.
@@ -96,7 +92,7 @@ class DB():
                              WHERE eve_DateTime <= date('now', '-{str(DAYS_TO_KEEP_EVENTS)} day')""")
                              
         # Cleanup Plugin Events History
-        mylog('verbose', ['[DB Cleanup] Plugin Events History: Delete all older than '+str(DAYS_TO_KEEP_EVENTS)+' days (DAYS_TO_KEEP_EVENTS setting)'])
+        mylog('verbose', ['[DB Cleanup] Plugins_History: Delete all older than '+str(DAYS_TO_KEEP_EVENTS)+' days (DAYS_TO_KEEP_EVENTS setting)'])
         self.sql.execute (f"""DELETE FROM Plugins_History 
                              WHERE DateTimeChanged <= date('now', '{str(DAYS_TO_KEEP_EVENTS)} day')""")
 
@@ -139,7 +135,6 @@ class DB():
                         );""")
 
 
-
         # Shrink DB
         mylog('verbose', ['[DB Cleanup] Shrink Database'])
         self.sql.execute ("VACUUM;")
diff --git a/pialert/plugins/unifi_import/config.json b/pialert/plugins/unifi_import/config.json
index 48db3425..7ec2601d 100755
--- a/pialert/plugins/unifi_import/config.json
+++ b/pialert/plugins/unifi_import/config.json
@@ -196,7 +196,7 @@
             "localized": ["name"],
             "name":[{
                 "language_code":"en_us",
-                "string" : "Is online?"
+                "string" : "Online?"
                 }]
         } ,       
         {