diff --git a/danube/autoload.inc.php b/danube/autoload.inc
similarity index 100%
rename from danube/autoload.inc.php
rename to danube/autoload.inc
diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php
index 8e257f0..2bc67b9 100644
--- a/danube/page/default_certificates/default_certificates.php
+++ b/danube/page/default_certificates/default_certificates.php
@@ -1,11 +1,10 @@
 <?php
-
 class default_certificates extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
         $vars['gallery_certifictes'] = $this->gallery();
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_certificates/cerfiticates.tpl'), $vars);
     }
diff --git a/danube/page/default_contact/default_contact.php b/danube/page/default_contact/default_contact.php
index 2a42cd9..1cf3997 100644
--- a/danube/page/default_contact/default_contact.php
+++ b/danube/page/default_contact/default_contact.php
@@ -5,7 +5,7 @@ class default_contact extends SYSTEM\PAGE\Page {
         $vars = array();                        
         $vars['content'] = '';
         
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_contact/contact.tpl'), $vars);
     }
diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php
index 78a01aa..7757839 100644
--- a/danube/page/default_impressions/default_impressions.php
+++ b/danube/page/default_impressions/default_impressions.php
@@ -5,7 +5,7 @@ class default_impressions extends SYSTEM\PAGE\Page {
         $vars = array();                 
                 
         $vars['gallery_impressions'] = $this->gallery();
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_impressions/impressions.tpl'), $vars);
     }
diff --git a/danube/page/default_introduction/default_introduction.php b/danube/page/default_introduction/default_introduction.php
index 2861fb6..7ea76a5 100644
--- a/danube/page/default_introduction/default_introduction.php
+++ b/danube/page/default_introduction/default_introduction.php
@@ -4,7 +4,7 @@ class default_introduction extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));        
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));        
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_introduction/introduction.tpl'), $vars);
     }
diff --git a/danube/page/default_page/danube.tpl b/danube/page/default_page/danube.tpl
index 066ea6e..3a943da 100644
--- a/danube/page/default_page/danube.tpl
+++ b/danube/page/default_page/danube.tpl
@@ -44,12 +44,12 @@
                         <a class="brand" href="" url="?action=default_page">${danube_menu_home}</a>
                         <div class="nav-collapse collapse">
                             <ul class="nav">
-                                <li><a href="javascript:switchTextBg('white')" url="?action=introduction">${danube_menu_introduction}</a></li>
-                                <li><a href="javascript:switchTextBg('white')" url="?action=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
-                                <li><a href="javascript:switchTextBg('white')" url="?action=contact">${danube_menu_contact}</a></li>
-                                <li><a href="javascript:switchTextBg('black')" url="?action=impressions" textbg="black">${danube_menu_impressions}</a></li>
-                                <li><a href="javascript:switchTextBg('black')" url="?action=partners">${danube_menu_partners}</a></li>
-                                <li><a href="javascript:switchTextBg('black')" url="?action=certificates">${danube_menu_certificates}</a></li></ul>
+                                <li><a href="javascript:switchTextBg('white')" url="./?action=introduction">${danube_menu_introduction}</a></li>
+                                <li><a href="javascript:switchTextBg('white')" url="./?action=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
+                                <li><a href="javascript:switchTextBg('white')" url="./?action=contact">${danube_menu_contact}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?action=impressions" textbg="black">${danube_menu_impressions}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?action=partners">${danube_menu_partners}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?action=certificates">${danube_menu_certificates}</a></li></ul>
                             
                     </div><!--/.nav-collapse -->
                     
diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php
index 5518d89..a2fb6bd 100644
--- a/danube/page/default_page/default_page.php
+++ b/danube/page/default_page/default_page.php
@@ -8,9 +8,7 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="http://www.openlayers.org/api/OpenLayers.js"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'osm/osm.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'js/lang_switcher.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/gallery.js').'"></script>'.
                 '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/galleria/galleria-1.2.9.min.js').'"></script>';
     }
     
