diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index f42af04..03e6c01 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -120,11 +120,12 @@ $month['12'] = array('month' => 'December', 'days' => '31');
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-    <?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 the_content() ?></div>
-    <?php } ?>
+    <?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");
diff --git a/archive-comic-storyline.php b/archive-comic-storyline.php
index 3cef1c3..2a0f3c7 100644
--- a/archive-comic-storyline.php
+++ b/archive-comic-storyline.php
@@ -64,11 +64,12 @@ Template Name: Comic Storyline Archive
 <div id="content" class="narrowcolumn">
 
 	<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.php b/archive.php
index bc3e5ec..cdbbb24 100644
--- a/archive.php
+++ b/archive.php
@@ -35,6 +35,12 @@
 				<div class="post-comic-head"></div>
 				<div class="post-comic">
 					<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
+						<div class="comicdate">
+							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+						</div>
+						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+						By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+						Posted in: <?php the_category(','); ?>
 						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /><br />
 						<h3><?php the_title() ?></h3>
 						<small><?php the_time('F jS, Y') ?></small></a>
diff --git a/comments.php b/comments.php
index 4c86542..78236bd 100644
--- a/comments.php
+++ b/comments.php
@@ -1,93 +1,97 @@
-<div id="content" class="narrowcolumn">
-  <div class="comment-wrap">
+<div class="comment-wrap">
 
-  <?php
-    if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-      die ('Please do not load this page directly. Thanks!');
+<?php
+if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+  die ('Please do not load this page directly. Thanks!');
 
-    if ( post_password_required() ) { ?>
-      <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
-    <?php
-      return;
-    }
+if ( post_password_required() ) { ?>
+	<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
+<?php
+  return;
+}
 
-    if ( have_comments() ) : ?>
+if ( have_comments() ) : ?>
 
-    <h3 id="comments"><?php comments_number('Discussion&not;', 'Discussion&not;', 'Discussion (%)&not;' );?></h3>
+	<h3 id="comments"><?php comments_number('Discussion&not;', 'Discussion&not;', 'Discussion (%)&not;' );?></h3>
 
-    <ol class="commentlist">
-    <?php wp_list_comments(array('avatar_size'=>64)); ?>
-    </ol>
-      <div class="pagenav">
-        <div class="pagenav-right"><?php next_comments_link('Newer Comments &uarr;') ?></div>
-        <div class="pagenav-left"><?php previous_comments_link('&darr; Previous Comments') ?></div>
-        <div class="clear"></div>
-      </div>
-   <?php else : // this is displayed if there are no comments so far ?>
+	<ol class="commentlist">
+		<?php wp_list_comments(array(
+					'type' => 'all',
+					'callback' => 'comicpress_comments_callback',
+					'end-callback' => 'comicpress_comments_end_callback',
+					'avatar_size'=>64
+					)
+				); ?>	
+	</ol>
+	<div class="pagenav">
+		<div class="pagenav-right"><?php next_comments_link('Newer Comments &uarr;') ?></div>
+		<div class="pagenav-left"><?php previous_comments_link('&darr; Previous Comments') ?></div>
+		<div class="clear"></div>
+	</div>
+<?php else : // this is displayed if there are no comments so far ?>
 
-    <?php if ('open' == $post->comment_status) : ?>
-      <!-- If comments are open, but there are no comments. -->
+<?php if ('open' == $post->comment_status) : ?>
+  <!-- If comments are open, but there are no comments. -->
 
-     <?php else : // comments are closed ?>
-      <!-- If comments are closed. -->
-      <p class="nocomments">Comments are closed.</p>
+ <?php else : // comments are closed ?>
+  <!-- If comments are closed. -->
+  <p class="nocomments">Comments are closed.</p>
 
-    <?php endif; ?>
-  <?php endif; ?>
+<?php endif; ?>
+<?php endif; ?>
 
 
-  <?php if ('open' == $post->comment_status) : ?>
+<?php if ('open' == $post->comment_status) : ?>
 
-  <div id="respond">
+<div id="respond">
 
-  <h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
+<h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
 
-  <div class="cancel-comment-reply">
-    <small><?php cancel_comment_reply_link(); ?></small>
-  </div>
+<div class="cancel-comment-reply">
+<small><?php cancel_comment_reply_link(); ?></small>
+</div>
 
