diff --git a/nop/templates/nop_form.html b/nop/templates/nop_form.html
index e3b32e9cd7bdcdde4cece48e2eeb13066b51ff9e..9afad04ac9dad3e9b4b8037cfa167d367c0a813b 100644
--- a/nop/templates/nop_form.html
+++ b/nop/templates/nop_form.html
@@ -18,24 +18,26 @@
</form>
{% if nowplaying %}
- <ul>
+ <ul class="nowplaying">
{% for track in nowplaying %}
<li>
{% if track.start or track.show %}
- <small>
+ <span class="meta">
{% if track.start %}{{track.start}}{% endif %}
{% if track.start and track.show %},{% endif %}
{% if track.show %}Sendung {{track.show}}{% endif %}
{% if track.artist or track.title or track.album %}:{% endif %}
- </small>
+ </span><br />
{% endif %}
{% if track.artist %}
- <strong>{{track.artist}}</strong>
+ <span class="artist">{{track.artist}}</span>
{% endif %}
+ <span class="track">
{% if track.artist and track.title or track.artist and track.album %}|{% endif %}
{% if track.title %}{{track.title}}{% endif %}
{% if track.title and track.album %}|{% endif %}
{% if track.album %}{{track.album}}{% endif %}
+ </span>
</li>
{% endfor %}
</ul>
diff --git a/templates/program/host_list.html b/templates/program/host_list.html
index 8ad81b05a6dc3361bb2ba443e4546d6aa25e53bd..d1c842777df54b1f2d0a867740d4782e888d7ed3 100644
--- a/templates/program/host_list.html
+++ b/templates/program/host_list.html
@@ -4,12 +4,15 @@
</head>
<body>
-<div id="content-main" class="host-list">
+<div id="content-main">
+ <h1>Sendungsmachende A-Z</h1>
+ <div class="host-list">
{% for host in host_list %}
<div class="host">
<a href="{% url host-detail host.id %}">{{ host.name }}</a>
</div>
{% endfor %}
+ </div>
</div>
</body>
diff --git a/templates/program/show_list.html b/templates/program/show_list.html
index 566cbe1726d68430256e0f0342cbd62c0e6b4f9d..4303929c317ccd13412632cb3c67e1a866a737dd 100644
--- a/templates/program/show_list.html
+++ b/templates/program/show_list.html
@@ -18,7 +18,7 @@
</div>
<div id="content-main" class="show-list">
- <h1>Sendungen</h1>
+ <h1>Sendungen A-Z</h1>
<div id="shows">
{% for show in show_list %}