diff --git a/neopolimatrix/autoload.inc b/neopolimatrix/autoload.inc
index a34c504..d4ce88a 100644
--- a/neopolimatrix/autoload.inc
+++ b/neopolimatrix/autoload.inc
@@ -2,5 +2,4 @@
 require_once dirname(__FILE__).'/path/autoload.inc';
 require_once dirname(__FILE__).'/page/autoload.inc';
 require_once dirname(__FILE__).'/files/autoload.inc';
-require_once dirname(__FILE__).'/dbd/autoload.inc';
 require_once dirname(__FILE__).'/api/autoload.inc';
\ No newline at end of file
diff --git a/neopolimatrix/dbd/autoload.inc b/neopolimatrix/dbd/autoload.inc
deleted file mode 100644
index cc65101..0000000
--- a/neopolimatrix/dbd/autoload.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
\ No newline at end of file
diff --git a/neopolimatrix/dbd/db/neopolimatrix.php b/neopolimatrix/dbd/db/neopolimatrix.php
deleted file mode 100644
index 7515cd1..0000000
--- a/neopolimatrix/dbd/db/neopolimatrix.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace DBD;
-
-class smaLi extends \SYSTEM\DB\DBInfoMYS {
-
-    public function  __construct() {
-        parent::__construct('DB1859981', 'U1859981', 'Dack3lbuT', 'rdbms.strato.de');}
-}
\ No newline at end of file
diff --git a/neopolimatrix/dbd/tbl/locale_string.php b/neopolimatrix/dbd/tbl/locale_string.php
deleted file mode 100644
index c5cfeb2..0000000
--- a/neopolimatrix/dbd/tbl/locale_string.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace DBD;
-
-class locale_string extends \SYSTEM\DBD\system_locale_string {
-
-const VALUE_CATEGORY_MAINPAGE = 100;
-
-}
\ No newline at end of file
diff --git a/neopolimatrix/page/article/article.php b/neopolimatrix/page/article/article.php
new file mode 100644
index 0000000..27be76d
--- /dev/null
+++ b/neopolimatrix/page/article/article.php
@@ -0,0 +1,15 @@
+<?php
+class article {
+    public static function preview($element = array()){
+        $element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
+        $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'article/tpl/preview.tpl'), $element);
+    }
+
+    public static function full($element = array()) {
+        $element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
+        $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'article/tpl/article.tpl'), $element);
+    }
+
+}
\ No newline at end of file
diff --git a/neopolimatrix/page/article/autoload.inc b/neopolimatrix/page/article/autoload.inc
new file mode 100644
index 0000000..8fd92c5
--- /dev/null
+++ b/neopolimatrix/page/article/autoload.inc
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file
diff --git a/neopolimatrix/page/default_article/tpl/element.tpl b/neopolimatrix/page/article/tpl/article.tpl
similarity index 80%
rename from neopolimatrix/page/default_article/tpl/element.tpl
rename to neopolimatrix/page/article/tpl/article.tpl
index 9d8a419..23f7656 100644
--- a/neopolimatrix/page/default_article/tpl/element.tpl
+++ b/neopolimatrix/page/article/tpl/article.tpl
@@ -1,4 +1,4 @@
-<button class="btn btn-default" id="backbtn">zurück</button>
+<button class="btn btn-default" onclick="system.back();">zurück</button>
 <br>
 <br>
 <div class="list_element" text_id="${id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: justify;">
@@ -13,5 +13,5 @@ ${text}
 <br>
 <br>
 <br>
-    <div class="fb-comments" data-href="http://www.neopolimatrix.eu/#article;article.${id}" data-numposts="20" data-colorscheme="light"></div>
+    <div class="fb-comments" data-href="http://www.neopolimatrix.eu/#!article;article.${id}" data-numposts="20" data-colorscheme="light"></div>
 </div>
\ No newline at end of file
diff --git a/neopolimatrix/page/default_list/tpl/element.tpl b/neopolimatrix/page/article/tpl/preview.tpl
similarity index 76%
rename from neopolimatrix/page/default_list/tpl/element.tpl
rename to neopolimatrix/page/article/tpl/preview.tpl
index e42d45b..395365b 100644
--- a/neopolimatrix/page/default_list/tpl/element.tpl
+++ b/neopolimatrix/page/article/tpl/preview.tpl
@@ -1,7 +1,6 @@
-<div class ="list_element" text_id="${id}" style="">
-    <div class="element_hover article" text_id="${id}" style="border-bottom: 1px black solid; text-align: justify;">
+<div class ="list_element" onclick="system.load('article;article.${id}')">
+    <div class="element_hover article" style="border-bottom: 1px black solid; text-align: justify;">
         <p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author_name}</i></p>
-
         <p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
         <div style="clear: both;"></div>
         <div style="border-top: solid 1px black; width: 100%;"></div>
