diff --git a/templates/layout.html b/templates/layout.html
index 65d9a20..971b3af 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="{{ '/css/main.min.css'|url }}" />
     <!--[if lte IE 9]><link rel="stylesheet" href="{{ 'assets/css/ie9.min.css'|url }}" /><![endif]-->
-    <meta name="description" content="{% if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% else %}Die Toolbox Bodensee e.V. ist ein gemeinnütziger Maker- und Hackspace in Markdorf am Bodensee!{% endif %}" />
+    <meta name="description" content="{% if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% else %}{{ bag('translate', 'de', 'description') }}{% endif %}" />
     <link rel="apple-touch-icon" sizes="180x180" href="{{ '/images/icons/apple-touch-icon.png'|url }}">
     <link rel="icon" type="image/png" sizes="32x32" href="{{ '/images/icons/favicon-32x32.png'|url }}">
     <link rel="icon" type="image/png" sizes="16x16" href="{{ '/images/icons/favicon-16x16.png'|url }}">
@@ -26,12 +26,29 @@
         <header id="header">
             <h1 id="logo">
                 <div class="tooltip">
-                    <a id="tb-opened" class="button tb-opened navbar special" href="{% if bag('translate', this.alt, 'api_url') %}{{ bag('translate', this.alt, 'api_url') }}{% else %}/vereinsheim/{% endif %}">{% if bag('translate', this.alt, 'api_space') %}{{ bag('translate', this.alt, 'api_space') }}{% else %}Vereinsheim{% endif %} {% if bag('translate', this.alt, 'api_open') %}{{ bag('translate', this.alt, 'api_open') }}{% else %}offen{% endif %}</a>
-                    <span class="tooltiptext">{% if bag('translate', this.alt, 'api_open_text') %}{{ bag('translate', this.alt, 'api_open_text') }}{% else %}Vereinsheim ist gerade offen. Komm gerne vorbei solange wir da sind!{% endif %}</span>
+                    <a id="tb-opened" class="button tb-opened navbar special" href="{%
+                        if bag('translate', this.alt, 'api_url') %}{{ bag('translate', this.alt, 'api_url') }}{%
+                        else %}{{ bag('translate', 'de', 'api_url') }}{% endif 
+                    %}">{%
+                        if bag('translate', this.alt, 'api_space') %}{{ bag('translate', this.alt, 'api_space') }}{%
+                        else %}{{ bag('translate', 'de', 'api_space') }}{% endif %} {%
+                        if bag('translate', this.alt, 'api_open') %}{{ bag('translate', this.alt, 'api_open') }}{%
+                        else %}{{ bag('translate', 'de', 'api_open') }}{% endif %}</a>
+                    <span class="tooltiptext">{% if bag('translate', this.alt, 'api_open_text') 
+                        %}{{ bag('translate', this.alt, 'api_open_text') }}{%
+                        else %}{{ bag('translate', 'de', 'api_open_text') }}{% endif %}</span>
                 </div>
                 <div class="tooltip">
-                    <a id="tb-closed" class="tb-closed" href="{% if bag('translate', this.alt, 'api_url') %}{{ bag('translate', this.alt, 'api_url') }}{% else %}/vereinsheim/{% endif %}">{% if bag('translate', this.alt, 'api_space') %}{{ bag('translate', this.alt, 'api_space') }}{% else %}Vereinsheim{% endif %} {% if bag('translate', this.alt, 'api_closed') %}{{ bag('translate', this.alt, 'api_closed') }}{% else %}geschlossen{% endif %}</a>
-                    <span class="tooltiptext">{% if bag('translate', this.alt, 'api_opening_time') %}{{ bag('translate', this.alt, 'api_opening_time') }}{% else %}Vereinsheim ist typischerweise Donnerstags 19:30 offen{% endif %}</span>
+                    <a id="tb-closed" class="tb-closed" href="{% if bag('translate', this.alt, 'api_url') %}{{ bag('translate', this.alt, 'api_url') }}{%
+                        else %}{{ bag('translate', 'de', 'api_url') }}{% endif 
+                    %}">{% 
+                        if bag('translate', this.alt, 'api_space') %}{{ bag('translate', this.alt, 'api_space') }}{%
+                        else %}{{ bag('translate', 'de', 'api_space') }}{% 
+                        endif %} {% if bag('translate', this.alt, 'api_closed') %}{{ bag('translate', this.alt, 'api_closed') }}{% 
+                        else %}{{ bag('translate', 'de', 'api_closed') }}{% endif %}</a>
+                    <span class="tooltiptext">{% if bag('translate', this.alt, 'api_opening_time') 
+                        %}{{ bag('translate', this.alt, 'api_opening_time') }}{% 
+                        else %}{{ bag('translate', 'de', 'api_opening_time') }}{% endif %}</span>
                   </div>
             </h1>
             <nav id="nav">
