diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc
index 4bb638c..796292d 100644
--- a/sai/modules/autoload.inc
+++ b/sai/modules/autoload.inc
@@ -13,4 +13,5 @@ require_once dirname(__FILE__).'/saimod_sys_cache/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_cron/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_todo/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_docu/autoload.inc';
+require_once dirname(__FILE__).'/saimod_sys_langswitcher/autoload.inc';
 require_once dirname(__FILE__).'/saimod_sys_login/autoload.inc';
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_langswitcher/autoload.inc b/sai/modules/saimod_sys_langswitcher/autoload.inc
new file mode 100644
index 0000000..29ebcbf
--- /dev/null
+++ b/sai/modules/saimod_sys_langswitcher/autoload.inc
@@ -0,0 +1,4 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
+
+\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_langswitcher');
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_langswitcher/saimod_sys_langswitcher.php b/sai/modules/saimod_sys_langswitcher/saimod_sys_langswitcher.php
new file mode 100644
index 0000000..29c2a07
--- /dev/null
+++ b/sai/modules/saimod_sys_langswitcher/saimod_sys_langswitcher.php
@@ -0,0 +1,17 @@
+<?php
+namespace SYSTEM\SAI;
+
+class saimod_sys_langswitcher extends \SYSTEM\SAI\SaiModule {    
+    public static function html_li_menu(){
+        $result = '';
+        $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
+        foreach($langs as $lang){
+            $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_langswitcher/tpl/language.tpl'),array('lang' => $lang));}
+        return $result;
+    }
+    public static function right_public(){return true;}    
+    public static function right_right(){}
+    
+    //public static function css(){}
+    //public static function js(){}
+}
\ No newline at end of file
diff --git a/sai/page/tpl/language.tpl b/sai/modules/saimod_sys_langswitcher/tpl/language.tpl
similarity index 100%
rename from sai/page/tpl/language.tpl
rename to sai/modules/saimod_sys_langswitcher/tpl/language.tpl
diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css
index 9344ed1..3ccab6d 100644
--- a/sai/page/css/sai.css
+++ b/sai/page/css/sai.css
@@ -1,24 +1,48 @@
-/* 
-    Document   : index.css
-    Created on : 31.01.2013, 01:59:37
-    Author     : CHRIS MEURISCH
-    Description:
-        Purpose of the stylesheet follows.
-*/
-
-.brand-logo{ 
+#sai_logo {
+    padding-left: 10px;
     float: left;
     padding-top: 8px;
     padding-right: 10px;
 }
+#sai_brand{
+    width: 170px;
+}
 
-.footer{
+
+#sai_navbar{
+    height:40px;
+}
+
+#project_navbar{
+    width:224px;
+    position: fixed;
+    left: 0px;
+    bottom: 0px;
+    top: 38px;
+}
+
+#content-wrapper{
+    overflow: auto;
+    position: absolute;
+    top: 40px;
+    bottom: 0px;
+    left: 224px;
+    right: 0px;
+    padding: 15px;
+    min-width:1000px;
+}
+
+#content{
+    width:100%
+}
+
+#footer{
     text-align: right;
     padding-right: 20px;
     color: #777;
 }
 
-.footer a{
+#footer a{
     color: #777;
 }
 
diff --git a/sai/page/default_page.php b/sai/page/default_page.php
index e526fd6..9290fb7 100644
--- a/sai/page/default_page.php
+++ b/sai/page/default_page.php
@@ -48,14 +48,6 @@ class default_page extends \SYSTEM\PAGE\Page {
                   '<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js').'" type="text/javascript"></script>';
         return $result;
     }
-    
-    private static function lang_switcher(){
-        $result = '';
-        $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
-        foreach($langs as $lang){
-            $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/language.tpl'),array('lang' => $lang));}
-        return $result;
-    }
 
     public function html($_escaped_fragment_ = NULL){
         $vars = array();
@@ -68,7 +60,6 @@ class default_page extends \SYSTEM\PAGE\Page {
         $vars['menu_proj'] = self::menu_proj();
         $vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE);
         $vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT);
-        $vars['lang_switcher'] = self::lang_switcher();
         
         $vars = array_merge($vars,\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);        
diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl
index c35b87a..29fb295 100644
--- a/sai/page/tpl/sai.tpl
+++ b/sai/page/tpl/sai.tpl
@@ -8,28 +8,27 @@
         ${js}
     </head>
     <body>
-        <div id="sai_navbar" class="navbar navbar-fixed-top" style="height:40px;">
+        <div id="sai_navbar" class="navbar navbar-fixed-top">
             <div class="navbar-inner">
-                <div class="brand-logo" style="padding-left: 10px;">
-                    <img src="./api.php?call=files&cat=saistart_sys_sai&id=logo.png" height="24" width="24"/>
-                </div>
-                <a class="brand" href="#" style="width: 159px;">SAI</a>
-                ${lang_switcher}
                 <ul class="nav">
+                    <a id="sai_logo" class="brand-logo" href="#!start">
+                        <img src="./api.php?call=files&cat=saistart_sys_sai&id=logo.png" height="24" width="24"/>
+                        <a id="sai_brand" class="brand" >SAI</a>
+                    </a>
                     ${menu_start}
                     ${menu_sys}
-                </ul>                
+                </ul>
             </div>
         </div>                
-        <div id="project_navbar" style="width:224px; position: fixed; left: 0px; bottom: 0px; top: 38px;">
+        <div id="project_navbar">
             <ul class="nav nav-tabs nav-stacked sai_project_modules">                
                 ${menu_proj}
-            </ul>       
-        </div>    
-        <div id="content-wrapper" style="overflow: auto; position: absolute; top: 40px; bottom: 0px; left: 224px; right: 0px; padding: 15px; min-width:1000px;">
-            <div id="content" style="width:100%"></div>
+            </ul>
+        </div>
+        <div id="content-wrapper">
+            <div id="content"></div>
             <hr>
-            <div class="footer"><p>${copyright}</p></div>
+            <div id="footer"><p>${copyright}</p></div>
         </div>
     </body>
-</html>
+</html>
\ No newline at end of file