diff --git a/index.php b/index.php
index 093ea24..9d22170 100644
--- a/index.php
+++ b/index.php
@@ -9,5 +9,5 @@ require_once 'config.php';
 \SYSTEM\system::register_errorhandler_dbwriter();
 \SYSTEM\system::register_errorhandler_jsonoutput();
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, false, true)->html();
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, true, true)->html();
 new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
diff --git a/neopolimatrix/page/autoload.inc b/neopolimatrix/page/autoload.inc
index 4de4cde..b017c11 100644
--- a/neopolimatrix/page/autoload.inc
+++ b/neopolimatrix/page/autoload.inc
@@ -2,6 +2,6 @@
 SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_list','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_element','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/impressum','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_article','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_impressum','');
 
diff --git a/neopolimatrix/page/default_article/default_article.php b/neopolimatrix/page/default_article/default_article.php
new file mode 100644
index 0000000..6fa96a0
--- /dev/null
+++ b/neopolimatrix/page/default_article/default_article.php
@@ -0,0 +1,24 @@
+<?php
+class default_article extends \SYSTEM\PAGE\Page {
+
+    var $article_id = null;
+    public function __construct($id) {
+
+        $this->article_id = $id;
+    }
+    
+    
+    public function get_text(){
+        $result = '';
+        $element = elements::getText($this->article_id);
+        $element['title'] = $element['id'];
+        $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/element.tpl'), $element);
+        return $result;
+    }
+    
+    public function html(){
+        $vars = array();               
+        $vars['text'] = $this->get_text();
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/default_article.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/neopolimatrix/page/default_element/default_element.tpl b/neopolimatrix/page/default_article/tpl/default_article.tpl
similarity index 100%
rename from neopolimatrix/page/default_element/default_element.tpl
rename to neopolimatrix/page/default_article/tpl/default_article.tpl
diff --git a/neopolimatrix/page/default_element/element.tpl b/neopolimatrix/page/default_article/tpl/element.tpl
similarity index 100%
rename from neopolimatrix/page/default_element/element.tpl
rename to neopolimatrix/page/default_article/tpl/element.tpl
diff --git a/neopolimatrix/page/default_element/default_element.php b/neopolimatrix/page/default_element/default_element.php
deleted file mode 100644
index a9df8ac..0000000
--- a/neopolimatrix/page/default_element/default_element.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-class default_element extends \SYSTEM\PAGE\Page {
-
-    var $text_id = null;
-    public function __construct($text_id) {
-
-        $this->text_id = $text_id;
-    }
-    
-    
-    public function get_text(){
-        $result = '';
-        $element = elements::getText($this->text_id);
-        $element['title'] = $element['id'];
-        $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_element/element.tpl'), $element);
-        return $result;
-    }
-    
-    public function html(){
-        $vars = array();               
-        $vars['text'] = $this->get_text();
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_element/default_element.tpl'), $vars);
-    }
-}
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
diff --git a/neopolimatrix/page/default_impressum/default_impressum.php b/neopolimatrix/page/default_impressum/default_impressum.php
new file mode 100644
index 0000000..d58696b
--- /dev/null
+++ b/neopolimatrix/page/default_impressum/default_impressum.php
@@ -0,0 +1,8 @@
+<?php
+class default_impressum extends \SYSTEM\PAGE\Page {
+    public function html(){
+        $vars = array();               
+        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(101));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/tpl/impressum.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/neopolimatrix/page/impressum/impressum.tpl b/neopolimatrix/page/default_impressum/tpl/impressum.tpl
similarity index 100%
rename from neopolimatrix/page/impressum/impressum.tpl
rename to neopolimatrix/page/default_impressum/tpl/impressum.tpl
diff --git a/neopolimatrix/page/default_list/default_list.php b/neopolimatrix/page/default_list/default_list.php
index 97d8e4b..8e94f8d 100644
--- a/neopolimatrix/page/default_list/default_list.php
+++ b/neopolimatrix/page/default_list/default_list.php
@@ -1,6 +1,9 @@
 <?php
 class default_list extends \SYSTEM\PAGE\Page {
 
+    public static function js(){
+        return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_list/js/default_list.js'));}
+                        
     var $filter = null;
     public function __construct($filter) {
         $this->filter = $filter;
@@ -17,7 +20,7 @@ class default_list extends \SYSTEM\PAGE\Page {
             case 4:
                 return '%korruption%';
             default:
-        return 'filter fail';}
+                return '%';}
         
     }
     
@@ -27,7 +30,7 @@ class default_list extends \SYSTEM\PAGE\Page {
         $elements = elements::getAllElementsOfTag($this->switch_filter($tag));
         foreach($elements as $element){
             $element['title'] = $element['id'];
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/element.tpl'), $element);
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/element.tpl'), $element);
         }
         return $result;
     }
@@ -35,12 +38,6 @@ class default_list extends \SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();               
         $vars['list'] = $this->generate_list();
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/default_list.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars);
     }
-}
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
+}
\ No newline at end of file
diff --git a/neopolimatrix/page/default_list/js/default_list.js b/neopolimatrix/page/default_list/js/default_list.js
new file mode 100644
index 0000000..11f9adb
--- /dev/null
+++ b/neopolimatrix/page/default_list/js/default_list.js
@@ -0,0 +1,4 @@
+function init_start(){
+    $(".list_element").click(function(){
+        system.load('article;article.'+$(this).attr('text_id'))});   
+}
\ No newline at end of file
diff --git a/neopolimatrix/page/default_list/default_list.tpl b/neopolimatrix/page/default_list/tpl/default_list.tpl
similarity index 100%
rename from neopolimatrix/page/default_list/default_list.tpl
rename to neopolimatrix/page/default_list/tpl/default_list.tpl
diff --git a/neopolimatrix/page/default_list/element.tpl b/neopolimatrix/page/default_list/tpl/element.tpl
similarity index 100%
rename from neopolimatrix/page/default_list/element.tpl
rename to neopolimatrix/page/default_list/tpl/element.tpl
diff --git a/neopolimatrix/page/default_page/default_page.php b/neopolimatrix/page/default_page/default_page.php
index b6d4cf9..bce8b1c 100644
--- a/neopolimatrix/page/default_page/default_page.php
+++ b/neopolimatrix/page/default_page/default_page.php
@@ -6,8 +6,8 @@ class default_page extends \SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jqbootstrapvalidation/jqBootstrapValidation.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.md5.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.sha1.js').'"></script>'.
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/state_init.js').'"></script>'.
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/content.js').'"></script>';
+                '<script type="text/javascript" language="JavaScript" src="./api.php?call=files&cat=sys&id=system.js"></script>'.
+                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js').'"></script>';
 
     }
     
