diff --git a/danube/page/default_page/css/default_page.css b/danube/page/default_page/css/default_page.css
index 74aed85..472a57b 100644
--- a/danube/page/default_page/css/default_page.css
+++ b/danube/page/default_page/css/default_page.css
@@ -10,6 +10,6 @@ body {background: #6699FF !important}
 #text{line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black;  border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;}
 #languages {float: right; margin-right: 25px;}
 #footer{font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;}
-#footer-left{float: left}
-#footer-left a {color: grey}
+#footer-left{}
+#footer-right a {color: grey}
 #footer-right{text-align: right}
\ No newline at end of file
diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl
index 7cad569..521445c 100644
--- a/danube/page/default_page/tpl/danube.tpl
+++ b/danube/page/default_page/tpl/danube.tpl
@@ -3,67 +3,70 @@
     <head>
         <title>${danube_page_title}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="fragment" content="!">
         ${danube_html_meta}
-        <style>#box1, #box2, #space, #footer{background:url(./files/content/verlauf_bg.png)}</style>  
+        <style>.background{background:url(./files/content/verlauf_bg.png)}</style>  
     </head>
     <body>
-        <div id="headbanner"><img src="./files/content/font.png" alt="Blue Danube Massage"/></div>
-        <div class="hero-unit" id="box1">
-            <div class="hero-unit" id="box2">
-                <nav id="danube_menu" class="navbar navbar-inverse" style="background: none;">
-                    <div class="container-fluid">
-                        <div class="navbar-header">
-                          <button type="button" class="navbar-toggle collapsed pull-left" data-toggle="collapse" data-target="#menu-collapse" aria-expanded="false">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12" style="padding:0 !important">
+                    <h1 style="margin:0;">
+                        <a href="#" title="Blue Danube Massage">
+                            <img class="img-responsive" src="./files/content/font.png" alt="Blue Danube Massage" style="width: 100%;"/>
+                        </a>
+                    </h1>
+                </div>
+            </div>
+        </div>
+        <div class="container background" style="box-shadow: 5px 5px 3px; border: 1px solid black; border-top: 0px;">
+            <div class="row">
+                <nav class="navbar navbar-inverse" style="background: none; border: 0; margin: 0; font-size: 20px;">
+                    <div class="navbar-header" style="padding-left: 9px;">
+                        <button type="button" class="navbar-toggle collapsed pull-left" data-toggle="collapse" data-target="#menu-collapse" aria-expanded="false">
                             <span class="sr-only">Toggle navigation</span>
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
                             <span class="icon-bar"></span>
-                          </button>
-                          <a class="navbar-brand" href="#" onclick="switchTextBg('white')">${danube_menu_home}</a>
-                        </div>
-                        <div class="collapse navbar-collapse" id="menu-collapse">
-                            <ul class="nav navbar-nav">
-                                <li><a href="#!introduction" onclick="switchTextBg('white')">${danube_menu_introduction}</a></li>
-                                <li><a href="#!prices" onclick="switchTextBg('white')">${danube_menu_prices}</a></li>
-                                <li><a href="#!contact" onclick="switchTextBg('white')">${danube_menu_contact}</a></li>
-                                <li><a href="#!impressions" onclick="switchTextBg('black')">${danube_menu_impressions}</a></li>
-                                <li><a href="#!partners" onclick="switchTextBg('black')">${danube_menu_partners}</a></li>
-                                <li><a href="#!certificates" onclick="switchTextBg('black')">${danube_menu_certificates}</a></li>
-                            </ul>
-                        </div>
+                        </button>
+                        <a class="navbar-brand" href="#" onclick="switchTextBg('white')" style="padding-left: 6px;">${danube_menu_home}</a>
+                    </div>
+                    <div class="collapse navbar-collapse" id="menu-collapse">
+                        <ul class="nav navbar-nav">
+                            <li><a href="#!introduction" onclick="switchTextBg('white')">${danube_menu_introduction}</a></li>
+                            <li><a href="#!prices" onclick="switchTextBg('white')">${danube_menu_prices}</a></li>
+                            <li><a href="#!contact" onclick="switchTextBg('white')">${danube_menu_contact}</a></li>
+                            <li><a href="#!impressions" onclick="switchTextBg('black')">${danube_menu_impressions}</a></li>
+                            <li><a href="#!partners" onclick="switchTextBg('black')">${danube_menu_partners}</a></li>
+                            <li><a href="#!certificates" onclick="switchTextBg('black')">${danube_menu_certificates}</a></li>
+                        </ul>
+                        <ul class="nav navbar-nav navbar-right">
+                            <li><iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" style="border:none; overflow:hidden;height:30px; margin-top: 15px; padding: 0; width: 140px;"></iframe></li>
+                        </ul>
                     </div>
                 </nav>
-            </div>
-                            
-            <div id="myCarousel" class="carousel slide">
-                <div class="carousel-inner">
-                    <div id="pic">
-                        <div class="hero-unit" style="background: url('files/content/top2.png') no-repeat black; border-bottom-left-radius: 5; border-bottom-right-radius: 5; margin: 0; padding: 0;">
-                            <div class="item active" style="height: 410px; width: 100%; text-align: right; padding-top: 5px;">&nbsp;</div>                                
+                <div style="margin-left: 9px; margin-right: 9px;">
+                    <div class="row" style="margin:0;">
+                        <div class="col-md-12" style="background: url('files/content/top2.png') no-repeat black; border-bottom-left-radius: 5; border-bottom-right-radius: 5; margin: 0; padding: 0; height: 410px;"></div>
+                    </div>
+
+                    <div class="row" style="height: 24px;">
+                        <div class="col-md-2 pull-right" style="text-align: right; margin-right: 2px;">
+                            <a href="javascript:system.language('deDE');" title="Sprache Deutsch"><img src="./files/content/ger.jpg" alt="Sprache Deutsch" height="14"/></a>
+                            <a href="javascript:system.language('enUS');" title="Language English"><img src="./files/content/uk.jpg" alt="Language English" height="14"/></a>
+                            <a href="javascript:system.language('huHU');" title="Language Hungarian"><img src="./files/content/hu.jpg" alt="Language Hungarian" height="14"/></a>
                         </div>
                     </div>
-                </div>
-            </div>
-        
-            <div id="space"></div>
 
-            <div class="hero-unit" id="text">
-                <div id="languages">
-                    <a href="javascript:system.language('deDE');"><img src="./files/content/ger.jpg" alt="Sprache Deutsch"/></a>
-                    <a href="javascript:system.language('enUS');"><img src="./files/content/uk.jpg" alt="Language English"/></a>
-                    <a href="javascript:system.language('huHU');"><img src="./files/content/hu.jpg" alt="Language Hungarian"/></a>
-                </div>
-                <div id="site-content-wrapper" style="width: 100%;">
-                    <div id="content" style="width: 100%;">
-                        
+                    <div class="row" style="margin:0; line-height: 180%; fonz-size: 80%; border-right: 1px solid black;  border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; background: white;">
+                        <div id="content" class="col-md-12"></div>
+                    </div>    
+                    <div class="row" id="footer">
+                        <div id="footer-left" class="col-md-8">${danube_footer}</div>
+                        <div id="footer-right" class="col-md-4 pull-right">© 2017 <a href="https://www.webcraft-media.de">Webcraft Media</a></div>
                     </div>
-                    <div style="clear: both;"></div>
-                </div>   
-
-            </div>    
-            <div class="hero-unit" id="footer">
-                <div id="footer-left">© 2017 <a href="https://www.webcraft-media.de">Webcraft Media</a></div> <div id="footer-right">${danube_footer}</div>
+                </div>
             </div>
         </div>
         ${css}
diff --git a/lib/system b/lib/system
index f68dd54..d764ef1 160000
--- a/lib/system
+++ b/lib/system
@@ -1 +1 @@
-Subproject commit f68dd54ef5ba9fd4996edaba49795aec1a6263eb
+Subproject commit d764ef189be23dd705bb161235f1b8350f1989fb