diff --git a/neopolimatrix/page/autoload.inc b/neopolimatrix/page/autoload.inc
index 6dd09d1..6f4c41b 100644
--- a/neopolimatrix/page/autoload.inc
+++ b/neopolimatrix/page/autoload.inc
@@ -1,5 +1,6 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+require_once dirname(__FILE__).'/article/autoload.inc';
 require_once dirname(__FILE__).'/default_page/autoload.inc';
 require_once dirname(__FILE__).'/default_list/autoload.inc';
 require_once dirname(__FILE__).'/default_article/autoload.inc';
diff --git a/neopolimatrix/page/default_article/default_article.php b/neopolimatrix/page/default_article/default_article.php
index 2acff23..977266b 100644
--- a/neopolimatrix/page/default_article/default_article.php
+++ b/neopolimatrix/page/default_article/default_article.php
@@ -7,12 +7,7 @@ class default_article extends \SYSTEM\PAGE\Page {
         return array(   \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/default_article.js'));}
 
     public function html(){
-        $vars = array();
         $element = \SYSTEM\PAGE\text::get_adv($this->id);
-        $element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
-        $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
-        $vars['text'] = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/element.tpl'), $element);
-        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/default_article.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replace(article::full($element), \SYSTEM\PAGE\text::tag('time'));
     }
 }
\ No newline at end of file
diff --git a/neopolimatrix/page/default_article/js/default_article.js b/neopolimatrix/page/default_article/js/default_article.js
index c5b3502..1cbc181 100644
--- a/neopolimatrix/page/default_article/js/default_article.js
+++ b/neopolimatrix/page/default_article/js/default_article.js
@@ -1,11 +1,3 @@
 function init_article(){
    FB.XFBML.parse(document.body);
-   back();
-}
-
-function back(){
-    $('#backbtn').click(function(){
-        system.back();
-    }); 
-            
 }
\ No newline at end of file
diff --git a/neopolimatrix/page/default_article/tpl/default_article.tpl b/neopolimatrix/page/default_article/tpl/default_article.tpl
deleted file mode 100644
index 828caf4..0000000
--- a/neopolimatrix/page/default_article/tpl/default_article.tpl
+++ /dev/null
@@ -1 +0,0 @@
-${text}
diff --git a/neopolimatrix/page/default_list/default_list.php b/neopolimatrix/page/default_list/default_list.php
index 73f079e..ff194f2 100644
--- a/neopolimatrix/page/default_list/default_list.php
+++ b/neopolimatrix/page/default_list/default_list.php
@@ -31,10 +31,7 @@ class default_list extends \SYSTEM\PAGE\Page {
         $vars['list'] = '';
         $elements = \SYSTEM\PAGE\text::tag_adv($this->tag ? $this->tag : 'neopolimatrix');
         foreach($elements as $element){
-            $element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
-            $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
-            $vars['list'] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/element.tpl'), $element);
-        }
+            $vars['list'] .= article::preview($element);}
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars);
     }
diff --git a/neopolimatrix/page/default_list/js/default_list.js b/neopolimatrix/page/default_list/js/default_list.js
index 4c69f28..e7c1166 100644
--- a/neopolimatrix/page/default_list/js/default_list.js
+++ b/neopolimatrix/page/default_list/js/default_list.js
@@ -1,5 +1,2 @@
-function init_start(){
-    $(".list_element").click(function(){
-        system.load('article;article.'+$(this).attr('text_id'));
-    });   
+function init_start(){  
 }
\ No newline at end of file
diff --git a/neopolimatrix/page/default_search/default_search.php b/neopolimatrix/page/default_search/default_search.php
index 6debedd..e767cb0 100644
--- a/neopolimatrix/page/default_search/default_search.php
+++ b/neopolimatrix/page/default_search/default_search.php
@@ -12,11 +12,7 @@ class default_search extends \SYSTEM\PAGE\Page {
         $vars['search'] = '';
         $elements = \SYSTEM\PAGE\text::search($this->param, 'neopolimatrix');
         foreach($elements as $element){
-            $element['title'] = $element['id'];
-            $element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
-            $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
-            $vars['search'] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/element.tpl'), $element);
-        }
+            $vars['search'] .= article::preview($element);}
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars);
     }
diff --git a/neopolimatrix/page/default_search/tpl/element.tpl b/neopolimatrix/page/default_search/tpl/element.tpl
deleted file mode 100644
index 02f23f0..0000000
--- a/neopolimatrix/page/default_search/tpl/element.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div style="width: 750px; margin: auto; margin-bottom: 50px; text-align: justify;">
-    <p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author_name}</i></p>
-    <p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${ago}</p>
-    <div style="clear: both;"></div>
-    <div style="border-top: solid 1px black; width: 100%;"></div>
-    <h2>${title}</h2>
-    <br>
-    ${text}
-    <br>
-</div>
\ No newline at end of file