diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 14e1dcf..0f9694f 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -67,24 +67,24 @@ $month['11'] = array('month' => __('November','comicpress'), 'days' => '30');
 $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
 
 ?>
+
+<?php while (have_posts()) : the_post() ?>
+
 <div class="<?php comicpress_post_class(); ?>">
+	<?php if (function_exists('has_post_thumbnail')) {
+		if ( has_post_thumbnail() ) { ?>
+			<div class="post-image">
+			<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
+			</div>
+		<?php }
+	} ?>
 	<div class="post-page-head"></div>
 	<div class="post-page">
-	<?php while (have_posts()) : the_post() ?>
-		<?php if (function_exists('the_post_thumbnail')) {
-			if ( has_post_thumbnail() ) { ?>
-				<div class="post-page-image">
-				<?php the_post_thumbnail('full'); ?>
-				</div>
-			<?php } ?>
-		<?php } ?>
-		<?php if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
-		<?php } ?>
+		<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
 		<div class="entry">
 			<?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");
@@ -161,11 +161,12 @@ foreach ( $years as $year ) {
 			</div>
 		<?php } ?>
 		</div>
-		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 		<br class="clear-margins" />
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
 	</div>
 	<div class="post-page-foot"></div>
 </div>
+<?php endwhile; ?>
 
 <?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
 
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index 11be43d..0b58ba3 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -18,6 +18,13 @@ function display_blog_post() {
 	<?php } ?>
 	<div class="clear"></div>
 	<div class="<?php comicpress_post_class(); ?>">
+		<?php if (function_exists('has_post_thumbnail')) {
+			if ( has_post_thumbnail() ) { ?>
+				<div class="post-image">
+				<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
+				</div>
+			<?php }
+		} ?>
 		<div class="post-head"></div>
 			<div class="post" id="post-<?php the_ID() ?>">
 				<div class="post-info">
@@ -31,17 +38,7 @@ function display_blog_post() {
 					</div>
 				<?php } ?>
 				<div class="post-text">
-					<?php if (function_exists('has_post_thumbnail')) {
-						if ( has_post_thumbnail() ) { ?>
-							<div class="post-image">
-								<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
-							</div>
-						<?php } else {?>
-							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-						<?php } ?>
-					<?php } else { ?>
-						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-					<?php } ?>
+					<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 					<div class="post-author"> <?php the_time('F jS, Y'); ?> <span class="pipe">|</span> by <?php the_author_posts_link(); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 					<?php if (!$comicpress_options['disable_categories_in_posts']) { ?>
 						<div class="post-cat"><?php _e('Posted In:','comicpress'); ?> <?php the_category(','); ?></div>
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 6d01a88..51fed27 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -18,6 +18,13 @@ function display_comic_post() {
 		</div>
 	<?php } ?>
 		<div class="<?php comicpress_post_class(); ?>">
+			<?php if (function_exists('has_post_thumbnail')) {
+				if ( has_post_thumbnail() ) { ?>
+					<div class="post-comic-image">
+						<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
+					</div>
+				<?php }
+			} ?>		
 			<div class="post-comic-head"></div>
 				<div class="post-comic" id="post-comic-<?php the_ID() ?>">
 					<div class="post-comic-info">
@@ -31,17 +38,7 @@ function display_comic_post() {
 						</div>
 					<?php } ?>
 					<div class="post-comic-text">
-						<?php if (function_exists('the_post_thumbnail')) {
-							if ( has_post_thumbnail() ) { ?>
-								<div class="post-comic-image">
-									<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
-								</div>
-							<?php } else {?>
-								<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-							<?php } ?>
-						<?php } else { ?>
-							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-						<?php } ?>
+						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
 						<div class="post-comic-author"> <?php the_time('F jS, Y'); ?> <span class="pipe">|</span> by <?php the_author_posts_link(); ?> <?php edit_post_link(__('Edit Post','comicpress'), ' [ ', ' ] '); ?></div>
 						<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
 							<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>