@@ -23,7 +21,7 @@ class default_page extends SYSTEM\PAGE\Page {
                 <a href="javascript:switchLocale(\'huHU\');"><img src="http://mojotrollz.eu/web/danube/danube/page/js/flags/hu.jpg" /></a></div>';
     }
     
-    public function html(){
+    public function html($_escaped_fragment_ = NULL){
         
         $arr = array_merge($_GET, $_POST);
 
@@ -33,10 +31,11 @@ class default_page extends SYSTEM\PAGE\Page {
         
         $vars = array();  
         $vars['css'] = $this->css();
-        $vars['js'] = $this->js(); 
+        $vars['js'] = '';
+        if(!$_escaped_fragment_){
+            $vars['js'] = $this->js();}
         $vars['languageFlags'] = $this->languageFlags();
-                
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));                    
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));                    
             
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars);        
     }
diff --git a/danube/page/default_page/pics/photos/top2.png b/danube/page/default_page/pics/photos/top2.png
new file mode 100644
index 0000000..87d0364
Binary files /dev/null and b/danube/page/default_page/pics/photos/top2.png differ
diff --git a/danube/page/default_partners/default_partners.php b/danube/page/default_partners/default_partners.php
index 0dc618f..16a9f31 100644
--- a/danube/page/default_partners/default_partners.php
+++ b/danube/page/default_partners/default_partners.php
@@ -5,7 +5,7 @@ class default_partners extends SYSTEM\PAGE\Page {
         $vars = array();                 
         
         $vars['gallery_partners'] = $this->gallery();
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_partners/partners.tpl'), $vars);
     }
diff --git a/danube/page/default_prices/default_prices.php b/danube/page/default_prices/default_prices.php
index 2720ad6..1d79f18 100644
--- a/danube/page/default_prices/default_prices.php
+++ b/danube/page/default_prices/default_prices.php
@@ -4,7 +4,7 @@ class default_prices extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
-        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_prices/prices.tpl'), $vars);
     }
diff --git a/danube/page/page_danube.php b/danube/page/page_danube.php
index 21fb6f2..b7ecc87 100644
--- a/danube/page/page_danube.php
+++ b/danube/page/page_danube.php
@@ -2,43 +2,36 @@
 
 class page_danube extends \SYSTEM\API\api_default {
 
-    public static function default_page(){
-        return new default_page();}
-    
-    public static function action_media(){      
-        throw new ERROR("test");
-    }
+    public static function default_page($_escaped_fragment_ = NULL){
+        return (new default_page($_escaped_fragment_))->html();}
     
     public static function action_googlemaps(){      
-        return new googlemaps();
+        return (new googlemaps())->html();
     }
     
     public static function action_osm(){      
-        return new osm();
+        return (new osm())->html();
     }
     
     public static function action_test(){      
-        return new default_page();
+        return (new default_page())->html();
     }
     
     public static function action_prices(){      
-        return new default_prices();}
+        return (new default_prices())->html();}
     
     public static function action_contact(){      
-        return new default_contact();}
+        return (new default_contact())->html();}
     
     public static function action_certificates(){      
-        return new default_certificates();}
+        return (new default_certificates())->html();}
         
     public static function action_partners(){      
-        return new default_partners();
-    }
+        return (new default_partners())->html();}
     
     public static function action_impressions(){      
-        return new default_impressions();
-    }
+        return (new default_impressions())->html();}
     
     public static function action_introduction(){      
-        return new default_introduction();
-    }            
+        return (new default_introduction())->html();}            
 }
\ No newline at end of file
diff --git a/danube/page/pic/pic.php b/danube/page/pic/pic.php
index 849bf0e..843e54a 100644
--- a/danube/page/pic/pic.php
+++ b/danube/page/pic/pic.php
@@ -4,7 +4,7 @@ class prices extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
-        $vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
         
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'prices/prices.tpl'), $vars);
     }