diff --git a/radio/apps/programmes/templates/programmes/episode_detail.html b/radio/apps/programmes/templates/programmes/episode_detail.html
index b966aa4..fb3f93a 100755
--- a/radio/apps/programmes/templates/programmes/episode_detail.html
+++ b/radio/apps/programmes/templates/programmes/episode_detail.html
@@ -17,7 +17,8 @@
 
             <div class="col-lg-5 col-lg-offset-1 spacing">
                     <h4>{% firstof episode.title|upper episode|upper %}</h4>
-                    <p>{{ episode.summary|safe }}</p>
+
+                    <p>{% firstof episode.summary|safe episode.programme.synopsis|safe '' %}</p>
 
                     <h4>{% trans "Podcast" %}</h4>
                     <p>
diff --git a/radio/apps/programmes/templates/programmes/programme_detail.html b/radio/apps/programmes/templates/programmes/programme_detail.html
index b22af4c..4bc6f22 100755
--- a/radio/apps/programmes/templates/programmes/programme_detail.html
+++ b/radio/apps/programmes/templates/programmes/programme_detail.html
@@ -42,24 +42,25 @@ <h4>{% trans 'Programme Details' %}</h4>
         {% endif %}
     </div><! --/container -->
 
+    {% if episode_list %}
+        <div class="container mhb">
+            <div class="row">
+                <h3 class="text-center">{% trans 'Episodes' %}</h3>
+                {% for episode in episode_list %}
+
+                    {% ifchanged episode.season %}
+                        {% if not forloop.first %}</div> {% endif %}
+                        <div class="col-lg-3">
+                            <h4>{% trans "Season" %} {{episode.season}}</h4>
+                            <div class="hline"></div>
+                    {% endifchanged %}
+                    <p><a href="{% url 'programmes:episode_detail' programme.slug episode.season episode.number_in_season %}">{{ episode }}</a></p>
+                    {% if forloop.last %}</div>{% endif %}
 
-    <div class="container mhb">
-        <div class="row">
-            <h3 class="text-center">{% trans 'Episodes' %}</h3>
-			{% for episode in episode_list %}
-
-                {% ifchanged episode.season %}
-                    {% if not forloop.first %}</div> {% endif %}
-                    <div class="col-lg-3">
-                        <h4>{% trans "Season" %} {{episode.season}}</h4>
-                        <div class="hline"></div>
-                {% endifchanged %}
-                <p><a href="{% url 'programmes:episode_detail' programme.slug episode.season episode.number_in_season %}">{{ episode }}</a></p>
-                {% if forloop.last %}</div>{% endif %}
-
-            {% endfor %}
+                {% endfor %}
+            </div>
         </div>
-    </div>
+    {% endif %}
 
     {% if role_list %}
         <div class="container mhb">
diff --git a/radio/apps/radio/templates/radio/index.html b/radio/apps/radio/templates/radio/index.html
index 58f1ee8..7d7b419 100755
--- a/radio/apps/radio/templates/radio/index.html
+++ b/radio/apps/radio/templates/radio/index.html
@@ -126,7 +126,7 @@ <h4>{% trans 'More About Us.' %}</h4>
 	 			<h4>{% trans 'Latest Episodes' %}</h4>
 	 			<div class="hline"></div>
                 {% for episode in latest_episodes %}
-	 			    <p><a href="{{ episode.get_absolute_url }}">{{ episode.title }}</a></p>
+	 			    <p><a href="{{ episode.get_absolute_url }}">{% firstof episode.title|title episode|title %}</a></p>
                 {% empty %}
                     <p>{% trans "There are currently no podcast" %}</p>
                 {% endfor %}