diff --git a/sai/page/img/flag_germany.png b/files/saistart_sys_sai/flag_deDE.png
similarity index 100%
rename from sai/page/img/flag_germany.png
rename to files/saistart_sys_sai/flag_deDE.png
diff --git a/sai/page/img/flag_usa.png b/files/saistart_sys_sai/flag_enUS.png
similarity index 100%
rename from sai/page/img/flag_usa.png
rename to files/saistart_sys_sai/flag_enUS.png
diff --git a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
index 4213147..8b8fd23 100644
--- a/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
+++ b/sai/modules/saistart_sys_sai/css/saistart_sys_sai.css
@@ -1,23 +1,28 @@
 #container_top .well{
     height: 220px;
+    width: 21%;
 }
 #project {
     float: left;
-    min-width: 250px;
 }
 #analytics {
-    margin-left: 20px;
+    margin-left: 10px;
     float: left;
-    min-width: 250px;
 }
 #git {
-    margin-left: 20px;
+    margin-left: 10px;
     float: left;
-    min-width: 250px;
 }
-#project {
-    float: left;
+#logout {
+    margin-left: 10px;
+    float: right;
 }
 #todo {
     clear: both;
+}
+#login {
+    position: fixed;
+    top: 80px;
+    right: 20px;
+    width:220px;
 }
\ No newline at end of file
diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
index 5b60618..840d568 100644
--- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php
+++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
@@ -3,7 +3,7 @@ namespace SYSTEM\SAI;
 
 class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {    
     public static function sai_mod__SYSTEM_SAI_saistart_sys_sai(){
-        $vars = array('content' => self::html_content(), 'login' => self::html_login());
+        $vars = array('content' => self::html_content());
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_BASIC),
                                     \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI),
                                     \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI_ERROR));
@@ -23,14 +23,17 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
     
     protected static function html_content(){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
-            return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'));}
+            $vars = array();
+            $vars['login'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());
+            return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content.tpl'),$vars);
+        }
         $vars = array();
         $vars['project_name'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT);
         $vars['project_url'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL);
+        $vars['todo_entries'] = \SYSTEM\SAI\saimod_sys_todo::sai_mod__SYSTEM_SAI_saimod_sys_todo_action_todolist();
+        $vars['log_entries'] = \SYSTEM\SAI\saimod_sys_log::sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter();
+        $vars['logout'] = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'));
         $vars = array_merge($vars,\SYSTEM\SAI\saimod_sys_todo::statistics());
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
     }
-    
-    protected static function html_login(){        
-        return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());}
 }
\ No newline at end of file
diff --git a/sai/modules/saistart_sys_sai/tpl/content.tpl b/sai/modules/saistart_sys_sai/tpl/content.tpl
index b1c720a..2f0d400 100644
--- a/sai/modules/saistart_sys_sai/tpl/content.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content.tpl
@@ -14,4 +14,7 @@
     </div>        
     <a class="carousel-control left" href="#myCarousel" data-slide="prev">&lsaquo;</a>
     <a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
+</div>
+<div class="well" id="login">
+    ${login}
 </div>
\ No newline at end of file
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
index ec06c6d..2837e71 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
@@ -25,19 +25,18 @@
         <b>Current Project Version:</b> ${git_project}<br/>
         <b>Current SYSTEM Version:</b> ${git_system}
     </div>
+    <div class="well" id="logout">
+        ${logout}
+    </div>
 </div>
 <div class="well" id="todo">
     <h2 class="muted"><a href="#!todo">Todo</a></h2>
     <b>Status:</b> ${project_count}/${project_all}<br/>
     <b>Progress:</b> ${project}%
-    <h4 class="muted">5 Latest User Todos</h4>
-    ${todo_user_entries}
-    <h4 class="muted">5 Latest Generated Todos</h4>
-    ${todo_gen_entries}
+    ${todo_entries}
 </div>
 <div class="well" id="log">
     <h2 class="muted"><a href="#!log">Log</a></h2>
-    <b>Count:</b> ${log_count}
-    <h4 class="muted">10 Latest Log Entries</h4>
+    <h4 class="muted">100 Latest Log Entries</h4>
     ${log_entries}
 </div>
\ No newline at end of file
diff --git a/sai/modules/saistart_sys_sai/tpl/saistart.tpl b/sai/modules/saistart_sys_sai/tpl/saistart.tpl
index 9231173..ff4b0d1 100644
--- a/sai/modules/saistart_sys_sai/tpl/saistart.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/saistart.tpl
@@ -1,3 +1,2 @@
 <div id="content_saistart" style="float:left; width: auto;">${content}</div>
