diff --git a/db/qq/QQ.php b/db/qq/QQ.php
index 9d5fd05..5f1dd86 100644
--- a/db/qq/QQ.php
+++ b/db/qq/QQ.php
@@ -81,6 +81,5 @@ class QQ {
      * @return bool Returns true or false (or Result if used incorrectly)
      */
     public static function QI($return_id = false,$dbinfo = null){
-        $qq = self::QQ($dbinfo);
-        return $return_id ? $qq->insert_id() : $qq->affectedRows() != (0||null);}
+        return self::QQ($dbinfo);} // returns boolean no id can be returned
 }
\ No newline at end of file
diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc
index 3fd80d5..b844961 100644
--- a/sai/modules/autoload.inc
+++ b/sai/modules/autoload.inc
@@ -5,7 +5,7 @@ require_once dirname(__FILE__).'/saistart_sys_sai/autoload.inc';
 //System Mod
 require_once dirname(__FILE__).'/saimod_sys_analytics/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_log/autoload.inc';
-//require_once dirname(__FILE__).'/saimod_sys_security/autoload.inc';
+require_once dirname(__FILE__).'/saimod_sys_security/autoload.inc';
 //require_once dirname(__FILE__).'/saimod_sys_mod/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_config/autoload.inc';
 //require_once dirname(__FILE__).'/saimod_sys_api/autoload.inc';
diff --git a/sai/modules/saimod_sys_security/autoload.inc b/sai/modules/saimod_sys_security/autoload.inc
index 5554c11..f448f5a 100644
--- a/sai/modules/saimod_sys_security/autoload.inc
+++ b/sai/modules/saimod_sys_security/autoload.inc
@@ -2,4 +2,4 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SYSTEM\SQL');
 
-\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_security');
\ No newline at end of file
+\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_security');
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_security/js/saimod_sys_security.js b/sai/modules/saimod_sys_security/js/saimod_sys_security.js
index ecf981a..822733b 100644
--- a/sai/modules/saimod_sys_security/js/saimod_sys_security.js
+++ b/sai/modules/saimod_sys_security/js/saimod_sys_security.js
@@ -1,9 +1,9 @@
 function init_saimod_sys_security() { 
     $("#sai_mod_security_table").tablesorter();
-    $('#securitytab a').click(function (e) {
-        $('#securitytab li').each(function(){
+    $('#tabs_security a').click(function (e) {
+        $('#tabs_security a').each(function(){
             $(this).removeClass('active');});
-        $(this).parent().addClass('active');
+        $(this).addClass('active');
     });
   
 };
diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php
index 5be5941..c99ce53 100644
--- a/sai/modules/saimod_sys_security/saimod_sys_security.php
+++ b/sai/modules/saimod_sys_security/saimod_sys_security.php
@@ -14,7 +14,7 @@ namespace SYSTEM\SAI;
 /**
  * saimod_sys_security Class provided by System as saimod to manage the system_user, system_rights, system_user_to_rights table
  */
-class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
+class saimod_sys_security extends \SYSTEM\SAI\sai_module {
     /**
      * Generate HTML for the Security Groups(Menu)
      * 
@@ -352,7 +352,11 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
      * 
      * @return string Returns <li> Menu for the Saimod
      */
-    public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/menu.tpl'))->SERVERPATH());}
+    public static function menu(){
+        return new sai_module_menu( 1,
+                                    sai_module_menu::POISITION_LEFT,
+                                    sai_module_menu::DIVIDER_NONE,
+                                    \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/menu.tpl'))->SERVERPATH()));}
     
     /**
      * Returns if the Saimod is public(access for everyone)
diff --git a/sai/modules/saimod_sys_security/tpl/menu.tpl b/sai/modules/saimod_sys_security/tpl/menu.tpl
index f584163..1de2689 100644
--- a/sai/modules/saimod_sys_security/tpl/menu.tpl
+++ b/sai/modules/saimod_sys_security/tpl/menu.tpl
@@ -1,5 +1,6 @@
 <li class="nav-item">
     <a id="menu_security" class="nav-link" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_security}" href="#!security">
+        <span class="d-lg-none" style="padding-left: 15px;"></span>
         <i class="fa fa-lock" aria-hidden="true"></i>
         <span class="d-lg-none">&nbsp;&nbsp;${sai_menu_security}</span>
     </a>
diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
index 34d79ce..c2459c5 100644
--- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
+++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl
@@ -1,24 +1,13 @@
-<div class="row-fluid">
-    <div class="col-md-12 sai_padding_off">
-        <h4>&nbsp;<span class="fa fa-lock" aria-hidden="true"></span>&nbsp;&nbsp;${sai_security_title}</h4>
+<div class="row">
+    <div class="col-12 sai_padding_10 bg-primary">
+        <h4 class="sai_margin_off">&nbsp;<span class="fa fa-lock" aria-hidden="true"></span>&nbsp;&nbsp;${sai_security_title}</h4>
     </div>
-</div>
-<div class="row-fluid">
-    <div class="col-md-12 sai_padding_off">
-        <hr>
-    </div>
-</div>
-<div class="row-fluid">
-    <div class="col-md-12 sai_padding_off">
-        <div class="tabbable">
-            <ul class="nav nav-tabs" id="securitytab">
-                <li class="nav-item"><a class="nav-link active" href="#!security" id="menu_users">Users</a></li>
-                <li class="nav-item"><a class="nav-link" href="#!security(rights)" id="menu_rights">Rights</a></li>
-                <img id="loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
-            </ul>
-            <div class="tab-content">
-                <div class="tab-pane active" id="tab_security"></div>
-            </div>
-        </div>
+    <div class="col-md-2 sai_padding_off">
+        <ul class="nav bg-light flex-column" id="tabs_security">
+            <li class="nav-item"><a class="nav-link active" href="#!security" id="menu_users">Users</a></li>
+            <li class="nav-item"><a class="nav-link" href="#!security(rights)" id="menu_rights">Rights</a></li>
+            <!--<img id="loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>-->
+        </ul>
     </div>
+    <div class="col-md-10 sai_padding_off sai_border_left" id="tab_security"></div>
 </div>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
index 372dd40..03cefcd 100644
--- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
+++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
@@ -9,8 +9,8 @@
                 <li class="nav-item"><a class="nav-link" href="#!todo(stats)" id="menu_stats">Statistics</a></li>
                 <img id="img_loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
                 <button id="btn_refresh" class="btn-primary btn btn-sm" onClick="system.load('todo',true);" style="height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> ${basic_refresh}</button>
-                <button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${basic_close_all}</button>
-                <button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
+                <button id="btn_close_all" class="btn-danger btn btn-sm" style="height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${basic_close_all}</button>
+                <button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>
         </ul>
     </div>
     <div class="col-md-10 sai_padding_off sai_border_left" id="tab_todo"></div>