-  <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-  <p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
-  <?php else : ?>
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+<?php else : ?>
 
-  <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 
-  <?php if ( $user_ID ) : ?>
+<?php if ( $user_ID ) : ?>
 
-  <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
 
-  <?php else : ?>
+<?php else : ?>
 
 
-  <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-  <label for="author"><small>NAME &mdash; <a href="http://gravatar.com">Get an avatar</a></small></label></p>
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
+<label for="author"><small>NAME &mdash; <a href="http://gravatar.com">Get an avatar</a></small></label></p>
 
-  <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-  <label for="email"><small>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </small></label></p>
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
+<label for="email"><small>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </small></label></p>
 
-  <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
-  <label for="url"><small>WEBSITE</small></label></p>
+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+<label for="url"><small>WEBSITE</small></label></p>
 
-  <?php endif; ?>
+<?php endif; ?>
 
-  <!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
 
-  <p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
+<p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
 
-  <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-  <?php comment_id_fields(); ?>
-  </p>
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<?php comment_id_fields(); ?>
+</p>
 
-  <div class="clear"></div>
+<div class="clear"></div>
 
-  <?php do_action('comment_form', $post->ID); ?>
+<?php do_action('comment_form', $post->ID); ?>
 
-  </form>
+</form>
 
-  <?php endif; // If registration required and not logged in ?>
-  </div>
+<?php endif; // If registration required and not logged in ?>
+</div>
 
-  <?php endif; ?>
+<?php endif; ?>
 
-  </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/header.php b/header.php
index 949979e..6426408 100644
--- a/header.php
+++ b/header.php
@@ -22,6 +22,7 @@
 	<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name') ?> Atom Feed" href="<?php bloginfo('atom_url') ?>" />
 	<link rel="pingback" href="<?php bloginfo('pingback_url') ?>" />
 	<script type="text/javascript" src="<?php bloginfo('stylesheet_directory'); ?>/js/scroll.js"></script>
+	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
 	<?php wp_head() ?>
 	<!--[if lt IE 7]><script type="text/javascript" src="<?php bloginfo('template_directory') ?>/js/ie6submenus.js"></script><![endif]-->
 </head>