@@ -19,21 +19,21 @@ class default_page extends \SYSTEM\PAGE\Page {
                '<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';
     }
     
-    public function generate_elementlist(){
+    /*public function generate_elementlist(){
         $result = '';
         $elements = elements::getAllElementsOfTag('%');
         foreach($elements as $element){
             $element['title'] = $element['id'];
-            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/element.tpl'), $element);
+            $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/element.tpl'), $element);
         }
         return $result;
-    }
+    }*/
     
     public function html(){
         $vars = array();               
         $vars['js'] = $this->js(); 
         $vars['css'] = $this->css();
-        $vars['content'] = $this->generate_elementlist();
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/default_page.tpl'), $vars);
+        //$vars['content'] = $this->generate_elementlist();
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
     }
 }
diff --git a/neopolimatrix/page/default_page/js/content.js b/neopolimatrix/page/default_page/js/content.js
deleted file mode 100644
index d01833d..0000000
--- a/neopolimatrix/page/default_page/js/content.js
+++ /dev/null
@@ -1,41 +0,0 @@
-$(document).ready(function() {
-    tabs();
-    impressum();
-    load_list(1);
-});
-
-
-function btn_element(){
-    $(".list_element").click(function(){
-        load_element($(this).attr('text_id'));
-    });   
-}
-
-function load_element(text_id){
-        $('#contentframe').load('./?page=get_element&text_id=' + text_id, function(){
-        });
-}
-
-function impressum(){
-    $("#btn_impressum").click(function(){
-        $('#contentframe').load('./?page=impressum', function(){
-        
-        });
-        $(this).tab('show');
-    });   
-}
-
-function tabs(){
- $("#tabs_user_list a").click(function(){
-        load_list($(this).attr('filter'));     
-        $(this).tab('show');
-        btn_element();
-    });   
-}
-
-
-function load_list(filter){
-    $('#contentframe').load('./?page=get_list&filter=' + filter, function(){
-        btn_element();
-        });
-}
\ No newline at end of file
diff --git a/neopolimatrix/page/default_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js
new file mode 100644
index 0000000..d0bbdbb
--- /dev/null
+++ b/neopolimatrix/page/default_page/js/default_page.js
@@ -0,0 +1,39 @@
+$(document).ready(function() {
+    new SYSTEM('./api.php',1,'start;filter.1');
+    tabs();
+    impressum();
+});
+
+function impressum(){
+    $("#btn_impressum").click(function(){
+        system.load('impressum');});   
+}
+
+function tabs(){
+    $("#tabs_user_list a").click(function(){
+        $('#tabs_user_list li').each(function(){
+            $(this).removeClass('active');});
+        $(this).parent().addClass('active');
+        system.load('start;filter.'+$(this).attr('filter'));
+        //btn_element();
+    });   
+}
+
+/*function btn_element(){
+    $(".list_element").click(function(){
+        system.load('article;article.'+$(this).attr('text_id'))
+        //load_element($(this).attr('text_id'));
+    });   
+}
+
+function load_element(text_id){
+        $('#contentframe').load('./?page=get_element&text_id=' + text_id, function(){
+        });
+}
+
+
+function load_list(filter){
+    $('#contentframe').load('./?page=get_list&filter=' + filter, function(){
+        btn_element();
+        });
+}*/
\ No newline at end of file
diff --git a/neopolimatrix/page/default_page/default_page.tpl b/neopolimatrix/page/default_page/tpl/default_page.tpl
similarity index 79%
rename from neopolimatrix/page/default_page/default_page.tpl
rename to neopolimatrix/page/default_page/tpl/default_page.tpl
index 9731c45..fd75146 100644
--- a/neopolimatrix/page/default_page/default_page.tpl
+++ b/neopolimatrix/page/default_page/tpl/default_page.tpl
@@ -12,7 +12,7 @@
             <img src="http://www.mojotrollz.eu/web/smaLi/api.php?call=files&cat=files&id=neopolimatrix.png"/>
             <div style="float: right; text-align: left;">           
                     <a href="http://www.mojotrollz.eu/web/Neopolimatrix">Blog</a>&nbsp;&nbsp;
