diff --git a/bornhack/templates/speakers.html b/bornhack/templates/speakers.html
index d8e8dbcf..850d09fb 100644
--- a/bornhack/templates/speakers.html
+++ b/bornhack/templates/speakers.html
@@ -4,7 +4,7 @@
 Call for Speakers | {{ block.super }}
 {% endblock %}
 
-{% block content %}
+{% block schedule_content %}
 <h2>BornHack 2016: Call for Speakers</h2>
 
 <p>BornHack 2016 is a 7 days outdoor technology tent camping festival that will take place from the 27th of August to the 3rd of September 2016 on the island of Bornholm in Denmark. It is first time that BornHack will take place and it is our goal to make BornHack a yearly recurring event with 100 to 350 participants.</p>
diff --git a/program/templates/event_list.html b/program/templates/event_list.html
index a851c4da..1a15ae53 100644
--- a/program/templates/event_list.html
+++ b/program/templates/event_list.html
@@ -1,6 +1,6 @@
 {% extends 'schedule_base.html' %}
 
-{% block content %}
+{% block schedule_content %}
 <p class="lead">
   An alphabetical list of all talks, workshops, keynotes and other events
   at BornHack 2016.
@@ -8,10 +8,10 @@
 
 <div class="list-group">
   {% for event in event_list %}
-  <small style="background-color: {{ event.event_type.color }}; border: 0; color: {% if event.event_type.light_text %}white{% else %}black{% endif %}; display: inline-block; padding: 5px;">
-    {{ event.event_type.name }}
-  </small>
   <a href="{% url 'schedule:event' slug=event.slug %}" class="list-group-item">
+    <small style="background-color: {{ event.event_type.color }}; border: 0; color: {% if event.event_type.light_text %}white{% else %}black{% endif %}; display: inline-block; padding: 5px;">
+      {{ event.event_type.name }}
+    </small>
     {{ event.title }}
   </a>
   {% if event.speakers.exists %}
diff --git a/program/templates/speaker_detail.html b/program/templates/speaker_detail.html
index 22dd127f..c1741ffc 100644
--- a/program/templates/speaker_detail.html
+++ b/program/templates/speaker_detail.html
@@ -1,7 +1,7 @@
 {% extends 'schedule_base.html' %}
 {% load commonmark %}
 
-{% block content %}
+{% block schedule_content %}
 
 <h3>{{ speaker.name }}</h3>
 
diff --git a/program/templates/speaker_list.html b/program/templates/speaker_list.html
index ce1dd7a9..12b04f4e 100644
--- a/program/templates/speaker_list.html
+++ b/program/templates/speaker_list.html
@@ -1,6 +1,6 @@
 {% extends 'schedule_base.html' %}
 
-{% block content %}
+{% block schedule_content %}
 <p class="lead">
   An alphabetical list of all speakers, workshop hosts and other 
   event anchors at BornHack 2016.