diff --git a/index.php b/index.php
index 68b57da..19e4889 100644
--- a/index.php
+++ b/index.php
@@ -1,93 +1,96 @@
-<?php get_header(); global $blog_postcount, $blogcat; $first_comic = get_first_comic_permalink() ?>
-
-<?php if (!(is_paged())) { ?>
-
-	<?php $wp_query->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
-	while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>
-		<div id="comic-head"></div>
-		<div id="comic">
-			<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
-		</div>
-		<div id="comic-foot"></div>
-	<?php endwhile; ?>
-
-	<div id="content" class="narrowcolumn">
-
-		<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>
-			<div class="post-comic-head"></div>
-			<div class="post-comic">
-				<div class="nav">
-					<div class="nav-first"><a href="<?php echo $first_comic ?>" title="Go to the First Comic">&lsaquo;&lsaquo; First</a></div>
-					<div class="nav-previous"><?php global $wp_query; $wp_query->is_single = true; previous_comic_link('%link', '&lsaquo; Previous'); $wp_query->is_single = false ?></div>
-				</div>
-				<div class="comicdate">
-					<?php the_time('F jS, Y') ?>
-				</div>
-				<div class="clear"></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>
-				<?php } ?>
-				<h2>
-					<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title() ?>"><?php the_title() ?></a>
-				</h2>
-				<div class="entry">
-					<?php the_content('&darr; Read the rest of this entry...') ?>
-				</div>
-				<?php the_transcript('styled') ?>
-				<div class="tags">
-					<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
-				</div>
-				<div class="comment-link">
-					<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
-				</div>
-				<br class="clear-margins" />
-			</div>
-			<div class="post-comic-foot"></div>
-		<?php endwhile; ?>
-
-		<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
-
-<?php } else { ?>
-
-	<div id="content" class="narrowcolumn">
-
-<?php } ?>
-	
-	<?php $temp = $wp_query; $wp_query= null; $wp_query = new WP_Query(); $wp_query->query('showposts='.$blog_postcount.'&cat=-'.$comiccat.'&paged='.$paged);
- while ($wp_query->have_posts()) : $wp_query->the_post() ?>
-		<div class="post-head"></div>
-		<div class="post" id="post-<?php the_ID() ?>">
-			<h3>
-				<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title() ?>"><?php the_title() ?></a>
-			</h3>
-			<div class="postdate">
-				<?php the_time('F jS, Y') ?>
-			</div>
-			<div class="entry">
-				<?php the_content('&darr; Read the rest of this entry...') ?>
-			</div> 
-			<div class="tags">
-				<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
-			</div>
-			<div class="comment-link">
-				<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
-			</div>
-			<div class="clear-margins"><br /></div>
-		</div>
-		<div class="post-foot"></div>
-	<?php endwhile; ?>
-
-  <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
-    <div class="pagenav">
-      <div class="pagenav-right"><?php previous_posts_link('Newer Entries &uarr;') ?></div>
-      <div class="pagenav-left"><?php next_posts_link('&darr; Previous Entries') ?></div>
-      <div class="clear"></div>
-    </div>	
-  <?php } ?>
-	<?php $wp_query = null; $wp_query = $temp ?>
-
-</div>
-
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
-
+<?php get_header(); global $blog_postcount, $blogcat; $first_comic = get_first_comic_permalink() ?>
+
+<?php if (!(is_paged())) { ?>
+
+	<?php $wp_query->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
+	while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>
+		<div id="comic-head"></div>
+		<div id="comic">
+			<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
+		</div>
+		<div id="comic-foot"></div>
+		<?php comic_navigation(); ?>
+	<?php endwhile; ?>
+
+	<div id="content" class="narrowcolumn">
+
+		<?php while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>
+			<div class="post-comic-head"></div>
+			<div class="post-comic">
+				<div class="nav">
+					<div class="nav-first"><a href="<?php echo $first_comic ?>" title="Go to the First Comic">&lsaquo;&lsaquo; First</a></div>
+					<div class="nav-previous"><?php global $wp_query; $wp_query->is_single = true; previous_comic_link('%link', '&lsaquo; Previous'); $wp_query->is_single = false ?></div>
+				</div>
+				<div class="clear"></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>
+				<?php } ?>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
+				<div class="entry">
+					<?php the_content('&darr; Read the rest of this entry...') ?>
+				</div>
+				<?php the_transcript('styled') ?>
+				<div class="tags">
+					<?php the_tags('&#9492; Tags: ', ', ', ''); ?> 
+				</div>
+				<div class="comment-link">
+					<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
+				</div>
+				<br class="clear-margins" />
+			</div>
+			<div class="post-comic-foot"></div>
+		<?php endwhile; ?>
+
+		<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
+
+<?php } else { ?>
+
+	<div id="content" class="narrowcolumn">
+
+<?php } ?>
+	
+	<?php $temp = $wp_query; $wp_query= null; $wp_query = new WP_Query(); $wp_query->query('showposts='.$blog_postcount.'&cat=-'.$comiccat.'&paged='.$paged);
+ while ($wp_query->have_posts()) : $wp_query->the_post() ?>
+		<div class="post-head"></div>
+		<div class="post" id="post-<?php the_ID() ?>">
+			<div class="comicdate">
+				<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+			</div>
+			<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+			By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+			Posted in: <?php the_category(','); ?>
+			<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
+			<div class="entry">
+				<?php the_content('&darr; Read the rest of this entry...') ?>
+			</div> 
+			<div class="tags">
+				<?php the_tags('&#9492; Tags: ', ', ', ''); ?>
+			</div>
+			<div class="comment-link">
+				<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
+			</div>
+			<div class="clear-margins"><br /></div>
+		</div>
+		<div class="post-foot"></div>
+	<?php endwhile; ?>
+
+  <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+    <div class="pagenav">
+      <div class="pagenav-right"><?php previous_posts_link('Newer Entries &uarr;') ?></div>
+      <div class="pagenav-left"><?php next_posts_link('&darr; Previous Entries') ?></div>
+      <div class="clear"></div>
+    </div>	
+  <?php } ?>
+	<?php $wp_query = null; $wp_query = $temp ?>
+
+</div>
+
+<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+
 <?php get_footer() ?>
