diff --git a/_includes/footer.html b/_includes/footer.html
index ac5e80e..d4d8bcf 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,21 +2,21 @@
 <div class="container" id="contact">
     <div class="row">
         <div class="col-md-4">
-            <p>
-                <span class="fa fa-fw fa-map-marker"></span> <a href="https://www.openstreetmap.org/?mlat=51.43852&amp;mlon=7.02494#map=19/51.43852/7.02494">Sibyllastr. 9 (Hinterhof), 45136 Essen</a>
-            </p>
-
-            <p>
-                <span class="fa fa-fw fa-envelope"></span> Kontakt: <span id="e634474788">[javascript protected email address]</span>
-                <script type="text/javascript">/*<![CDATA[*/
-                eval("var a=\"KLymbg_4UN6zqCQHdx19cSGfja2ulE.PAMXh-+ZokiFIe@DrW7O358vwtBRn0VspJYT\";var b=a.split(\"\").sort().join(\"\");var c=\"7vDwCIWiwntw00ye@\";var d=\"\";for(var e=0;e<c.length;e++)d+=b.charAt(a.indexOf(c.charAt(e)));document.getElementById(\"e634474788\").innerHTML=\"<a href=\\\"mailto:\"+d+\"\\\">\"+d+\"</a>\"")/*]]>*/</script>
+            <p><span class="fa fa-fw fa-map-marker"></span>
+                <a href="https://www.openstreetmap.org/?mlat=51.43852&amp;mlon=7.02494#map=19/51.43852/7.02494">Sibyllastr. 9 (Hinterhof), 45136 Essen</a>
             </p>
+            <p><span class="fa fa-fw fa-sleigh"></span> <a href="/location.html">Anfahrt</a></p>
             <p><span class="fa fa-fw fa-gavel"></span> <a href="/impressum.html">Impressum</a></p>
             <p><span class="fas fa-fw fa-shield-alt"></span> <a href="/datenschutzerklaerung.html">Datenschutzerklärung</a></p>
         </div>
         <div class="col-md-4">
             <p><span class="fa fa-fw fa-comments"></span> Matrix: <a href="https://matrix.to/#/#c3e:chaospott.de">#c3e:chaospott.de</a></p>
-            <p><span class="fa fa-fw fa-inbox"></span> <a href="https://lists.chaospott.de/postorius/lists/discuss.lists.chaospott.de/">Mailingliste</a></p>
+            <p>
+                <span class="fa fa-fw fa-envelope"></span> Kontakt: <span id="e634474788">[javascript protected email address]</span>
+                <script type="text/javascript">/*<![CDATA[*/
+                eval('var a="KLymbg_4UN6zqCQHdx19cSGfja2ulE.PAMXh-+ZokiFIe@DrW7O358vwtBRn0VspJYT";var b=a.split("").sort().join("");var c="7vDwCIWiwntw00ye@";var d="";for(var e=0;e<c.length;e++)d+=b.charAt(a.indexOf(c.charAt(e)));document.getElementById("e634474788").innerHTML="<a href=\\"mailto:"+d+"\\">"+d+"</a>"')/*]]>*/</script>
+            </p>
+            <p><span class="fa fa-fw fa-envelope-open-text"></span> <a href="/contact.html">Weitere Kontaktmöglichkeiten</a></p>
             <p><span class="fas fa-fw fa-rss"></span> <a href="https://chaospott.de/feed.xml">RSS-Feed</a></p>
         </div>
         <div class="col-md-4">
diff --git a/_includes/header.html b/_includes/header.html
index ccadbfc..02013c1 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -23,12 +23,8 @@
                 <!-- <li class="divider-vertical"></li>
                 <li><a href="/virtuell.html">Virtueller c3e</a></li> -->
                 <li class="divider-vertical"></li>
-                <li><a href="/location.html">Anfahrt</a>
-                <li class="divider-vertical"></li>
                 <li><a href="/cms.html">Schule</a></li>
                 <li class="divider-vertical"></li>
-                <li><a href="/contact.html">Kontakt</a></li>
-                <li class="divider-vertical"></li>
                 <li><a href="https://wiki.chaospott.de">Wiki</a></li>
                 <li class="divider-vertical"></li>
                 <li><a href="https://podcast.chaospott.de">Podcast</a></li>