-<div class="well" id="login" style="position: fixed; top: 80px; right: 20px; width:220px;">${login}</div>
-<div style="clear:both;"></div>
\ No newline at end of file
+<!--<div style="clear:both;"></div>-->
\ No newline at end of file
diff --git a/sai/page/css/apireference.css b/sai/page/css/apireference.css
deleted file mode 100644
index 8516373..0000000
--- a/sai/page/css/apireference.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
-    Document   : index.css
-    Created on : 31.01.2013, 01:59:37
-    Author     : CHRIS MEURISCH
-    Description:
-        Purpose of the stylesheet follows.
-*/
-
-.footer{
-    text-align: right;
-}
-
-#div-content{
-
-}
diff --git a/sai/page/css/img/glyphicons-halflings-white.png b/sai/page/css/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484..0000000
Binary files a/sai/page/css/img/glyphicons-halflings-white.png and /dev/null differ
diff --git a/sai/page/css/img/glyphicons-halflings.png b/sai/page/css/img/glyphicons-halflings.png
deleted file mode 100644
index a996999..0000000
Binary files a/sai/page/css/img/glyphicons-halflings.png and /dev/null differ
diff --git a/sai/page/default_page.php b/sai/page/default_page.php
index de3102a..558d98a 100644
--- a/sai/page/default_page.php
+++ b/sai/page/default_page.php
@@ -3,7 +3,6 @@ namespace SYSTEM\SAI;
 class default_page extends \SYSTEM\PAGE\Page {
     private static function menu_sys(){                
         $result = '';
-        
         $mods = \SYSTEM\SAI\sai::getSysModules();
         foreach($mods as $mod){
             if(\call_user_func(array($mod, 'right_public')) ||
@@ -35,7 +34,6 @@ class default_page extends \SYSTEM\PAGE\Page {
         $result =   '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/libs/bootstrap.min.css').'" type="text/css" />'.
                     '<link rel="stylesheet" href="./api.php?call=files&amp;cat=sys&amp;id=system.css" type="text/css" />'.
                     '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />';
-                  //'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_table.css').'" type="text/css" />';        
         return $result;
     }
 
@@ -54,13 +52,8 @@ class default_page extends \SYSTEM\PAGE\Page {
     private static function lang_switcher(){
         $result = '';
         $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
-        if(in_array('deDE', $langs)){
-            $result .= '<a href="javascript:system.language(\'deDE\');"><img src="${PATH_LOCAL_IMG}flag_germany.png" alt="Deutsch"></a>&nbsp;';
-        }
-        
-        if(in_array('enUS', $langs)){
-            $result .= '<a href="javascript:system.language(\'enUS\');"><img src="${PATH_LOCAL_IMG}flag_usa.png" alt="English"></a>';
-        }
+        foreach($langs as $lang){
+            $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/language.tpl'),array('lang' => $lang));}
         return $result;
     }
 
@@ -76,11 +69,9 @@ class default_page extends \SYSTEM\PAGE\Page {
         $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG);
         $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['lang_switcher'] = '';
-        $vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/');
+        $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/sai.tpl'), $vars);        
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);        
     }
 }
\ No newline at end of file
diff --git a/sai/page/img/apns.png b/sai/page/img/apns.png
deleted file mode 100644
index 6c7a43c..0000000
Binary files a/sai/page/img/apns.png and /dev/null differ
diff --git a/sai/page/img/badge.png b/sai/page/img/badge.png
deleted file mode 100644
index 2387637..0000000
Binary files a/sai/page/img/badge.png and /dev/null differ
diff --git a/sai/page/img/cronjob-logo.png b/sai/page/img/cronjob-logo.png
deleted file mode 100644
index e33b32d..0000000
Binary files a/sai/page/img/cronjob-logo.png and /dev/null differ
diff --git a/sai/page/img/flow_upload.png b/sai/page/img/flow_upload.png
deleted file mode 100644
index 7e83ace..0000000
Binary files a/sai/page/img/flow_upload.png and /dev/null differ
diff --git a/sai/page/img/gcm-logo.png b/sai/page/img/gcm-logo.png
deleted file mode 100644
index 14b92ad..0000000
Binary files a/sai/page/img/gcm-logo.png and /dev/null differ
diff --git a/sai/page/img/geo_point.png b/sai/page/img/geo_point.png
deleted file mode 100644
index 77cd24f..0000000
Binary files a/sai/page/img/geo_point.png and /dev/null differ
diff --git a/sai/page/img/geo_resize.png b/sai/page/img/geo_resize.png
deleted file mode 100644
index 8fe8cba..0000000
Binary files a/sai/page/img/geo_resize.png and /dev/null differ
diff --git a/sai/page/img/nodejs-logo.png b/sai/page/img/nodejs-logo.png
deleted file mode 100644
index 646df76..0000000
Binary files a/sai/page/img/nodejs-logo.png and /dev/null differ
diff --git a/sai/page/img/postgresql-logo.png b/sai/page/img/postgresql-logo.png
deleted file mode 100644
index 70c39f8..0000000
Binary files a/sai/page/img/postgresql-logo.png and /dev/null differ
diff --git a/sai/page/img/rabbitmq-logo.jpg b/sai/page/img/rabbitmq-logo.jpg
deleted file mode 100644
index f2e29ed..0000000
Binary files a/sai/page/img/rabbitmq-logo.jpg and /dev/null differ
diff --git a/sai/page/tpl/language.tpl b/sai/page/tpl/language.tpl
new file mode 100644
index 0000000..6525d00
--- /dev/null
+++ b/sai/page/tpl/language.tpl
@@ -0,0 +1 @@
+<a href="javascript:system.language(\'${lang}\');"><img src="./api.php?call=files&cat=saistart_sys_sai&id=flag_${lang}.png" alt="${lang}"></a>&nbsp;
\ No newline at end of file
diff --git a/sai/page/sai.tpl b/sai/page/tpl/sai.tpl
similarity index 100%
rename from sai/page/sai.tpl
rename to sai/page/tpl/sai.tpl