\ No newline at end of file
diff --git a/search-transcript.php b/search-transcript.php
index 540a925..3f9f14d 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -22,10 +22,14 @@
 
           <div class="post-comic-head"></div>
           <div class="post-comic">
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
-              <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="<?php the_transcript() ?>" width="<?php echo $archive_comic_width ?>" /><br />
-              <h3><?php the_title() ?></h3>
-              <small><?php the_time('F jS, Y') ?></small></a>
+				<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="<?php the_transcript() ?>" width="<?php echo $archive_comic_width ?>" /><br />
             </div>
             <br class="clear-margins" />
           </div>
@@ -35,8 +39,12 @@
 
           <div class="post-head"></div>
           <div class="post">
-            <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title() ?>"><?php the_title() ?></a></h3>
-            <div class="postdate"><?php the_time('F jS, Y') ?></div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <?php the_excerpt() ?>
             <br class="clear-margins" />
           </div>
diff --git a/search.php b/search.php
index 627663b..03ea397 100644
--- a/search.php
+++ b/search.php
@@ -22,10 +22,14 @@
 
           <div class="post-comic-head"></div>
           <div class="post-comic">
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
               <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="Click for full size." title="Click for full size" width="<?php echo $archive_comic_width ?>" /><br />
-              <h3><?php the_title() ?></h3>
-              <small><?php the_time('F jS, Y') ?></small></a>
             </div>
             <br class="clear-margins" />					
           </div>
@@ -35,16 +39,20 @@
 
           <div class="post-head"></div>
           <div class="post">
-            <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title() ?>"><?php the_title() ?></a></h3>
-            <div class="postdate"><?php the_time('F jS, Y') ?></div>
-            <?php the_excerpt() ?>
-            <br class="clear-margins" />
-          </div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php the_excerpt() ?>
+				<br class="clear-margins" />
+		</div>
           <div class="post-foot"></div>
           
         <?php } ?>
       
-    <?php endwhile ?>
+    <?php endwhile; ?>
     
     <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
       <div class="pagenav">
@@ -65,7 +73,7 @@
     </div>
     <div class="post-page-foot"></div>
 
-  <?php endif ?>
+  <?php endif; ?>
 
 </div>
 
diff --git a/searchform.php b/searchform.php
index c1e57c1..8868852 100644
--- a/searchform.php
+++ b/searchform.php
@@ -1,6 +1,6 @@
 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
 	<div>
 		<input type="text" value="Search Site..." name="s" id="s" onfocus="this.value=(this.value=='Search Site...') ? '' : this.value;" onblur="this.value=(this.value=='') ? 'Search Site...' : this.value;" />
-		<input type="submit" id="searchsubmit" value="&raquo;" />
+		<button type="submit" class="button">&#9658;</button>
 	</div>
 </form>
