diff --git a/AKDashboard/templates/AKDashboard/dashboard_event.html b/AKDashboard/templates/AKDashboard/dashboard_event.html
index d91c688b9185ef05db5bb6f2dda2bbad9162468f..0cef2cfa1232516717e2e04b83cc7864e9e1e915 100644
--- a/AKDashboard/templates/AKDashboard/dashboard_event.html
+++ b/AKDashboard/templates/AKDashboard/dashboard_event.html
@@ -15,7 +15,7 @@
 
 {% block breadcrumbs %}
     <li class="breadcrumb-item"><a href="{% url 'dashboard:dashboard' %}">AKPlanning</a></li>
-    <li class="breadcrumb-item active">{{ event.slug }}</li>
+    <li class="breadcrumb-item active">{{ event }}</li>
 {% endblock %}
 
 {% block content %}
diff --git a/AKPlan/templates/AKPlan/plan_breadcrumbs.html b/AKPlan/templates/AKPlan/plan_breadcrumbs.html
index c5ca3c1afc4b3ac75f0872c60e5530068b9e439f..653e04c2e18c75c9cec855e4567305776487b91f 100644
--- a/AKPlan/templates/AKPlan/plan_breadcrumbs.html
+++ b/AKPlan/templates/AKPlan/plan_breadcrumbs.html
@@ -8,7 +8,10 @@
         AKPlanning
     {% endif %}
 </li>
-<li class="breadcrumb-item">{{ event.slug }}</li>
 <li class="breadcrumb-item">
-    <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    {% if 'AKDashboard'|check_app_installed %}
+        <a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event }}</a>
+    {% else %}
+        {{ event }}
+    {% endif %}
 </li>
diff --git a/AKPlan/templates/AKPlan/plan_index.html b/AKPlan/templates/AKPlan/plan_index.html
index cd22d225ef02fd2666c0474c522591078d3cbfe3..517b5067053cd3a411d966a2adab3a179cbb33df 100644
--- a/AKPlan/templates/AKPlan/plan_index.html
+++ b/AKPlan/templates/AKPlan/plan_index.html
@@ -70,6 +70,9 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
+    <li class="breadcrumb-item">
+        {% trans "AK Plan" %}
+    </li>
 {% endblock %}
 
 
diff --git a/AKPlan/templates/AKPlan/plan_room.html b/AKPlan/templates/AKPlan/plan_room.html
index 6f95656309b2790cd91d708c301d4e6a23a25ddf..c47ba1d0ed1e818b0a3cb582b6ca06f867a8cc5e 100644
--- a/AKPlan/templates/AKPlan/plan_room.html
+++ b/AKPlan/templates/AKPlan/plan_room.html
@@ -5,8 +5,10 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
-    <li class="breadcrumb-item">{% trans "Room" %}</li>
-    <li class="breadcrumb-item">{{ room.title }}</li>
+    <li class="breadcrumb-item">
+        <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    </li>
+    <li class="breadcrumb-item">{% trans "Room" %}: {{ room.title }}</li>
 {% endblock %}
 
 
@@ -41,7 +43,7 @@
         </ul>
     </div>
 
-    <h1>Plan: {{ event }} -- {% trans "Room" %}: {{ room }}</h1>
+    <h1>Plan: {{ event }} ({% trans "Room" %}: {{ room }})</h1>
 
     {% timezone event.timezone %}
         <div class="row" style="margin-top:30px;clear:both;">
diff --git a/AKPlan/templates/AKPlan/plan_track.html b/AKPlan/templates/AKPlan/plan_track.html
index da45257396ef41e27b4736f5df4784f016c387b9..da292778bc12f8a09890508094f7c28161cedbf6 100644
--- a/AKPlan/templates/AKPlan/plan_track.html
+++ b/AKPlan/templates/AKPlan/plan_track.html
@@ -5,8 +5,10 @@
 
 {% block breadcrumbs %}
     {% include "AKPlan/plan_breadcrumbs.html" %}
-    <li class="breadcrumb-item">{% trans "Track" %}</li>
-    <li class="breadcrumb-item">{{ track }}</li>
+    <li class="breadcrumb-item">
+        <a href="{% url 'plan:plan_overview' event_slug=event.slug %}">{% trans "AK Plan" %}</a>
+    </li>
+    <li class="breadcrumb-item">{% trans "Track" %}: {{ track }}</li>
 {% endblock %}
 
 
@@ -41,7 +43,7 @@
         </ul>
     </div>
 
-    <h1>Plan: {{ event }} -- {% trans "Track" %}: {{ track }}</h1>
+    <h1>Plan: {{ event }} ({% trans "Track" %}: {{ track }})</h1>
 
     {% timezone event.timezone %}
         <div class="row" style="margin-top:30px;clear: both;">
diff --git a/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html b/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html
index 147d6c261ac6e4b8a8d9f16a8d7e76fd2104b59d..0f1365d48ffccba72e89bdda5256378691b5728d 100644
--- a/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html
+++ b/AKSubmission/templates/AKSubmission/submission_breadcrumbs.html
@@ -7,4 +7,10 @@
         AKPlanning
     {% endif %}
 </li>
-<li class="breadcrumb-item">{{ event.slug }}</li>
+<li class="breadcrumb-item">
+    {% if 'AKDashboard'|check_app_installed %}
+        <a href="{% url 'dashboard:dashboard_event' slug=event.slug %}">{{ event }}</a>
+    {% else %}
+        {{ event }}
+    {% endif %}
+</li>