diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql
index a9d6ac3..99cc4b6 100644
--- a/dbd/sql/mysql/data/system_page.sql
+++ b/dbd/sql/mysql/data/system_page.sql
@@ -11,6 +11,8 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`,
 
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (30, 42, 'config', 'config', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_config', 'init_saimod_sys_config', '\\SYSTEM\\SAI\\saimod_sys_config');
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (31, 42, 'basics', 'config', 30, 0, 0, '#tab_config', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_config&action=basics', 'init_saimod_sys_config_basics', '\\SYSTEM\\SAI\\saimod_sys_config');
+INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (32, 42, 'database', 'config', 30, 0, 1, '#tab_config', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_config&action=database', 'init_saimod_sys_config_database', '\\SYSTEM\\SAI\\saimod_sys_config');
+INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (33, 42, 'sai', 'config', 30, 0, 1, '#tab_config', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_config&action=sai', 'init_saimod_sys_config_sai', '\\SYSTEM\\SAI\\saimod_sys_config');
 
 INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (40, 42, 'cron', 'cron', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_cron', 'init_saimod_sys_cron', '\\SYSTEM\\SAI\\saimod_sys_cron');
 
diff --git a/lib/autoload.inc b/lib/autoload.inc
index e06589f..504e3e8 100644
--- a/lib/autoload.inc
+++ b/lib/autoload.inc
@@ -1,4 +1,4 @@
-<?php
+<?php 
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
 require_once dirname(__FILE__).'/system/autoload.inc';
 require_once dirname(__FILE__).'/markdown/autoload.inc';
diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php
index 4127d6d..8468953 100644
--- a/sai/modules/saimod_sys_api/saimod_sys_api.php
+++ b/sai/modules/saimod_sys_api/saimod_sys_api.php
@@ -79,5 +79,5 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
     public static function css(){
         return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/css/saimod_sys_api.css'));}
     public static function js(){
-        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_api.js'));}
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_config.js'));}
 }
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_config/js/saimod_sys_config.js b/sai/modules/saimod_sys_config/js/saimod_sys_config.js
index 6a9b503..77aa333 100644
--- a/sai/modules/saimod_sys_config/js/saimod_sys_config.js
+++ b/sai/modules/saimod_sys_config/js/saimod_sys_config.js
@@ -1,3 +1,38 @@
+function init_saimod_sys_config() {  
+    $('#tabs_config a').click(function (e) {
+        $('#tabs_config li').each(function(){
+            $(this).removeClass('active');});
+        $(this).parent().addClass('active');
+    });
+}
+
+function init_saimod_sys_config_basics() {
+    $('#tabs_config li').each(function(){
+        $(this).removeClass('active');});
+    $('#menu_tag_basics').parent().addClass('active');
+}
+
+function init_saimod_sys_config_database() {
+    $('#tabs_config li').each(function(){
+        $(this).removeClass('active');});
+    $('#menu_tag_database').parent().addClass('active');
+}
+
+function init_saimod_sys_config_sai() {
+   $('#tabs_config li').each(function(){
+        $(this).removeClass('active');});
+    $('#menu_tag_sai').parent().addClass('active');
+}
+
+function config_menu(){
+    $('#tabs_config li').each(function(){
+        $(this).removeClass('active');});
+    if($('#menu_tag__'+system.cur_state().split('.')[1]).length){
+        $('#menu_tag__'+system.cur_state().split('.')[1]).parent().addClass('active');
+    } else {
+        $('menu_tag_basics').parent().addClass('active');}
+}
+/*
 var table_basics = document.getElementById('sai_mod_config_table_basics');
 var sort = new Tablesort(table_basics);
 function sort_table(){
@@ -11,4 +46,4 @@ table_basics.addEventListener('beforeSort', function() {
 
 table_basics.addEventListener('afterSort', function() {
   alert('Table sorted!');
-});
\ No newline at end of file
+});*/
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_config/saimod_sys_config.php b/sai/modules/saimod_sys_config/saimod_sys_config.php
index ddec8ea..8a9b577 100644
--- a/sai/modules/saimod_sys_config/saimod_sys_config.php
+++ b/sai/modules/saimod_sys_config/saimod_sys_config.php
@@ -65,7 +65,7 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config.tpl'),$vars);
     }
     //public static function html_li_menu(){return '<li><a id="menu_config" href="#!config">${sai_menu_config}</a></li>';}
-     public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_basics(){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_basics(){
         $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CONFIG);
         $vars['basics'] = $vars['database'] = $vars['sai'] = '';
         $vars['basics'] .=  \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
@@ -98,7 +98,47 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
                                     'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)));
     
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_basics.tpl'),$vars);
-     }    
+    }
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_database(){
+        $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CONFIG);
+        $vars['database'] = '';
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE',
+                                    'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE)));
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST',
+                                    'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST)));
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT',
+                                    'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT)));
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER',
+                                    'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER)));
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD',
+                                    'value' =>'&lt;hidden&gt;'));
+        $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                            array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,
+                                    'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME',
+                                    'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME)));
+    
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_database.tpl'),$vars);
+    }
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_sai(){
+        $vars['sai'] = '';
+        $vars['sai'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
+                        array(  'id' =>\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,
+                                'name' =>'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT',
+                                'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT)));
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_sai.tpl'),$vars);
+    
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_database.tpl'),$vars);
+    }
     public static function html_li_menu(){return '<li><a id="menu_config" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_config}" href="#!config"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></a></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
diff --git a/sai/modules/saimod_sys_config/tpl/config.tpl b/sai/modules/saimod_sys_config/tpl/config.tpl
index 2b8f87e..b411ede 100644
--- a/sai/modules/saimod_sys_config/tpl/config.tpl
+++ b/sai/modules/saimod_sys_config/tpl/config.tpl
@@ -1,10 +1,10 @@
 <h4>${sai_config_title}</h4>
 <hr>
 <div class="tabbable">
-    <ul class="nav nav-tabs" id="tabs_text">
-        <li><a href="#!config" id="menu_tag_all">Basics</a></li>
-        <li><a href="#!config" id="menu_tag_notag">Database</a></li>
-        <li><a href="#!config" id="menu_tag_notag">System Admin Interface</a></li>
+    <ul class="nav nav-tabs" id="tabs_config">
+        <li><a href="#!config" id="menu_tag_basics">Basics</a></li>
+        <li><a href="#!config(database)" id="menu_tag_database">Database</a></li>
+        <li><a href="#!config(sai)" id="menu_tag_sai">System Admin Interface</a></li>
     </ul>
     <div class="tab-content sai_margin_top_10" id="tab_config"></div>
 </div>
diff --git a/sai/modules/saimod_sys_config/tpl/config_basics.tpl b/sai/modules/saimod_sys_config/tpl/config_basics.tpl
index c700d8b..4e1325e 100644
--- a/sai/modules/saimod_sys_config/tpl/config_basics.tpl
+++ b/sai/modules/saimod_sys_config/tpl/config_basics.tpl
@@ -1 +1,8 @@
-${basics}
\ No newline at end of file
+<table class="table sai_table">
+    <tr class="no-select">
+        <th>ID</th>
+        <th>Name</th>
+        <th>Value</th>
+    </tr>
+    ${basics}
+</table>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_config/tpl/config_database.tpl b/sai/modules/saimod_sys_config/tpl/config_database.tpl
new file mode 100644
index 0000000..9a6d2bb
--- /dev/null
+++ b/sai/modules/saimod_sys_config/tpl/config_database.tpl
@@ -0,0 +1,8 @@
+<table class="table sai_table">
+    <tr class="no-select">
+        <th>ID</th>
+        <th>Name</th>
+        <th>Value</th>
+    </tr>
+    ${database}
+</table>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_config/tpl/config_sai.tpl b/sai/modules/saimod_sys_config/tpl/config_sai.tpl
new file mode 100644
index 0000000..b2b3ef3
--- /dev/null
+++ b/sai/modules/saimod_sys_config/tpl/config_sai.tpl
@@ -0,0 +1,8 @@
+<table class="table sai_table">
+    <tr class="no-select">
+        <th>ID</th>
+        <th>Name</th>
+        <th>Value</th>
+    </tr>
+    ${sai}
+</table>
\ No newline at end of file