diff --git a/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss b/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
index c81837c..764601d 100644
--- a/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
+++ b/src/assets/scss/templates/freifunk-all-in-one-event-calendar.scss
@@ -20,7 +20,7 @@ $freifunk-color-blue: rgb(0,158,224);
 
       border: 1px solid #888;
       border-top: none;
-      border-radius: 5px;
+      border-radius: 0;
       -webkit-box-shadow: none;
       box-shadow: none;
       -webkit-box-sizing: border-box;
@@ -51,8 +51,8 @@ $freifunk-color-blue: rgb(0,158,224);
     border-radius: 0;
     color: #fff;
     font-size: inherit;
-    letter-spacing: 0.2em;
-    padding: 0.2em 0.2em;
+    letter-spacing: 0em;
+    padding: 0.3em 0.2em 0.2em;
     text-transform: inherit;
     text-shadow: none;
 
diff --git a/src/assets/scss/templates/freifunk.scss b/src/assets/scss/templates/freifunk.scss
index 532de83..88edf21 100644
--- a/src/assets/scss/templates/freifunk.scss
+++ b/src/assets/scss/templates/freifunk.scss
@@ -34,6 +34,11 @@ p, li, blockquote {
 
 /* header/topbar */
 
+header.site-header {
+    position: relative;
+    z-index: 10;
+}
+
 .title-bar-left {
     padding-left: 10px;
 
@@ -46,6 +51,7 @@ p, li, blockquote {
 }
 .title-bar-title {
     padding-left: 5px;
+    position: relative;
 }
 
 .top-bar-outer {
@@ -115,9 +121,14 @@ p, li, blockquote {
     }
     .top-bar-right {
       background-color: #2C3840;
-      margin-top: 30px;
+      margin-top: 0;
+      @media screen and (min-width: 39.9375em) {
+        margin-top: 30px;
+      }
      .menu  {
         margin-right: 1rem;
+        margin-top: 100px;
+
         li, li:not(:last-child), li:not(.menu-text) {
           border-right: 0px solid #4e4e4e;
           margin: 0;