@@ -39,7 +56,7 @@
                 <li{% if this._path == '/' %} class="active"{% endif
                   %}><a href="{{ '/'|url }}">{%
                   if bag('navigation', this.alt, 'home') %}{{ bag('navigation', this.alt, 'home') }}{%
-                  else %}Home{% endif %}</a></li>{%
+                  else %}{{ bag('navigation', 'de', 'home') }}{% endif %}</a></li>{%
                 for href, title, print in [
                   ['/blog', 'Blog', 1],
                   ['/projekte', 'Projekte', 1],
@@ -56,24 +73,56 @@
                       if this._path == child._path %} class="active"{% endif
                       %}><a href="{% if this.alt == 'de' %}{% else %}/{{ this.alt }}/{{ this.alt }}/{% endif %}{{ child|url }}">{{ child.title }}</a></li>{%
                   endif %}{% endfor %}
-                      <li><a href="{{ '/projekte/'|url }}">{% if bag('navigation', this.alt, 'show_projekt') %}{{ bag('navigation', this.alt, 'show_projekt') }}{% else %}alle Projekte{% endif %}</a></li>
-                      <li><a href="{{ '/feed_projekte.xml'|url }}">{% if bag('navigation', this.alt, title) %}{{ bag('navigation', this.alt, title) }}{% else %}{{ title }}{% endif %} {% if bag('navigation', this.alt, 'xml') %}{{ bag('navigation', this.alt, 'xml') }}{% else %}als XML Feed{% endif %}</a></li>
+                      <li><a href="{{ '/projekte/'|url }}">{% 
+                              if bag('navigation', this.alt, 'show_projekt') %}{{ bag('navigation', this.alt, 'show_projekt') }}{% 
+                              else %}{{ bag('navigation', 'de', 'show_projekt') }}{% endif %}</a></li>
+                      <li><a href="{{ '/feed_projekte.xml'|url }}">{% 
+                              if bag('navigation', this.alt, title) %}{{ bag('navigation', this.alt, title) }}{% 
+                              else %}{{ title }}{% endif %} {% 
+                              if bag('navigation', this.alt, 'xml') %}{{ bag('navigation', this.alt, 'xml') }}{% 
+                              else %}{{ bag('navigation', 'de', 'xml') }}{% endif %}</a></li>
                     </ul>{%
                   elif title == 'Verein' %}
-                    <ul><li><a href="{{ '/vereinsheim'|url }}">{% if bag('navigation', this.alt, 'Vereinsheim') %}{{ bag('navigation', this.alt, 'Vereinsheim') }}{% else %}Vereinsheim{% endif %}</a></li>
-                    <li><a href="{{ '/vereinsheim/elektrowerkstatt'|url }}">{% if bag('navigation', this.alt, 'Elektrowerkstatt') %}{{ bag('navigation', this.alt, 'Elektrowerkstatt') }}{% else %}Elektrowerkstatt{% endif %}</a></li>
-                    <li><a href="{{ '/vereinsheim/grobwerkstatt'|url }}">{% if bag('navigation', this.alt, 'Grobwerkstatt') %}{{ bag('navigation', this.alt, 'Grobwerkstatt') }}{% else %}Grobwerkstatt{% endif %}</a></li>
-                    <li><a href="{{ '/vereinsheim/lounge'|url }}">{% if bag('navigation', this.alt, 'Lounge') %}{{ bag('navigation', this.alt, 'Lounge') }}{% else %}Lounge{% endif %}</a></li>
-                    <li><a href="{{ '/verein/presse'|url }}">{% if bag('navigation', this.alt, 'Presse') %}{{ bag('navigation', this.alt, 'Presse') }}{% else %}Presse{% endif %}</a></li>
-                    <li><a href="https://tbbs.me">{% if bag('navigation', this.alt, 'Wiki') %}{{ bag('navigation', this.alt, 'Wiki') }}{% else %}Wiki{% endif %}</a></li>
-                    <li><a href="{{ '/verein/dokumente'|url }}">{% if bag('navigation', this.alt, 'satzung') %}{{ bag('navigation', this.alt, 'satzung') }}{% else %}Satzung und Dokumente{% endif %}</a></li>
-                    <li><a href="{{ '/mitglied-werden'|url }}" class="button special">{% if bag('navigation', this.alt, 'mitglied') %}{{ bag('navigation', this.alt, 'mitglied') }}{% else %}Mitglied werden{% endif %}</a></li>
-                    <li><a href="{{ '/verein/spenden'|url }}">{% if bag('navigation', this.alt, 'spenden') %}{{ bag('navigation', this.alt, 'spenden') }}{% else %}Spenden{% endif %}</a></li>
-                    <li><a href="{{ '/antworten'|url }}">{% if bag('navigation', this.alt, 'fragen') %}{{ bag('navigation', this.alt, 'fragen') }}{% else %}Häufige Fragen{% endif %}</a></li></ul>{%
+                    <ul><li><a href="{{ '/vereinsheim'|url }}">{% 
+                                if bag('navigation', this.alt, 'Vereinsheim') %}{{ bag('navigation', this.alt, 'Vereinsheim') }}{% 
+                                else %}{{ bag('navigation', 'de', 'Vereinsheim') }}{% endif %}</a></li>
+                    <li><a href="{{ '/vereinsheim/elektrowerkstatt'|url }}">{% 
+                            if bag('navigation', this.alt, 'Elektrowerkstatt') %}{{ bag('navigation', this.alt, 'Elektrowerkstatt') }}{% 
+                            else %}{{ bag('navigation', 'de', 'Elektrowerkstatt') }}{% endif %}</a></li>
+                    <li><a href="{{ '/vereinsheim/grobwerkstatt'|url }}">{% 
+                            if bag('navigation', this.alt, 'Grobwerkstatt') %}{{ bag('navigation', this.alt, 'Grobwerkstatt') }}
+                            {% else %}{{ bag('navigation', 'de', 'Grobwerkstatt') }}{% endif %}</a></li>
+                    <li><a href="{{ '/vereinsheim/lounge'|url }}">{% 
+                            if bag('navigation', this.alt, 'Lounge') %}{{ bag('navigation', this.alt, 'Lounge') }}{%
+                            else %}{{ bag('navigation', 'de', 'Lounge') }}{% endif %}</a></li>
+                    <li><a href="{{ '/verein/presse'|url }}">{% 
+                            if bag('navigation', this.alt, 'Presse') %}{{ bag('navigation', this.alt, 'Presse') }}{% 
+                            else %}{{ bag('navigation', 'de', 'Presse') }}{% endif %}</a></li>
+                    <li><a href="https://tbbs.me">{% 
+                            if bag('navigation', this.alt, 'Wiki') %}{{ bag('navigation', this.alt, 'Wiki') }}{%
+                            else %}{{ bag('navigation', 'de', 'Wiki') }}{% endif %}</a></li>
+                    <li><a href="{{ '/verein/dokumente'|url }}">{% 
+                            if bag('navigation', this.alt, 'satzung') %}{{ bag('navigation', this.alt, 'satzung') }}{% 
+                            else %}{{ bag('navigation', 'de', 'satzung') }}{% endif %}</a></li>
+                    <li><a href="{{ '/mitglied-werden'|url }}" class="button special">{%
+                            if bag('navigation', this.alt, 'mitglied') %}{{ bag('navigation', this.alt, 'mitglied') }}{%
+                            else %}{{ bag('navigation', 'de', 'mitglied') }}{% endif %}</a></li>
+                    <li><a href="{{ '/verein/spenden'|url }}">{% 
+                            if bag('navigation', this.alt, 'spenden') %}{{ bag('navigation', this.alt, 'spenden') }}{%
+                            else %}{{ bag('navigation', 'de', 'spenden') }}{% endif %}</a></li>
+                    <li><a href="{{ '/antworten'|url }}">{% 
+                            if bag('navigation', this.alt, 'fragen') %}{{ bag('navigation', this.alt, 'fragen') }}{%
+                            else %}{{ bag('navigation', 'de', 'fragen') }}{% endif %}</a></li></ul>{%
                   elif title == 'Kontakt' %}
-                    <ul><li><a href="{{ '/kontakt'|url }}">{% if bag('navigation', this.alt, 'Kontakt') %}{{ bag('navigation', this.alt, 'Kontakt') }}{% else %}Kontakt{% endif %}</a></li>
-                      <li><a href="{{ '/impressum'|url }}">{% if bag('navigation', this.alt, 'Impressum') %}{{ bag('navigation', this.alt, 'Impressum') }}{% else %}Impressum{% endif %}</a></li>
-                      <li><a href="{{ '/datenschutz/'|url }}">{% if bag('navigation', this.alt, 'Datenschutz') %}{{ bag('navigation', this.alt, 'Datenschutz') }}{% else %}Datenschutz{% endif %}</a></li>
+                    <ul><li><a href="{{ '/kontakt'|url }}">{% 
+                              if bag('navigation', this.alt, 'Kontakt') %}{{ bag('navigation', this.alt, 'Kontakt') }}{% 
+                              else %}{{ bag('navigation', 'de', 'Kontakt') }}{% endif %}</a></li>
+                      <li><a href="{{ '/impressum'|url }}">{% 
+                              if bag('navigation', this.alt, 'Impressum') %}{{ bag('navigation', this.alt, 'Impressum') }}{% 
+                              else %}Impressum{% endif %}</a></li>
+                      <li><a href="{{ '/datenschutz/'|url }}">{% 
+                              if bag('navigation', this.alt, 'Datenschutz') %}{{ bag('navigation', this.alt, 'Datenschutz') }}{% 
+                              else %}Datenschutz{% endif %}</a></li>
                   </ul>{%
                   elif title == 'Blog' %}
                     <ul>{% set root = site.get('/blog/', alt=this.alt) %}{%
@@ -88,8 +137,16 @@
                endfor %}
                <li class="last"><a href="/{% if bag('navigation', this.alt, 'default_path') %}{{ bag('navigation', this.alt, 'default_path') }}{% else %}..{% endif %}{{ this._path }}">{% if bag('navigation', this.alt, 'sprache') %}{{ bag('navigation', this.alt, 'sprache') }}{% else %}Sprache{% endif %}</a>
                    <ul class="last">
-                     <li><a href="/..{{ this._path }}">{% if bag('navigation', this.alt, 'German') %}{{ bag('navigation', this.alt, 'German') }}{% else %}German{% endif %}</a></li>
-                     <li><a href="/en{{ this._path }}">{% if bag('navigation', this.alt, 'Englisch') %}{{ bag('navigation', this.alt, 'Englisch') }}{% else %}english{% endif %} <i>({% if bag('navigation', this.alt, 'falls') %}{{ bag('navigation', this.alt, 'falls') }}{% else %}if available{% endif %})</i></a><li>
+                     <li><a href="/..{{ this._path }}">{% 
+                             if bag('navigation', this.alt, 'German') %}{{ bag('navigation', this.alt, 'German') }}{%
+                             else %}{{ bag('navigation', 'de', 'German') }}{% endif %}</a></li>
+                     <li><a href="/en{{ this._path }}">{% 
+                             if bag('navigation', this.alt, 'Englisch') %}{{ bag('navigation', this.alt, 'Englisch') }}{% 
+                             else %}{{ bag('navigation', 'de', 'Englisch') }}{% 
+                         endif %} <i>({%
+                             if bag('navigation', this.alt, 'falls') %}{{ bag('navigation', this.alt, 'falls') }}{%
+                             else %}{{ bag('navigation', 'de', 'falls') }}{{% 
+                        endif %})</i></a><li>
                    </ul>
                  </li>
               </ul>