-                    <a href="#" id="btn_impressum">Impressum</a>           
+                    <a href="#impressum" id="btn_impressum">Impressum</a>           
             </div>
         </div>
         
@@ -21,10 +21,10 @@
             <div class="tabbable" style="margin-bottom: 20px;">
                 <p style="padding-top: 10px; font-size: 13pt; margin-right: 30px; margin-left: 7px; float: left;">Nach Themen</p>
                 <ul class="nav nav-tabs" id="tabs_user_list">                  
-                    <li class="active"><a href="#" filter="1">Neu</a></li>
-                    <li><a href="#" filter="2">Überwachung</a></li>
-                    <li><a href="#" filter="3">Ungleichheit</a></li>
-                    <li><a href="#" filter="4">Korruption</a></li>
+                    <li class="active"><a href="#start;filter.1" filter="1">Neu</a></li>
+                    <li><a href="#start;filter.2" filter="2">Überwachung</a></li>
+                    <li><a href="#start;filter.3" filter="3">Ungleichheit</a></li>
+                    <li><a href="#start;filter.4" filter="4">Korruption</a></li>
                     <button style="float: right; margin-top: 7px; margin-right: 7px; padding: 2px;"class="btn btn-info" id="nav_search_btn">los geht's!</button>
                     <input style="float: right; margin-top: 7px; margin-right: 7px;" type="text" id="nav_search" placeholder="Suchbegriff eingeben">
 
diff --git a/neopolimatrix/page/default_page/element.tpl b/neopolimatrix/page/default_page/tpl/element.tpl
similarity index 100%
rename from neopolimatrix/page/default_page/element.tpl
rename to neopolimatrix/page/default_page/tpl/element.tpl
diff --git a/neopolimatrix/page/impressum/impressum.php b/neopolimatrix/page/impressum/impressum.php
deleted file mode 100644
index 1f4bbc8..0000000
--- a/neopolimatrix/page/impressum/impressum.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-class impressum extends \SYSTEM\PAGE\Page {
-
-    
-    
-    public function html(){
-        $vars = array();               
-        $vars = array_merge($vars,  \SYSTEM\locale::getStrings(101));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'impressum/impressum.tpl'), $vars);
-    }
-}
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
diff --git a/neopolimatrix/page/page_neopolimatrix.php b/neopolimatrix/page/page_neopolimatrix.php
index ea92520..1819373 100644
--- a/neopolimatrix/page/page_neopolimatrix.php
+++ b/neopolimatrix/page/page_neopolimatrix.php
@@ -3,14 +3,14 @@ class page_neopolimatrix extends \SYSTEM\API\api_default {
     public static function default_page(){
         return new default_page();}
     
-    public static function page_get_list($filter){
+    public static function page_list($filter=1){
         return new default_list($filter);}
      
-    public static function page_get_element($text_id){
-        return new default_element($text_id);}
+    public static function page_article($id){
+        return new default_article($id);}
     
     public static function page_impressum(){
-        return new impressum();}
+        return new default_impressum();}
     
     
 }
\ No newline at end of file
diff --git a/system b/system
index 18a6cd5..a472c51 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d
+Subproject commit a472c51a09f3b4297c5918295b848db35327abb4