diff --git a/404.php b/404.php
index 1767a93..a9cd909 100644
--- a/404.php
+++ b/404.php
@@ -4,9 +4,7 @@
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
 	<div class="post-page">
-		<?php if ($disable_page_titles != 'yes') { ?>
-			<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
-		<?php } ?>
+		<h2 class="pagetitle"><?php _e('Page Not Found','comicpress'); ?></h2>
 		<p><a href="<?php bloginfo('wpurl') ?>"><?php _e('Click here to return to the home page','comicpress'); ?></a> <?php _e('or try a search:','comicpress'); ?></p>
 		<p><?php include (get_template_directory() . '/searchform.php') ?></p>
 	</div>
diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index c5754a9..0a1ecbd 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -71,8 +71,17 @@ $month['12'] = array('month' => __('December','comicpress'), 'days' => '31');
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<div class="entry">
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
 			<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
+		<?php } ?>
+		<div class="entry">
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archive-comic-month.php b/archive-comic-month.php
index bc32940..469e524 100644
--- a/archive-comic-month.php
+++ b/archive-comic-month.php
@@ -10,7 +10,16 @@ Template Name: Month at a glance
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
+			<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php } ?>
 		<div class="entry">
 			<?php the_content(); ?>
 		</div>
diff --git a/archive-comic-storyline-thumbs.php b/archive-comic-storyline-thumbs.php
index 33a1780..b29236a 100644
--- a/archive-comic-storyline-thumbs.php
+++ b/archive-comic-storyline-thumbs.php
@@ -10,8 +10,17 @@ Template Name: Comic Storyline with Thumbs
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<div class="entry">
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
 			<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php } ?>
+		<div class="entry">
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index d27ae77..0f25283 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -10,8 +10,17 @@ Template Name: Comic Storyline Archive
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<div class="entry">
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
 			<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php } ?>
+		<div class="entry">
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archive-comic-year.php b/archive-comic-year.php
index e9eb76e..349f8e9 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -21,8 +21,17 @@ if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-		<div class="entry">
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
+			<?php } ?>
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
 			<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
+		<?php } ?>
+		<div class="entry">
 			<?php the_content(); ?>
 		</div>
 	<?php endwhile; ?>
diff --git a/archive-comic.php b/archive-comic.php
index f726e95..a440648 100644
--- a/archive-comic.php
+++ b/archive-comic.php
@@ -10,18 +10,16 @@ Template Name: Comic Archive
 	<div class="post-page-head"></div>
 	<div class="post-page">
 	<?php while (have_posts()) : the_post() ?>
-			<?php if (function_exists('the_post_image')) {
-				if ( has_post_image() ) { ?>
-					<div class="post-page-image">
-					<?php the_post_image('full'); ?>
-					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
-				<?php } ?>
-			<?php } else { ?>
-				<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php if (function_exists('the_post_image')) {
+			if ( has_post_image() ) { ?>
+				<div class="post-page-image">
+				<?php the_post_image('full'); ?>
+				</div>
 			<?php } ?>
-			<br class="clear-margins" />
+		<?php } ?>
+		<?php if ($disable_page_titles != 'yes') { ?>
+			<h2 class="pagetitle"><?php the_title() ?></h2>
+		<?php } ?>
 		<div class="entry">
 			<?php the_content(); ?>
 		</div>
diff --git a/archives.php b/archives.php
index e00f86b..01a2ee2 100644
--- a/archives.php
+++ b/archives.php
@@ -10,18 +10,7 @@ Template Name: Archives
 			<div class="post-page-head"></div>
 			<div class="post-page">
 				<div id="archivepage">
-			<?php if (function_exists('the_post_image')) {
-				if ( has_post_image() ) { ?>
-					<div class="post-page-image">
-					<?php the_post_image('full'); ?>
-					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
-				<?php } ?>
-			<?php } else { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
-			<?php } ?>
-			<br class="clear-margins" />
 					<ul><?php wp_get_archives('type=monthly') ?></ul>
 					<h2><?php _e('Archives by Subject:','comicpress'); ?></h2>
 					<ul><?php wp_list_categories() ?></ul>
diff --git a/buystrip.php b/buystrip.php
index b440cb5..934135e 100644
--- a/buystrip.php
+++ b/buystrip.php
@@ -21,18 +21,16 @@ Template Version: 2.14
 				<br />
 				<img src="<?php echo get_template_directory_uri(); ?>/images/paypal.png" alt="<?php _e('Powered by Paypal','comicpress'); ?>" /><br />
 			</div>
-			<?php if (function_exists('the_post_image')) {
+						<?php if (function_exists('the_post_image')) {
 				if ( has_post_image() ) { ?>
 					<div class="post-page-image">
 					<?php the_post_image('full'); ?>
 					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
 				<?php } ?>
-			<?php } else { ?>
+			<?php } ?>
+			<?php if ($disable_page_titles != 'yes') { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
-			<br class="clear-margins" />
 			<?php _e('Comic ID','comicpress'); ?> - #<?php echo $comicnum; ?><br />
 			<?php _e('Title:','comicpress'); ?>	<?php echo the_title(); ?><br />
 			<br />
diff --git a/functions.php b/functions.php
index 814b74a..528c405 100644
--- a/functions.php
+++ b/functions.php
@@ -24,7 +24,7 @@ if (function_exists('id_get_comment_number')) {
 	remove_filter('comments_number','id_get_comment_number');
 }
 
-$comicpress_version = '2.8.2.6';
+$comicpress_version = '2.9.0.0';
 
 global $wpmu_version;
 if (!empty($wpmu_version)) {
diff --git a/image.php b/image.php
index 1ba3826..9cfbec7 100644
--- a/image.php
+++ b/image.php
@@ -10,10 +10,9 @@
 					<div class="post-page-image">
 					<?php the_post_image('full'); ?>
 					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
 				<?php } ?>
-			<?php } else { ?>
+			<?php } ?>
+			<?php if ($disable_page_titles != 'yes') { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
 			<br class="clear-margins" />
diff --git a/links.php b/links.php
index 43e7b07..4be98c8 100644
--- a/links.php
+++ b/links.php
@@ -21,13 +21,11 @@ Template Name: Links
 					<div class="post-page-image">
 					<?php the_post_image('full'); ?>
 					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
 				<?php } ?>
-			<?php } else { ?>
+			<?php } ?>
+			<?php if ($disable_page_titles != 'yes') { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
-			<br class="clear-margins" />
 			<div id="linkspage">
 			<ul>
 				<?php echo $bookmarks; ?>
diff --git a/page.php b/page.php
index 60d56a7..f1bcc42 100644
--- a/page.php
+++ b/page.php
@@ -10,10 +10,9 @@
 					<div class="post-page-image">
 					<?php the_post_image('full'); ?>
 					</div>
-				<?php } else { ?>
-					<h2 class="pagetitle"><?php the_title() ?></h2>
 				<?php } ?>
-			<?php } else { ?>
+			<?php } ?>
+			<?php if ($disable_page_titles != 'yes') { ?>
 				<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php } ?>
 			<div class="entry">
diff --git a/single.php b/single.php
index 2ea891a..3aa6514 100644
--- a/single.php
+++ b/single.php
@@ -86,9 +86,10 @@
 				endwhile; }
 			} 
 			$post = $temppost; $wp_query = $temp_query; $temppost = null; $temp_query = null;
+		}
+		if ('open' == $post->comment_status) {
+			comments_template('', true);
 		} ?>
-	
-		<?php comments_template('', true); ?>		
 		
 	<?php else: ?>
 	<?php get_sidebar('underblog'); ?>