\ No newline at end of file
diff --git a/single.php b/single.php
index ab86a20..f252714 100644
--- a/single.php
+++ b/single.php
@@ -1,85 +1,95 @@
-<?php get_header(); $first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink() ?>
-
-<?php while (have_posts()) : the_post(); if (in_comic_category()) { ?>
-	<div id="comic-head"></div>
-	<div id="comic">
-		<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
-	</div>
-	<div id="comic-foot"></div>
-<?php } endwhile; ?>
-
-<div id="content" class="narrowcolumn">
-	
-	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
-	
-		<?php if (in_comic_category()) { ?>
-			<div class="post-comic-head"></div>
-			<div class="post-comic" id="post-<?php the_ID() ?>">
-				<div class="comicdate">
-					<div class="nav">
-						<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>">&lsaquo;&lsaquo; First</a></div><?php } ?>
-						<div class="nav-previous"><?php previous_comic_link('%link', '&lsaquo; Previous') ?></div>
-						<div class="nav-next"><?php next_comic_link('%link', 'Next &rsaquo;') ?></div>
-						<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>">Last &rsaquo;&rsaquo;</a></div><?php } ?>
-					</div>
-					<?php the_time('F jS, Y') ?>
-				</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>
-				<?php } ?>
-				<h2><?php the_title() ?></h2>
-				<div class="entry">
-					<?php the_content() ?>
-					<?php the_transcript('styled') ?>			
-					<div class="tags">
-						<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
-					</div>
-					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
-				</div>
-				<br class="clear-margins" />
-			</div>
-			<div class="post-comic-foot"></div>
-			
-		<?php } else { ?>
-		
-			<div class="post-head"></div>
-			<div class="post" id="post-<?php the_ID() ?>">
-				<div class="nav-blog">
-					<div class="nav-blog-previous"><?php previous_post_link('%link','&lsaquo; Previous', TRUE) ?></div>
-					<div class="nav-blog-next"><?php next_post_link('%link','Next &rsaquo;', TRUE) ?></div>
-				</div>
-				<div class="clear"></div>
-				<h2><?php the_title() ?></h2>
-				<div class="postdate"><?php the_time('F jS, Y') ?></div>
-				<div class="entry">
-					<?php the_content() ?>
-					<?php the_transcript('styled') ?>			
-					<div class="tags">
-						<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
-					</div>
-					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
-				</div>
-				<br class="clear-margins" />
-			</div>
-			<div class="post-foot"></div>
-			
-		<?php } ?>
-
-		<?php comments_template() ?>
-		
-	<?php endwhile; else: ?>
-		
-		<div class="post-head"></div>
-		<div class="post">
-			<p>Sorry, no posts matched your criteria.</p>
-			<br class="clear-margins" />
-		</div>
-		<div class="post-foot"></div>
-	
-	<?php endif; ?>
-	
-</div>
-
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
-
+<?php get_header(); $first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink() ?>
+
+<?php while (have_posts()) : the_post(); if (in_comic_category()) { ?>
+	<div id="comic-head"></div>
+	<div id="comic">
+		<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
+	</div>
+	<div id="comic-foot"></div>
+	<?php comic_navigation(); ?>
+<?php } endwhile; ?>
+
+<div id="content" class="narrowcolumn">
+	
+	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
+	
+		<?php if (in_comic_category()) { ?>
+			<div class="post-comic-head"></div>
+			<div class="post-comic" id="post-<?php the_ID() ?>">
+				<div class="nav">
+					<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>">&lsaquo;&lsaquo; First</a></div><?php } ?>
+					<div class="nav-previous"><?php previous_comic_link('%link', '&lsaquo; Previous') ?></div>
+					<div class="nav-next"><?php next_comic_link('%link', 'Next &rsaquo;') ?></div>
+					<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>">Last &rsaquo;&rsaquo;</a></div><?php } ?>
+				</div>
+				<div class="clear"></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>
+				<?php } ?>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><?php the_title(); ?></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] ') ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
+				<div class="entry">
+					<?php the_content() ?>
+					<?php the_transcript('styled') ?>			
+					<div class="tags">
+						<?php the_tags('&#9492; Tags: ', ', ', '');  ?> 
+					</div>
+					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
+				</div>
+				<br class="clear-margins" />
+			</div>
+			<div class="post-comic-foot"></div>
+			
+		<?php } else { ?>
+		
+			<div class="post-head"></div>
+			<div class="post" id="post-<?php the_ID() ?>">
+				<div class="nav-blog">
+					<div class="nav-blog-previous"><?php previous_post_link('%link','&lsaquo; Previous', TRUE) ?></div>
+					<div class="nav-blog-next"><?php next_post_link('%link','Next &rsaquo;', TRUE) ?></div>
+				</div>
+				<div class="clear"></div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><?php the_title(); ?></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
+				<div class="entry">
+					<?php the_content() ?>
+					<?php the_transcript('styled') ?>			
+					<div class="tags">
+						<?php the_tags('&#9492; Tags: ', ', ', ''); ?> 
+					</div>
+					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
+				</div>
+				<br class="clear-margins" />
+			</div>
+			<div class="post-foot"></div>
+			
+		<?php } ?>
+
+		<?php comments_template() ?>
+		
+	<?php endwhile; else: ?>
+		
+		<div class="post-head"></div>
+		<div class="post">
+			<p>Sorry, no posts matched your criteria.</p>
+			<br class="clear-margins" />
+		</div>
+		<div class="post-foot"></div>
+	
+	<?php endif; ?>
+	
+</div>
+
+<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+
 <?php get_footer() ?>
\ No newline at end of file