diff --git a/fet2020/templates/intern/docu.html b/fet2020/templates/intern/docu.html
index 3de34b35..1f7d93c8 100644
--- a/fet2020/templates/intern/docu.html
+++ b/fet2020/templates/intern/docu.html
@@ -13,80 +13,33 @@
     </div>
 
     <div class="intern-hero">
+
+        {% if request.user.is_authenticated %}
+            <div class="grid-x grid-padding-x padding-top-1">
+                <div class="cell large-3 medium-4 small-12">
+                    <a class="button" href="{% url 'admin:intern_documentation_change' active_docu.id %}">Beschreibung bearbeiten</a>
+                </div>
+            </div>
+        {% endif %}
+
         {% if active_docu.description %}
             <div class="padding-top-1 padding-left-1 padding-right-1">
-                <a href="{% url 'admin:intern_topic_change' active_topic.id %}">Beschreibung bearbeiten</a>        
-                <hr>
                 {{ active_docu.description|safe }}
                 <hr>
             </div>
         {% endif %}
 
-        will man diese Buttons haben?
-        <div class="grid-x padding-top-1 padding-left-1 padding-right-1">
-            <div class="cell large-3 medium-4 small-10">
-                <a class="button" href="{% url 'etherpad-create' active_topic.slug active_docu.slug %}">neues Etherpad erstellen</a>
-            </div>
-            <div class="cell large-3 medium-4 small-10">
-                <a class="button" href="{% url 'file-create' active_topic.slug active_docu.slug %}">neue Datei hochladen</a>
-            </div>
-        </div>
-        <hr>
-        
-        oder direkt hier es erstellen?
-        <form action="" method="post">
-        {% csrf_token %}
-
-            <div class="grid-x grid-padding-x padding-top-1">
-
-                {{ form_add_etherpad.management_form }}
-
-                {% for form in form_add_etherpad %}
-                <div class="cell medium-3 large-2 small-10">
-                    {{ form }}
-                </div>
-                {% endfor %}
-                
-                {{ form_add_etherpad.non_field_errors }}
-
-                <div class="cell medium-3 large-2 small-10 align-self-bottom">
-                    <input type="submit" class="button" name="btn_etherpad" value="Etherpad neu erstellen">
-                </div>
-            </div>
-        </form>
-
-        <form action="" method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-
-            <div class="grid-x grid-padding-x padding-top-1">
-
-                {{ form_add_file.management_form }}
-
-                {% for form in form_add_file %}
-                <div class="cell medium-3 large-2 small-10">
-                    {{ form }}
-                </div>
-                {% endfor %}
-                
-                {{ form_add_file.non_field_errors }}
-
-                <div class="cell medium-3 large-2 small-10 align-self-bottom">
-                    <input type="submit" class="button" name="btn_fileupload" value="Dokument hochladen">
-                </div>
-            </div>
-        </form>
-
-        {% for message in messages %}
-            <p id="messages" style="background-color: red">{{message}}</p>
-        {% endfor %}
-
-        <hr>
-    
-
         <div class="grid-x grid-padding-x">
             <div class="cell">
-                {% if documents %}
                 Etherpad Dokumente:
+                <a href="{% url 'etherpad-create' active_topic.slug active_docu.slug %}">
+                    <div class="news-hero-compact">
+                        <div class="news-hero-compact-text">
+                            <p style="margin-bottom: 0rem;">+ neues Etherpad erstellen</p>
+                        </div>
+                    </div>
+                </a>
+
                 {% for document in documents %}
                 <a href="{{ document.etherpad_key }}">
                     <div class="news-hero-compact">
@@ -99,10 +52,16 @@
                     </div>
                 </a>
                 {% endfor %}
-                {% endif %}
 
-                {% if files %}
                 Dokumente:
+                <a href="{% url 'file-create' active_topic.slug active_docu.slug %}">
+                    <div class="news-hero-compact">
+                        <div class="news-hero-compact-text">
+                            <p style="margin-bottom: 0rem;">+ neue Datei hochladen</p>
+                        </div>
+                    </div>
+                </a>
+
                 {% for file in files %}
                 <a href="{{ file.file_field.url }}" target="_blank">
                     <div class="news-hero-compact">
@@ -115,7 +74,6 @@
                     </div>
                 </a>
                 {% endfor %}
-                {% endif %}
             </div>
         </div>
     </div>
diff --git a/fet2020/templates/intern/index.html b/fet2020/templates/intern/index.html
index 5f2b5b28..ff3fd4c6 100644
--- a/fet2020/templates/intern/index.html
+++ b/fet2020/templates/intern/index.html
@@ -2,6 +2,14 @@
 {% block content %}
 
 <div class="grid-container">
