diff --git a/AKModel/templates/admin/AKModel/status.html b/AKModel/templates/admin/AKModel/status.html
index 338706209434529a6ddc569b1bb39c75c7eae9d2..27702d51b5801ce178e1069c970a00d699433c88 100644
--- a/AKModel/templates/admin/AKModel/status.html
+++ b/AKModel/templates/admin/AKModel/status.html
@@ -72,8 +72,12 @@
                         </tbody>
                     </table>
 
-                    <a class="btn btn-success" href="{% url 'admin:ak_csv_export' event_slug=event.slug %}">{% trans "Export AKs as CSV" %}</a>
-                    <a class="btn btn-success" href="{% url 'admin:ak_wiki_export' event_slug=event.slug %}">{% trans "Export AKs for Wiki" %}</a>
+                    <a class="btn btn-success"
+                       href="{% url 'admin:schedule' event_slug=event.slug %}">{% trans "Scheduling" %}</a>
+                    <a class="btn btn-success"
+                       href="{% url 'admin:ak_csv_export' event_slug=event.slug %}">{% trans "Export AKs as CSV" %}</a>
+                    <a class="btn btn-success"
+                       href="{% url 'admin:ak_wiki_export' event_slug=event.slug %}">{% trans "Export AKs for Wiki" %}</a>
                 {% endif %}
 
                 <h3 class="block-header">{% trans "Requirements" %}</h3>
diff --git a/AKModel/templates/admin/ak_index.html b/AKModel/templates/admin/ak_index.html
index 1aea83f3135db5c3a5185ac4136264663b2d2055..6999744fe64ff631987fd47c28ab0da2b10bb09a 100644
--- a/AKModel/templates/admin/ak_index.html
+++ b/AKModel/templates/admin/ak_index.html
@@ -9,12 +9,14 @@
         <ul>
             {% for event in active_events %}
                 <li>
-                    <a href="{% url 'admin:event_status' slug=event.slug %}">{{ event }}</a>
-                    ({{ event.start|timezone:event.timezone|date:"d.m.y"}} -
-                    {{ event.end|timezone:event.timezone|date:"d.m.y"}})
+                    <a href="{% url 'admin:AKModel_event_change' event.pk %}">{{ event }}</a>
+                    ({{ event.start|timezone:event.timezone|date:"d.m.y" }} -
+                    {{ event.end|timezone:event.timezone|date:"d.m.y" }}) &middot;
+                    <a href="{% url 'admin:event_status' slug=event.slug %}">{% trans "Status" %}</a> &middot;
+                    <a href="{% url 'admin:schedule' event_slug=event.slug %}">{% trans "Scheduling" %}</a>
                 </li>
-           {% endfor %}
+            {% endfor %}
         </ul>
     </div>
-{{ block.super }}
+    {{ block.super }}
 {% endblock %}