diff --git a/archive.php b/archive.php
index cbea50c..4243a14 100644
--- a/archive.php
+++ b/archive.php
@@ -6,7 +6,7 @@
     
     // why can't wordpress allow for post date asc sorting out of the box...
     
-    $posts = query_posts($query_string . '&order=asc');
+    query_posts($query_string . '&order=asc');
 		while (have_posts()) {
       the_post();
       
diff --git a/partials/search-comic-post.inc b/partials/search-comic-post.inc
new file mode 100644
index 0000000..9506a51
--- /dev/null
+++ b/partials/search-comic-post.inc
@@ -0,0 +1,10 @@
+<div class="post-comic-head"></div>
+<div class="post-comic">
+  <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>
+<div class="post-comic-foot"></div>
\ No newline at end of file
diff --git a/partials/search-not-found.inc b/partials/search-not-found.inc
new file mode 100644
index 0000000..3d7ce64
--- /dev/null
+++ b/partials/search-not-found.inc
@@ -0,0 +1,8 @@
+<div class="post-page-head"></div>
+<div class="post-page">
+  <h3>No entries found.</h3>
+  <p>Try another search?</p>
+  <p><?php include (get_template_directory() . '/searchform.php') ?></p>
+  <br class="clear-margins" />
+</div>
+<div class="post-page-foot"></div>
diff --git a/partials/search-page-nav.inc b/partials/search-page-nav.inc
new file mode 100644
index 0000000..0e6dacd
--- /dev/null
+++ b/partials/search-page-nav.inc
@@ -0,0 +1,7 @@
+<?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
+  <div class="pagenav">
+    <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
+    <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
+    <div class="clear"></div>
+  </div>
+<?php } ?>
diff --git a/partials/search-results-count.inc b/partials/search-results-count.inc
new file mode 100644
index 0000000..690a37f
--- /dev/null
+++ b/partials/search-results-count.inc
@@ -0,0 +1,7 @@
+<div class="post-page-head"></div>
+<div class="post-page">
+  <?php $count = $wp_query->post_count; ?>
+  <h2 class="pagetitle">Search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
+  Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.
+</div>
+<div class="post-page-foot"></div>
diff --git a/search.php b/search.php
index 2a0e46a..59e750f 100644
--- a/search.php
+++ b/search.php
@@ -1,72 +1,27 @@
 <?php get_header() ?>
 
 <div id="content" class="archive">
+  <?php 
+    include(get_template_directory() . '/partials/search-results-count.inc');
 
-  <div class="post-page-head"></div>
-  <div class="post-page">			
-    <?php
-      $tmp_search = new WP_Query('s=' . wp_specialchars($_GET['s']) . '&show_posts=-1&posts_per_page=-1');
-      $count = $tmp_search->post_count;
-    ?>
-    <h2 class="pagetitle">Search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
-    Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.
-  </div>
-  <div class="post-page-foot"></div>
-
-  <?php if (have_posts()) : ?>
-    
-    <?php $posts = query_posts($query_string.'&order=asc');
-    while (have_posts()) : the_post() ?>
+    if (have_posts()) {
+      query_posts($query_string . '&order=asc');
       
-        <?php global $archive_comic_width; if (in_comic_category()) { ?>
-
-          <div class="post-comic-head"></div>
-          <div class="post-comic">
-            <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>
-          <div class="post-comic-foot"></div>
-
-        <?php } else { ?>
-
-          <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="post-foot"></div>
-          
-        <?php } ?>
+      while (have_posts()) {
+        the_post();
+    
+        if (in_comic_category()) {
+          include(get_template_directory() . '/partials/archive-comic-post.inc');
+        } else {
+          include(get_template_directory() . '/partials/archive-blog-post.inc');
+        }
+      }
       
-    <?php endwhile ?>
-    
-    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
-      <div class="pagenav">
-        <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
-        <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
-        <div class="clear"></div>
-      </div>
-    <?php } ?>
-    
-  <?php else : ?>
-
-    <div class="post-page-head"></div>
-    <div class="post-page">
-      <h3>No entries found.</h3>
-      <p>Try another search?</p>
-      <p><?php include (get_template_directory() . '/searchform.php') ?></p>
-      <br class="clear-margins" />
-    </div>
-    <div class="post-page-foot"></div>
-
-  <?php endif ?>
-
+      include(get_template_directory() . '/partials/archive-page-nav.inc');
+    } else {
+      include(get_template_directory() . '/partials/search-not-found.inc');
+    }
+  ?>
 </div>
 
 <?php include(get_template_directory() . '/sidebar.php') ?>
diff --git a/sidebar.php b/sidebar.php
index 3d76947..73e5dfe 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -2,10 +2,8 @@
 
 	<ul>
 
-		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>    
+		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) { ?>
 
-			<?php widget_comicpress_comic_bookmark() ?>
-		
 			<li>
 				<?php get_calendar(); ?>
 			</li>
@@ -17,8 +15,6 @@
 				</ul>
 			</li>
 
-			<?php widget_comicpress_latest_comics(); ?>
-
 			<li>
 				<h2>Monthly Archives</h2>
 				<ul>
@@ -34,7 +30,7 @@
 				<?php include (get_template_directory() . '/searchform.php'); ?>
 			</li>
 
-		<?php endif; ?>
+		<?php } ?>
 
 	</ul>