diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index befb068..8b9e5fa 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -39,12 +39,11 @@ for ($i = 0; $i < 7; ++$i) {
 <div id="content" class="narrowcolumn">
 	<div class="post-page-head"></div>
 	<div class="post-page">
-
-		<h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year ?></span> <?php the_title() ?></h2>
+    <?php while (have_posts()) { the_post(); ?> 
+      <h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year ?></span> <?php the_title() ?></h2>
 		
-		<div class="entry">
-			<?php while (have_posts()) { the_post(); the_content(); } ?>
-		</div>
+      <div class="entry"><?php the_content() ?></div>
+    <?php } ?>
 
 		<div class="archive-yearlist">| 
 			<?php 
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index 97bce40..c5c0757 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -65,10 +65,12 @@ Template Name: Comic Storyline with Thumbs
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-		<h2 class="pagetitle"><?php the_title() ?></h2>
-		<div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
-		</div>
+    <?php while (have_posts()) : the_post(); ?>
+      <div class="entry">
+        <h2 class="pagetitle"><?php the_title() ?></h2>
+        <?php the_content(); ?>
+      </div>
+    <?php endwhile; ?>
 		<ul id="storyline" class="level-0">
 			<?php if (get_option('comicpress-enable-storyline-support') == 1) {
 				if (($result = get_option("comicpress-storyline-category-order")) !== false) {
diff --git a/archive-comic-year.php b/archive-comic-year.php
index b0adb9b..85c68e6 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -37,12 +37,12 @@ Template Name: Comic Year Archive
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-
-		<h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year; ?></span> <?php the_title() ?></h2>
-
-		<div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
-		</div>
+    <?php while (have_posts()) : the_post() ?>
+      <div class="entry">
+        <h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year; ?></span> <?php the_title() ?></h2>
+        <?php the_content(); ?>
+      </div>
+    <?php endwhile; ?>
 
 		<div class="archive-yearlist">| 
 			<?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");