diff --git a/templates/content-episode.tpl.html b/templates/content-episode.tpl.html
index 163eff5..cd46463 100644
--- a/templates/content-episode.tpl.html
+++ b/templates/content-episode.tpl.html
@@ -18,10 +18,10 @@
 		</p>
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% episode.date %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
-<!--% display_tags(episode.tags) %--> <br>
+<!--% display_tags(episode.tags) %-->  
+
+<label>Comments: </label><!--% display_comments_tally(episode.id, episode.eps_tally) %--> <br>
 <!--% listen_now(episode, "hpr", baseurl, media_baseurl) %-->
-<!--% display_listen_in(episode.id) %--> | 
-<!--% display_comments_tally(episode.id, episode.eps_tally) %-->
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>
diff --git a/templates/content-index.tpl.html b/templates/content-index.tpl.html
index 8fce278..c6491f5 100644
--- a/templates/content-index.tpl.html
+++ b/templates/content-index.tpl.html
@@ -63,10 +63,10 @@
 		<h3><!--% latest_episodes.summary%--></h3>
 		<p class="meta"$><!--% show_avatar(latest_episodes.hostid, latest_episodes.host, host_cnt) %-->
 	Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(latest_episodes.hostid) %-->.html"><!--% latest_episodes.host %--></a> on <!--% latest_episodes.date %--> is flagged as <!--% display_explicit(latest_episodes.explicit) %--> and released under a <!--% latest_episodes.license %--> license. <br>
-<!--% display_tags(latest_episodes.tags) %--><br>
+	<!--% display_tags(latest_episodes.tags) %--> 
+	<span><!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--></span>
+	<span><label>Comments: </label><!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></span><br>
 <!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
-<small><!--% display_listen_in(latest_episodes.id) %--> <!--% show_series(latest_episodes.series, latest_episodes.seriesid) %--> | 
-<!--% display_comments_tally(latest_episodes.id, latest_episodes.eps_tally) %--></small>
 		</p>
 	</header>
 		<!--% tidy_notes(latest_episodes.notes) %-->