diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html
index 4d86c344..b2ceaed0 100644
--- a/fet2020/templates/blackboard/index.html
+++ b/fet2020/templates/blackboard/index.html
@@ -1,38 +1,44 @@
 {% extends 'layout.html' %}
-
 {% block content %}
 
 <div class="grid-container padding-top-1">
+    {% if request.user.is_authenticated %}
+    <div class="grid-x">
+        <div class="cell large-3 medium-4 small-12">
+            <a class="button" href="{% url 'admin:blackboard_jobposting_add' %}">neue Stellenausschreibung hinzufügen</a>
+        </div>
+
+        {% if bb_info %}
+            <div class="cell large-3 medium-4 small-12">
+                <a class="button" href="{% url 'admin:core_customflatpage_change' bb_info.id %}">Info-Text bearbeiten</a>
+            </div>
+        {% endif %}
+
+        {% if bb_empty %}
+            <div class="cell large-3 medium-4 small-12">
+                <a class="button" href="{% url 'admin:core_customflatpage_change' bb_empty.id %}">"leeres Blackboard"-Text bearbeiten</a>
+            </div>
+        {% endif %}
+        <hr>
+    </div>
+    {% endif %}
+
     <h1>Blackboard</h1>
 
     {% if bb_info %}
         {{ bb_info.content|safe }}
         <hr>
-
-        {% if request.user.is_authenticated %}
-            <a href="{% url 'admin:core_customflatpage_change' bb_info.id %}">oberen Blackboard-Text bearbeiten</a>
-            <hr>
-        {% endif %}
-    {% endif %}
-
-    {% if bb_empty and not job_postings %}
-        {{ bb_empty.content|safe }}
-
-        {% if request.user.is_authenticated %}
-            <hr>
-            <a href="{% url 'admin:core_customflatpage_change' bb_empty.id %}">oberen Blackboard-Text bearbeiten</a>
-            <hr>
-        {% endif %}
-    {% endif %}
-
-    {% if request.user.is_authenticated %}
-        <a href="{% url 'admin:blackboard_jobposting_add' %}">neue Stellenausschreibung hinzufügen</a>
-        <hr>
     {% endif %}
 
     <div class="grid-x grid-margin-x">
         {% for job in job_postings %}
             {% include 'blackboard/partials/_show_job_posting.html' %}
+        {% empty %}
+            {% if bb_empty %}
+                <div class="cell large-3 medium-4 small-12">
+                    {{ bb_empty.content|safe }}
+                </div>
+            {% endif %}
         {% endfor %}
     </div>
 </div>
diff --git a/fet2020/templates/blackboard/partials/_show_job_posting.html b/fet2020/templates/blackboard/partials/_show_job_posting.html
index 56907289..79dc330e 100644
--- a/fet2020/templates/blackboard/partials/_show_job_posting.html
+++ b/fet2020/templates/blackboard/partials/_show_job_posting.html
@@ -1,20 +1,22 @@
-    <div class="cell medium-4 large-3 small-12">
-        <h2>{{job.company_name}}</h2>
-        <p>{{job.job_name}}<br>
-        {% if job.number_of_hours == 1 %}
-            Mindestgehalt: {{job.salary}}€ Stundenlohn<br></p>
-        {% else %}
-            monatliches Mindestgehalt:<br>
-            {{job.salary}}€ für {{job.number_of_hours}}h</p>
-        {% endif %}
-        {# only thumb and name of member #}
-        <a class="thumbnail member-thumb" href="{{job.pdf_location.url}}" style="width:200px;height:280px" target="_blank">
-            <img style="width:200px;height:280px" src="{{job.pdf_thumb_location}}" alt="" />
-            <div class="thumb-layer">
-                <div>
-                    <h1>{{job.company_name}}</h1>
-                    <p>{{job.job_name}}</p>
-                </div>
+<div class="cell large-3 medium-4 small-12">
+    <h2>{{job.company_name}}</h2>
+    <p>{{job.job_name}}<br>
+
+    {% if job.number_of_hours == 1 %}
+        Mindestgehalt: {{job.salary}}€ Stundenlohn<br></p>
+    {% else %}
+        monatliches Mindestgehalt:<br>
+        {{job.salary}}€ für {{job.number_of_hours}}h</p>
+    {% endif %}
+
+    {# only thumb and name of member #}
+    <a class="thumbnail member-thumb" href="{{job.pdf_location.url}}" style="width:200px;height:280px" target="_blank">
+        <img style="width:200px;height:280px" src="{{job.pdf_thumb_location}}" alt="" />
+        <div class="thumb-layer">
+            <div>
+                <h1>{{job.company_name}}</h1>
+                <p>{{job.job_name}}</p>
             </div>
-        </a>
-    </div>
+        </div>
+    </a>
+</div>