diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index c02ee17..f60766a 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -70,27 +70,7 @@ $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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<br class="clear-margins" />
-		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
-	</div>
-	<div class="post-page-foot"></div>
-</div>
+	<?php comicpress_display_page_post(); ?>
 
 <?php endwhile; ?>
 
diff --git a/archive-comic-month.php b/archive-comic-month.php
index d54497c..13da5ea 100644
--- a/archive-comic-month.php
+++ b/archive-comic-month.php
@@ -6,30 +6,12 @@ Template Name: This Month of Comics
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
-<?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
 
 //based on Austin Matzko's code from wp-hackers email list
   function filter_where($where = '') {
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index 8f3bf1a..d6e2a8c 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -6,31 +6,13 @@ Template Name: Comic Storyline with Thumbs
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 	
-<?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index dee5759..f1f0a87 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -6,31 +6,13 @@ Template Name: Comic Storyline Archive
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 	
-<?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 34866bf..bf0fa27 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -17,31 +17,13 @@ if (isset($_REQUEST['archive_year'])) {
 if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
 ?> 
 	
-<?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
diff --git a/archive-comic.php b/archive-comic.php
index ffacb63..c82a8a2 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -6,31 +6,13 @@ Template Name: Comic Archive
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
-<?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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <?php 
 $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date DESC");
diff --git a/archives.php b/archives.php
index 32e108d..41bd207 100644
--- a/archives.php
+++ b/archives.php
@@ -6,31 +6,13 @@ Template Name: Archives
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
-<?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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
diff --git a/author.php b/author.php
index 84ea1dc..e7ad8ed 100644
--- a/author.php
+++ b/author.php
@@ -12,6 +12,7 @@
 			<h2><?php _e('No such author.','comicpress'); ?></h2>
 		<?php } else { ?>
 		<div class="<?php comicpress_post_class(); ?>">
+			<?php comicpress_display_post_thumbnail(); ?>
 			<div class="post-page-head"></div>
 			<div class="post-page">
 					<div class="userpage-avatar">
diff --git a/buystrip.php b/buystrip.php
index 102a6f2..498a63d 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -17,6 +17,7 @@ Template Version: 2.14
 	$post = & get_post( $comicnum ); 
 ?>
 	<div class="<?php comicpress_post_class(); ?>">
+		<?php comicpress_display_post_thumbnail(); ?>
 		<div class="post-page-head"></div>
 		<div class="post-page">
 			<?php if (!$comicpress_options['disable_page_titles']) { ?>
@@ -97,13 +98,7 @@ Template Version: 2.14
 		<?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-page-image">
-						<a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_post_thumbnail('full'); ?></a>
-					</div>
-				<?php }
-			} ?>
+			<?php comicpress_display_post_thumbnail(); ?>
 			<div class="post-page-head"></div>
 			<div class="post-page">
 				<?php if (!$comicpress_options['disable_page_titles']) { ?>
diff --git a/comicpress-debug.php b/comicpress-debug.php
index 43bbae9..f725bf1 100644
--- a/comicpress-debug.php
+++ b/comicpress-debug.php
@@ -40,7 +40,7 @@ function comicpress_notice_debug() {
 		$non_comic_categories = str_replace(' and ', ',', $non_comic_categories);
 		$blog_query = '&show_posts=-1&posts_per_page=-1&cat='.$non_comic_categories;
 
-		$post = query_posts($blog_query);
+		query_posts($blog_query);
 		if (have_posts()) {
 			while (have_posts()) : the_post();
 				if (in_comic_category()) {
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 6989ae1..f17d894 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -24,13 +24,7 @@ function display_comic_post($frontpage = 0) {
 	} ?>
 	
 		<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 }
-			} ?>
+			<?php comicpress_display_post_thumbnail(); ?>
 			<div class="post-comic-head"></div>
 				<div class="post-comic" id="post-comic-<?php the_ID() ?>">
 					<div class="post-comic-info">
diff --git a/functions/displaypost.php b/functions/displaypost.php
index 840245b..4d2cc48 100644
--- a/functions/displaypost.php
+++ b/functions/displaypost.php
@@ -100,5 +100,27 @@ function comicpress_display_post() {
 	<?php
 }
 
+function comicpress_display_page_post() {
+	global $post, $wp_query, $comicpress_options; ?>
+	<div class="<?php comicpress_post_class(); ?>">
+		<?php comicpress_display_post_thumbnail(); ?>
+		<div class="post-page-head"></div>
+		<div class="post-page">
+			<?php if (!$comicpress_options['disable_page_titles']) { ?>
+				<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php } ?>
+			<div class="entry">
+				<?php the_content(); ?>
+			</div>
+			<br class="clear-margins" />
+			<?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
+			<br class="clear-margins" />
+			<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
+		</div>
+		<div class="post-page-foot"></div>
+	</div>
+<?php 
+}
+
 
 ?>
\ No newline at end of file
diff --git a/image.php b/image.php
index 993fedc..531c26f 100644
--- a/image.php
+++ b/image.php
@@ -3,15 +3,9 @@
 
 	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
 	<div class="<?php comicpress_post_class(); ?>">
+		<?php comicpress_display_post_thumbnail(); ?>
 		<div class="post-page-head"></div>
 		<div class="post-page" id="post-<?php the_ID() ?>">
-			<?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() ?></h2>
 			<?php } ?>
@@ -52,9 +46,7 @@
 				<div class="clear"></div>
 			</div>
 			<?php the_content() ?>
-		<?php if ('open' == $post->comment_status) {
-			comments_template('', true);
-			} ?>
+			<?php if ('open' == $post->comment_status) { comments_template('', true); } ?>
 			<br class="clear-margins" />
 		</div>
 		<div class="post-page-foot"></div>
diff --git a/links.php b/links.php
index 9c34ee2..f9a72dd 100644
--- a/links.php
+++ b/links.php
@@ -6,31 +6,13 @@ Template Name: Links
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 
-<?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<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 (have_posts()) {
+	while (have_posts()) : the_post();
+		comicpress_display_page_post();
+	endwhile; 
+}
+?>
 
 <?php 
 $linkcatid = get_term_by('name','menubar','link_category');
diff --git a/page.php b/page.php
index 46633d9..cba09bc 100644
--- a/page.php
+++ b/page.php
@@ -3,29 +3,7 @@
 
 <?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-page-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 if (!$comicpress_options['disable_page_titles']) { ?>
-			<h2 class="pagetitle"><?php the_title() ?></h2>
-		<?php } ?>
-		<div class="entry">
-			<?php the_content(); ?>
-		</div>
-		<br class="clear-margins" />
-		<?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
-		<br class="clear-margins" />
-		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
-	</div>
-	<div class="post-page-foot"></div>
-</div>
+	<?php comicpress_display_page_post(); ?>
 
 <?php endwhile; ?>