diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 61749880..1ec98047 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -8,17 +8,17 @@
 
     <div class="medium-8 small cell" style="background: grey"> 
         {% with post=featured_post %}
-        <a href="{{post.url}}">
-        <div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)">
+        <a href="{{ post.url }}">
+        <div class="news-hero-large"style="background-image: url('{{ post.imageurl }}');)">
             <div class="news-hero-text" >
                     <hr>
                     <div class="article-date">
-                        <p>{{post.public_date}}</p>
+                        <p>{{ post.public_date }}</p>
                     </div>
                     
                     <div class="article-title">
-                        <h1>{{post.title| safe}}</h1>
-                        <p>{{post.subtitle | safe}}</p>
+                        <h1>{{ post.title|safe }}</h1>
+                        <p>{{ post.subtitle|default_if_none:"&nbsp;"|safe }}</p>
                     </div>
             </div>
         </div>
@@ -27,17 +27,15 @@
     </div>
 
     <div class="medium-4 responsive-side-box cell">
-
         <a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a>
         <div class="article-row-section">
             {% with post=featured_post %}
                 {% include 'posts/partials/_article_row.html' %}
-            {% endwith %}  
+            {% endwith %}
             {% for post in featured_meeting %}
                 {% include 'posts/partials/_meeting_row.html' %}
-            {% endfor %}  
+            {% endfor %}
         </div>
-
     </div>
 </div>
 
@@ -46,7 +44,6 @@
         {{ tags_list|tags_to_url }} 
     </div>
 
-
     <div class="grid-x grid-x-padding">
         <div class="medium-8 small-12 small-order-2 medium-order-1"">
             {% for post in posts %}
diff --git a/fet2020/templates/posts/partials/_posts_hero.html b/fet2020/templates/posts/partials/_posts_hero.html
index fa2d7843..54e98043 100644
--- a/fet2020/templates/posts/partials/_posts_hero.html
+++ b/fet2020/templates/posts/partials/_posts_hero.html
@@ -1,8 +1,9 @@
 <a href="{% url 'posts.show' post.slug %}">
-    <div class="news-hero padding-bottom-1" style="background-image:url('{{post.imageurl}}')">
+    <div class="news-hero padding-bottom-1" style="background-image:url('{{ post.imageurl }}')">
         <div class="news-hero-text">
-            <h1>{{post.title}}</h1>
-            <h2>{{post.subtitle}}</h2>{{post}}
+            <h1>{{ post.title }}</h1>
+            <h2>{{ post.subtitle|default_if_none:"&nbsp;" }}</h2>
+            {{ post }}
         </div>
     </div>
 </a>
\ No newline at end of file
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index 7c18c9de..4394a2f0 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -1,39 +1,34 @@
-
 {% extends "layout.html" %}
 {% load post_helpers %}
 {% load admin_urls %}
 {% block content %}
 
-<div class="large-article-header" style="background-image:url('{{post.imageurl}}')">
+<div class="large-article-header" style="background-image:url('{{ post.imageurl }}')">
     <div class="large-article-header-content">
         <div class="center-container">
             <div class="article-date">
-                <p>{{post.public_date}}</p>
+                <p>{{ post.public_date }}</p>
             </div>
 
             <div class="article-title">
-                <h1>{{post.title |tags_to_url}}</h1>
+                <h1>{{ post.title|tags_to_url }}</h1>
             </div>
 
             <div class="article-details">
-            {{post.subtitle |tags_to_url}}
+                {{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}
 
-            {% if post.author %}
-                <div class="article-author"><a href="{% url 'member' post.author %}">
-                <img src="{{author_image}}" alt="" /> {{post.author}}
-                </a>
-                </div>
-            {% else %}
-                <div class="article-author"><a href="">
-                <img src="" alt="" />
-                {{post.author}}</a>
-                </div>
-            {% endif %}
-
-            </div> <button class="">
-
-            <span class="nav fa fa-chevron-right fa-3x"></span>
-        </button>
+                {% if post.author %}
+                    <div class="article-author"><a href="{% url 'member' post.author %}">
+                    <img src="{{ author_image }}" alt="" /> {{ post.author }}
+                    </a>
+                    </div>
+                {% else %}
+                    <div class="article-author"><a href="">
+                    <img src="" alt="" />
+                    {{ post.author }}</a>
+                    </div>
+                {% endif %}
+            </div>
         </div>
     </div>
 </div>
@@ -41,48 +36,48 @@
 <div class="grid-container">
     <div class="grid-x">
         <div class="cell medium-8">
-            <h1>{{post.title | tags_to_url}}</h1>
-            <strong>{{post.subtitle | tags_to_url}}</strong><span class="nav fa fa-chevron-right fa-3x"></span>
+            <h1>{{ post.title|tags_to_url }}</h1>
+            <strong>{{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}</strong>
+            <span class="nav fa fa-chevron-right fa-3x"></span>
             <br>
             <a href="{% url 'posts.show' next %}">Nächster Artikel</a><br>
 
-        
-        <div class="cell medium-4">
-        {% include 'posts/partials/_date_box.html' %}
+            <div class="cell medium-4">
+            {% include 'posts/partials/_date_box.html' %}
+            </div>
+
+            Start: {{ post.event_start }}<br>
+            Ende: {{ post.event_end }}<br>
+
+            {% if post.has_agenda %}
+            <a href="{{ ep_agenda_link }}">Agenda</a><br>
+            {% endif %}
+
+            {% if post.has_protocol %}
+            <a href="{{ ep_protocol_link }}">Protokoll</a>
+            {% endif %}
+
+            {% if request.user.is_authenticated %}
+            <br>------<br>
+            <a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
+            {% endif %}
+
+            <hr>
+            {% for tag in post.get_tagnames %}
+                {{ tag|tags_to_url }}
+            {% endfor %}
+
+            <hr>
+            {% if post.has_agenda %}
+            <h2>Agenda</h2>
+            {{ post.agenda_html|safe }}
+            {% endif %}
+
+            {{ post.body|safe|add_internal_links|tags_to_url }}
+            <hr>
         </div>
-
-        Start: {{post.event_start}}<br>
-        Ende: {{post.event_end}}<br>
-        
-        {% if post.has_agenda %}
-        <a href="{{ep_agenda_link}}">Agenda</a><br>
-        {% endif %}
-
-        {% if post.has_protocol %}
-        <a href="{{ep_protocol_link}}">Protokoll</a>
-        {% endif %}
-
-        {% if request.user.is_authenticated %}
-        <br>------<br>
-        <a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
-        {% endif %}
-
-        <hr>
-        {% for tag in post.get_tagnames %}
-            {{tag |tags_to_url}}
-        {% endfor %}
-
-        <hr>
-        {% if post.has_agenda %}
-        <h2>Agenda</h2>
-        {{post.agenda_html |safe}}
-        {% endif %}
-
-        {{post.body | safe | add_internal_links | tags_to_url}}
-        <hr>
-        </div>
-
     </div>
+
     <div class="grid-x grid-margin-x">
         {% for post in related_posts %}
         <div class="medium-6 large-4 small-12 cell">