diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index 0f9694f..612f732 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -71,13 +71,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-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">
 		<h2 class="pagetitle"><?php the_title() ?> <span class="page-archive-year"> <?php echo $archive_year; ?></span></h2>
diff --git a/archive-comic-month.php b/archive-comic-month.php
index 811c55d..e3691dd 100644
--- a/archive-comic-month.php
+++ b/archive-comic-month.php
@@ -1,31 +1,34 @@
 <?php
 /*
-Template Name: Month at a glance
+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-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() ?></h2>
-		<?php } ?>
+		<h2 class="pagetitle"><?php the_title() ?></h2>
 		<div class="entry">
 			<?php the_content(); ?>
 		</div>
-	<?php endwhile; ?>
 
-	<?php	
+		<br class="clear-margins" />
+		<?php edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>') ?>
+	</div>
+	<div class="post-page-foot"></div>
+</div>
+<?php endwhile;
+
 //based on Austin Matzko's code from wp-hackers email list
   function filter_where($where = '') {
     //posts in the last 30 days
@@ -37,18 +40,25 @@ add_filter('posts_where', 'filter_where');
 $posts = query_posts('&show_posts=-1&posts_per_page=-1&cat='.get_all_comic_categories_as_cat_string());
 
 ?>
+<div class="<?php comicpress_post_class(); ?>">
+	<div class="post-page-head"></div>
+	<div class="post-page">
+<?php if (have_posts()) : while (have_posts()) : the_post() ?>
 
-	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
 				<div class="comicthumbwrap">
 					<div class="comicarchiveframe">
 						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" style="width: <?php echo $mini_comic_width; ?>px" /></a><br />
 					</div>
 				</div>
-	<?php endwhile; endif; ?>
+				
+<?php endwhile; endif; ?>
 		<br class="clear-margins" />
 	</div>
 	<div class="post-page-foot"></div>
-</div>
+</div>	
 	
+
+
+
 <?php include(get_template_directory() . '/layout-foot.php'); ?>
 <?php get_footer() ?>
\ No newline at end of file