diff --git a/fet2020/static/fet.css b/fet2020/static/fet.css
index 53c5fbf1..b200e7bd 100644
--- a/fet2020/static/fet.css
+++ b/fet2020/static/fet.css
@@ -9,21 +9,19 @@ img.logo {
 }
 
 .title-bar {
-    background: None;
+    background: transparent;
 }
 
 a.header-link {
     background: None;
     color: black;
     font-size: medium;
-    font-weight: bold;
 }
 
 a.header-intern-link {
     background: lightgrey;
     color: black;
     font-size: medium;
-    font-weight: bold;
 }
 
 .header-intern-txt {
@@ -33,15 +31,17 @@ a.header-intern-link {
 }
 
 .header-btn:hover {
-    background: None;
+    background: darkgrey;
+    color: white;
 }
 .header-btn:focus {
-    background: None;
+    background: transparent;
     color: black;
 }
 
 .header-intern-btn:hover {
-    background: lightgrey;
+    background: darkgrey;
+    color: white;
 }
 .header-intern-btn:focus {
     background: lightgrey;
@@ -106,3 +106,47 @@ a.thumbnail img {
     height: 150px;
 
 }
+
+.social-media-box {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: start;
+    -webkit-justify-content: flex-start;
+        -ms-flex-pack: start;
+            justify-content: flex-start;
+    -webkit-box-align: center;
+    -webkit-align-items: center;
+        -ms-flex-align: center;
+            align-items: center;
+    height: 71px;
+    background-color: grey;
+    color: white;
+    padding-top: 0rem !important;
+    padding-right: 0rem !important;
+    padding-bottom: 0rem !important;
+    padding-left: 1rem !important;
+    margin-top: 0rem !important;
+    margin-right: 0rem !important;
+    margin-bottom: 1rem !important;
+    margin-left: 0rem !important; }
+    .social-media-box .social-media-badge {
+        background-color: transparent;
+        width: 41px;
+        height: 41px; }
+        .social-media-box .social-media-badge .social-media-badge-symbol {
+            font-size:30px; }
+    .social-media-box .social-media-text {
+        margin-top: 0rem !important;
+        margin-right: 0rem !important;
+        margin-bottom: 0rem !important;
+        margin-left: 1rem !important; }
+
+.social-media-footer {
+    background-color: transparent;
+    color: white;
+    width: 40px;
+    height: 40px; }
+    .social-media-footer .social-media-footer-symbol {
+        font-size:30px; }
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index a7f10aa8..26b91ea2 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -12,7 +12,11 @@
             <div class="news-hero-text">
                 <hr>
                 <div class="article-date">
-                    <p>{{ post.public_date }}</p>
+                    {% if post.post_type != 'N' %}
+                        <p>{{ post.event_start|date:"d. F Y" }}</p>
+                    {% else %}
+                        <p>{{ post.public_date|date:"d. F Y" }}</p>
+                    {% endif %}
                 </div>
                 <div class="article-title">
                     <h1>{{ post.title|safe }}</h1>
@@ -55,6 +59,29 @@
         </div>
 
         <div class="large-4 medium-5 small-12 small-order-1 medium-order-1 padding-top-1 large-padding-left-1 medium-padding-left-1">
+
+            <a href="mailto:service@fet.at">
+                <div class="social-media-box">
+                    <span class="social-media-badge badge">
+                        <span class="social-media-badge-symbol">
+                        <i class="far fa-envelope"></i>
+                        </span>
+                    </span>
+
+                    <span class="social-media-text">Schreib uns ein Mail :)</span>
+                </div>
+            </a>
+            <a href="https://discord.fet.at">
+                <div class="social-media-box">
+                    <span class="social-media-badge badge">
+                        <span class="social-media-badge-symbol">
+                        <i class="fab fa-discord"></i>
+                        </span>
+                    </span>
+                    <span class="social-media-text">Komm auf unseren Discord-Server!</span>
+                </div>
+            </a>
+
             {% for post in events %}
                 {% include 'posts/partials/_date_box.html' %}
             {% endfor %}
diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index 713b7c62..2c5de674 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -85,21 +85,20 @@
                 </div>
 
                 <div class="cell small-6 medium-3 large-3 padding-bottom-2">
-                    <a class="footer-link" href="https://www.facebook.com/FachschaftET">
-                        <i class="fab fa-facebook-square"></i>
-                    </a>
-                    <a class="footer-link" href="https://www.instagram.com/fet_tuwien/">
-                        <i class="fab fa-instagram-square"></i>
-                    </a>
-                    <a class="footer-link" href="https://discord.gg/7qRuuMA">
-                        <i class="fab fa-discord"></i>
-                    </a>
-                    <a class="footer-link" href="https://t.me/FETInfo">
-                        <i class="fab fa-telegram"></i>
-                    </a>
+                    <span class="badge social-media-footer" href="https://www.facebook.com/FachschaftET">
+                        <i class="social-media-footer-symbol fab fa-facebook-square"></i>
+                    </span>
+                    <span class="badge social-media-footer" href="https://www.instagram.com/fet_tuwien/">
+                        <i class="social-media-footer-symbol fab fa-instagram-square"></i>
+                    </span>
+                    <span class="badge social-media-footer" href="https://discord.fet.at">
+                        <i class="social-media-footer-symbol fab fa-discord"></i>
+                    </span>
+                    <span class="badge social-media-footer" href="https://t.me/FETInfo">
+                        <i class="social-media-footer-symbol fab fa-telegram"></i>
+                    </span>
                 </div>
 
-
             </div>
         </div>
 
diff --git a/fet2020/templates/posts/partials/_posts_hero.html b/fet2020/templates/posts/partials/_posts_hero.html
index 42916668..07f1a125 100644
--- a/fet2020/templates/posts/partials/_posts_hero.html
+++ b/fet2020/templates/posts/partials/_posts_hero.html
@@ -3,7 +3,11 @@
         <div class="news-hero-text">
             <h1>{{ post.title | safe }}</h1>
             <h2>{{ post.subtitle|default_if_none:"&nbsp;" }}</h2>
-            {{ post }}
+            {% if post.post_type != 'N' %}
+                <p>{{ post.event_start|date:"d. F Y" }}</p>
+            {% else %}
+                <p>{{ post.public_date|date:"d. F Y" }}</p>
+            {% endif %}
         </div>
     </div>
 </a>
\ No newline at end of file