+    <div class="grid-x padding-top-1">
+        {% if request.user.is_authenticated %}
+            <div class="cell large-3 medium-4 small-12">
+                <a class="button" href="{% url 'admin:intern_topicgroup_add' %}">neuen Themenbereich hinzufügen</a>
+            </div>
+        {% endif %}
+    </div>
+
     {% regroup topic by topic_group as topic_list %}
     {% for topic in topic_list %}
         <div class="internheader">
@@ -20,6 +28,15 @@
                 </a>
             </div>
         {% endfor %}
+            <div class="cell large-2 medium-4 small-6">
+                <a href="{% url 'admin:intern_topic_add' %}">
+                <div class="intern-topic">
+                    <div class="intern-topic-text">
+                    +
+                    </div>
+                </div>
+                </a>
+            </div>
         </div>
     {% endfor %}
 
diff --git a/fet2020/templates/intern/topic.html b/fet2020/templates/intern/topic.html
index 80ac64db..2d489faf 100644
--- a/fet2020/templates/intern/topic.html
+++ b/fet2020/templates/intern/topic.html
@@ -14,7 +14,7 @@
     <div class="intern-hero">
         <div class="grid-x padding-top-1 padding-left-1 padding-right-1">
             <div class="cell large-3 medium-4 small-10">
-                <a class="button" href="{% url 'admin:intern_topic_change' active_topic.id %}">Beschreibung bearbeiten</a>
+                <a class="button" href="{% url 'admin:intern_topic_change' active_topic.id %}">Thema bearbeiten</a>
             </div>
             <div class="cell large-3 medium-4 small-10">
                 <a class="button" href="{% url 'task-create' %}">neuen Task hinzufügen</a>
@@ -22,10 +22,10 @@
         </div>
 
         {% if active_topic.description %}
-        <div class="grid-x padding-top-1 padding-left-1 padding-right-1">
+        <div class="padding-top-1 padding-left-1 padding-right-1">
             {{ active_topic.description|safe }}
+            <hr>
         </div>
-        <hr>
         {% endif %}
 
         {% if tasks %}
@@ -54,6 +54,18 @@
                 </a>
             </div>
         {% endfor %}
+
+            <div class="cell large-2 medium-4 small-6">
+                <a href="{% url 'admin:intern_documentation_add' %}">
+                <div class="intern-topic">
+                    <div class="intern-topic-text">
+                    +
+                    </div>
+                </div>
+                </a>
+            </div>
+
+
         </div>
     </div>
 </div>
diff --git a/fet2020/templates/tasks/task_create.html b/fet2020/templates/tasks/task_create.html
index f4e71e16..56458b7e 100644
--- a/fet2020/templates/tasks/task_create.html
+++ b/fet2020/templates/tasks/task_create.html
@@ -3,7 +3,12 @@
 
 <div class="grid-container">
     <div class="grid-x padding-top-1">
-        <a class="button" href="{% url 'tasks' %}">Zurück</a>
+        <div class="cell large-3 medium-4 small-12">
+            <a class="button" href="{% url 'tasks' %}">Zurück</a>
+        </div>
+        <div class="cell large-3 medium-4 small-12">
+            <a class="button" href="{% url 'admin:tasks_tasklist_add' %}">Task-Gruppe erstellen</a>
+        </div>
     </div>
     <hr>
 
diff --git a/fet2020/templates/tasks/task_detail.html b/fet2020/templates/tasks/task_detail.html
index 8b9a02bf..3c60a5af 100644
--- a/fet2020/templates/tasks/task_detail.html
+++ b/fet2020/templates/tasks/task_detail.html
@@ -2,12 +2,14 @@
 {% block content %}
 
 <div class="grid-container">
-    <div class="grid-x  padding-top-1">
-        <div class="cell large-2 medium-4 small-6">
+    <div class="grid-x padding-top-1">
+        <div class="cell large-3 medium-4 small-12">
             <a class="button" href="{% url 'tasks' %}">Zurück</a>
         </div>
-
-        <div class="cell large-2 medium-4 small-6">
+        <div class="cell large-3 medium-4 small-12">
+            <a class="button" href="{% url 'admin:tasks_task_change' task.id %}">Task bearbeiten</a>
+        </div>
+        <div class="cell large-3 medium-4 small-12">
             <a class="button" href="{% url 'docu-create' task.id %}">Etherpad hinzufügen</a>
         </div>
     </div>