diff --git a/author.php b/author.php
index c93004d..af87b63 100644
--- a/author.php
+++ b/author.php
@@ -19,7 +19,17 @@
 					</div>
 					<div class="userpage-info">
 						<div class="userpage-bio">
-							<h2><?php echo $curauth->display_name; ?></h2>
+	<?php
+		if($curauth->display_name)
+			$authorname = $curauth->display_name;
+		elseif($curauth->user_nickname)
+			$authorname = $curauth->nickname;
+		elseif($curauth->user_nicename)
+			$authorname = $curauth->user_nicename;
+		else
+			$authorname = $curauth->user_login;
+	?>
+							<cite><?php echo $authorname; ?></cite><br />
 							<?php _e('Registered on','comicpress'); ?> <?php echo date('l \\t\h\e jS \o\f M, Y',strtotime($curauth->user_registered)); ?><br />
 							<br />
 							<?php if (!empty($curauth->user_url)) { ?><?php _e('Website:','comicpress'); ?> <a href="<?php echo $curauth->user_url; ?>" target="_blank"><?php echo $curauth->user_url; ?></a><br /><?php } ?>
@@ -36,7 +46,7 @@
 					<div class="clear"></div>
 					<div class="userpage-posts">
 						<?php if (have_posts()) { ?>
-							<h3><?php _e('Posts by','comicpress'); ?> <?php echo $curauth->nickname; ?> (<?php echo get_usernumposts($curauth->ID); ?>) &not;</h3>
+							<h3><?php _e('Posts by','comicpress'); ?> <?php echo $authorname; ?> (<?php echo get_usernumposts($curauth->ID); ?>) &not;</h3>
 							<?php // this area is a loop that shows what posts the person has done. ?>
 							<ol>
 									<table class="month-table">
diff --git a/comments.php b/comments.php
index 21b7598..037bee0 100644
--- a/comments.php
+++ b/comments.php
@@ -78,7 +78,7 @@ if ( post_password_required() ) { ?>
 		<h3><?php comment_form_title( __('Comment &not;','comicpress'), __('Reply to %s &not;','comicpress') ); ?></h3>
 
 		<div class="cancel-comment-reply">
-			<small><?php cancel_comment_reply_link(); ?></small>
+			<p><small><?php cancel_comment_reply_link(); ?></small></p>
 		</div>
 
 		<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
@@ -96,11 +96,11 @@ if ( post_password_required() ) { ?>
 					<label for="url"><small><?php _e('WEBSITE','comicpress'); ?></small></label></p>
 				<?php endif; ?>
 				<?php do_action('comment_form', $post->ID); ?>
-				<p><textarea name="comment" id="comment" cols="50" rows="6" tabindex="4"></textarea></p>
-				<button type="submit"><?php _e('Submit Comment','comicpress'); ?></button>
+				<p><textarea name="comment" id="comment-textarea" cols="60" rows="6" tabindex="4"></textarea></p>
+				<p><button type="submit" class="comment-submit"><?php _e('Submit Comment','comicpress'); ?></button></p>
 				<?php global $disable_comment_note;
 				if ($disable_comment_note != 'yes') { ?>
-					<div class="comment-note"><?php _e('NOTE - You can use these tags:','comicpress'); ?><br /><?php echo allowed_tags(); ?></div>
+					<p><span class="comment-note"><?php _e('NOTE - You can use these tags:','comicpress'); ?><br /><?php echo allowed_tags(); ?></span></p>
 				<?php } ?>
 				<?php comment_id_fields(); ?>
 			</form>	
@@ -111,7 +111,7 @@ if ( post_password_required() ) { ?>
 
 	<?php if ( ! empty($comments_by_type['pings']) ) : ?>
 	
-		<h4 id="comments"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h4>
+		<h3 id="comments"><?php _e('Pings & Trackbacks &not;','comicpress'); ?></h3>
 		<ol class="commentlist">
 		<ul>
 		<?php 
diff --git a/functions/displayblogpost.php b/functions/displayblogpost.php
index 66b7940..5345c42 100644
--- a/functions/displayblogpost.php
+++ b/functions/displayblogpost.php
@@ -55,7 +55,7 @@ function display_blog_post() {
 					</div>
 				<?php } ?>
 				<?php 
-					if ('open' == $post->comment_status) { 
+					if ('open' == $post->comment_status && !is_single()) { 
 						if (comicpress_check_themepack_file('commentlink') == false) { ?>
 							<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 						<?php }
diff --git a/functions/displaycomicpost.php b/functions/displaycomicpost.php
index 4f374b0..1895bdd 100644
--- a/functions/displaycomicpost.php
+++ b/functions/displaycomicpost.php
@@ -49,7 +49,7 @@ function display_comic_post() {
 					</div>
 				<?php } ?>
 				<?php 
-					if ($post->comment_status == 'open') { 
+					if ($post->comment_status == 'open' && !is_single()) { 
 						if (comicpress_check_themepack_file('commentlink') == false) { ?>
 							<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 						<?php }
diff --git a/header.php b/header.php
index b8e56b5..ec2ac55 100644
--- a/header.php
+++ b/header.php
@@ -38,7 +38,6 @@
 <!--[if lt IE 7]>
    <script type="text/javascript" src="<?php bloginfo('stylesheet_directory'); ?>/js/ie6submenus.js"></script>
 <![endif]-->
-	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
 	<?php wp_head(); global $disable_page_restraints; ?>
 </head>
 
diff --git a/style.css b/style.css
index 4100382..29d0ec3 100644
--- a/style.css
+++ b/style.css
@@ -16,7 +16,7 @@ http://www.opensource.org/licenses/gpl-3.0.html
 body {
 	margin: 0;
 	font-family: 'Arial', sans-serif;
-	font-size: 12px;
+	font-size: 11px;
 	color: #000;
 }
 
@@ -68,11 +68,12 @@ blockquote {
 }
 
 cite {
-	display: block;
 	font-family: 'Arial', sans-serif;
-	font-size: 11px;
+	font-size: 14px;
 	font-weight: bold;
 	font-style: normal;
+	margin: 0;
+	padding: 0;
 }
 
 acronym, abbr, span.caps {
@@ -519,7 +520,7 @@ a.navi-comments:hover span {
 
 .entry {
 	line-height: 1.45em;
-	font-size: 13px;
+	font-size: 14px;
 	padding: 3px 0;
 }
 
@@ -583,26 +584,16 @@ a.navi-comments:hover span {
 #comment-wrapper {
 	margin-top: 5px;
 	padding: 0 20px;
+	font-size: 12px;
+	font-family: 'Arial' , sans-serif;
 }
-
-#comment-wrapper h3 {
-	margin: 0;
-	padding: 20px 0 0 0;
-	font-weight: normal;
-	font-size: 20px;
-	clear: both;
-	font-family: 'Georgia' , serif;
-}
-
-.comment {
-	padding: 2px;
-	clear: both;
-	min-height: 64px;
-}
+	.comment {
+		padding: 2px;
+		clear: both;
+	}
 
 	.comment .comment {
 		margin-left: 30px;
-		padding-bottom: 10px;
 	}
 
 
@@ -623,10 +614,25 @@ a.navi-comments:hover span {
 		font-size: smaller;
 	}
 	
+	.comment-text {
+		padding-bottom: 20px;
+	}
+	
 .comment-author {
 	display: inline;
 }
 
+.comment-meta-data {
+	background: #eee;
+	border-bottom: solid 1px #000;
+	margin: 0;
+	padding: 0;
+}
+
+.bypostauthor .comment-meta-data {
+	background: #ccc;
+}
+
 .comment-meta {
 	display: inline;
 	padding: 0 0 0 5px;
@@ -643,31 +649,50 @@ a.navi-comments:hover span {
 	font-size: 11px;
 }
 
-#comment {
-	width: 99%;
+#comment-textarea, #author, #email, #url {
+	padding: 2px;
+	color: #000;
+	font-family: 'Verdana' , sans-serif;
 	font-size: 12px;
-	font-family: 'Arial' , sans-serif;
+	background: #ccc;
+	border: 1px solid #888;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+#comment-textarea {
+	width: 99%;
 }
 
 #author, #email, #url {
-	font-size: 12px;
-	font-family: 'Arial' , sans-serif;
+	width: 50%;
+}
+
+#comment-textarea:hover, #author:hover, #email:hover, #url:hover, #comment-textarea:focus, #author:focus, #email:focus, #url:focus {
+	background: #fff;
+}
+
+.comment-submit {
+	float: right;
 }
 
 .commentlist ul {
+	padding: 0;
+	margin: 0;
 	list-style: none;
-	margin-bottom: 30px;
 }
 
 ol.commentlist {
 	margin: 0;
-	padding: 0;
+	padding: 10px 0 30px 0;
 	font-size: 11px;
 	list-style: none;
 }
 
 ol.commentlist p {
-	margin: 10px 0 0 74px;
+	margin: 10px 0 0 24px;
 }
 
 ul.children {
@@ -750,7 +775,7 @@ ul.children {
 	.sidebar h2, .sidebar h2 a {
 		display: block;
 		display: block;
-		font-size: 17px;
+		font-size: 18px;
 		margin: 0;
 		padding: 0;
 	}
@@ -788,18 +813,15 @@ ul.children {
 	margin-bottom: 10px;
 }
 
-.archive-dropdown-wrap {
-	margin: 10px 0;
-}
-
 .archive-dropdown {
 	margin: 0;
 	padding: 0;
 	width: 166px;
 	height: 23px;
-	font-size: 12px;
+	font-size: 14px;
 	font-family: 'Arial' , sans-serif;
 	cursor: pointer;
+	border: solid 1px #555;
 }
 
 /* CALENDAR */