diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index 8d92398506..33e4d7a969 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -52,7 +52,7 @@ textarea, input, select {
 
 .subsubsub a { line-height: 200%; padding: 3px; }
 
-.subsubsub a.current { color: #000; font-weight: bold; }
+.subsubsub a.current { color: #000; font-weight: bold; background: none; border: none;}
 
 .subsubsub li { display: inline; margin: 0; padding: 0; }
 
@@ -67,6 +67,7 @@ textarea, input, select {
 	border-bottom: 1px solid #ccc;
 	font-size: 10px;
 	padding: 10px 6px 20px 6px;
+	vertical-align: text-top;
 }
 
 .widefat th {
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 21a6f253bd..cd676f0261 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -61,7 +61,7 @@ foreach ( $stati as $status => $label ) {
 }
 $class = ( '' === $comment_status ) ? ' class="current"' : '';
 $status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('All Comments')."</a>";
-echo implode(' |</li>', $status_links) . '</li>';
+echo implode(' | </li>', $status_links) . '</li>';
 unset($status_links);
 ?>
 </ul>
@@ -102,7 +102,10 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 
 <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
 
-<p><a href="?mode=detail"><?php _e('Detail View') ?></a> | <a href="?mode=list"><?php _e('List View') ?></a></p>
+<ul class="view-switch">
+	<li <?php if ( 'detail' == $mode ) echo "class='current'" ?>><a href="?mode=detail"><?php _e('Detail View') ?></a></li>
+	<li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="?mode=list"><?php _e('List View') ?></a></li>
+</ul>
 
 <?php
 
@@ -127,8 +130,6 @@ $page_links = paginate_links( array(
 
 ?>
 
-<br style="clear:both;" />
-
 <div class="tablenav">
 
 <?php
@@ -165,7 +166,7 @@ if ($comments) {
 		$post = get_post($comment->comment_post_ID);
 		$authordata = get_userdata($post->post_author);
 		$comment_status = wp_get_comment_status($comment->comment_ID);
-		$class = ('alternate' == $class) ? '' : 'alternate';
+		$class = ('alternate' == $class) ? '' : '';
 		$class .= ('unapproved' == $comment_status) ? ' unapproved' : '';
 		$post_link = '<a href="' . get_comment_link() . '">' . get_the_title($comment->comment_post_ID) . '</a>';
 		$author_url = get_comment_author_url();
@@ -173,9 +174,9 @@ if ($comments) {
 			$author_url = '';
 ?>
   <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
-    <td style="text-align: center; vertical-align: text-top"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
-    <td style="vertical-align: text-top">
-    <p><strong class="comment-author"><?php comment_author(); ?></strong><br />
+    <td style="text-align: center;"><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
+    <td class="comment">
+    <p class="comment-author"><strong><?php comment_author(); ?></strong><br />
     <?php if ( !empty($author_url) ) : ?> 
     <a href="<?php echo $author_url ?>"><?php echo $author_url; ?></a> |
     <?php endif; ?>
@@ -183,11 +184,12 @@ if ($comments) {
     <?php comment_author_email_link() ?> |
     <?php endif; ?>
     <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=detail"><?php comment_author_IP() ?></a>
-    <p><?php if ( 'list' == $mode ) comment_excerpt(); else comment_text(); ?></p>
-   	<?php printf(__('From %1$s, %2$s at %3$s'), $post_link, get_the_time(get_option('date_format')), get_the_time()) ?>
+    </p>
+   	<p><?php if ( 'list' == $mode ) comment_excerpt(); else comment_text(); ?></p>
+   	<p><?php printf(__('From %1$s, %2$s at %3$s'), $post_link, get_the_time(get_option('date_format')), get_the_time()) ?></p>
     </td>
-    <td style="vertical-align: text-top"><?php comment_date(); ?></td>
-    <td style="vertical-align: text-top">
+    <td><?php comment_date(); ?></td>
+    <td>
     <?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
     	echo "<a href='comment.php?action=editcomment&amp;c=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a> | ";
 		$url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index dca9c9a07b..6e7a29a112 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1,9 +1,3 @@
-
-a.delete:hover {
-	background: #c00;
-	color: #fff;
-}
-
 .plugins p {
 	margin: 4px;
 	padding: 0;
@@ -182,26 +176,10 @@ select {
 	padding: none;
 }
 
-.submit a{
+.submit a {
 	color: #fff;
 }
 
-.unapproved {
-	color: #888;
-}
-
-.unapproved a:link {
-	color: #b9bcff;
-}
-
-.unapproved a:visited {
-	color: #696dff;
-}
-
-.unapproved a:hover {
-	color: #009ef0;
-}
-
 .approve {
 	display: none;
 }
@@ -300,16 +278,6 @@ input.disabled, textarea.disabled {
 	width: 300px;
 }
 
-input.delete:hover {
-	background: #ce0000;
-	color: #fff;
-}
-
-#deletebookmarks:hover {
-	background: #ce0000;
-	color: #fff;
-}
-
 #quicktags {
 	background: #cee1ef;
 	padding: 0;
@@ -1345,3 +1313,70 @@ p#post-search {
 body.minwidth {
 	min-width: 940px;
 }
+
+ul.view-switch {
+	float: right;
+	list-style: none;
+	margin: -28px 5px 0 0;
+}
+
+ul.view-switch li {
+	float: left;
+	margin: 0;
+	font-size: 12px;
+	padding: 6px;
+}
+
+ul.view-switch li.current {
+	background: #eaf3fa;
+	border: none;
+	-moz-border-radius-topleft: 3px;
+	-khtml-border-top-left-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-khtml-border-top-right-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
+ul.view-switch li.current a {
+	color: #333;
+}
+
+#the-comment-list .comment a {
+	color: #666;
+	padding-bottom: 1px;
+	border-bottom: 1px solid #ababab;
+}
+
+#the-comment-list .comment a:hover {
+	color: #d54e21;
+}
+
+#the-comment-list .unapproved {
+	background: #f0f0f0;
+}
+
+#the-comment-list td.comment p.comment-author {
+	margin-top: 0;
+	margin-left: 0 ;
+}
+
+#the-comment-list p.comment-author img {
+	float: left;
+	margin-right: 8px;
+}
+
+#the-comment-list td {
+	vertical-align: top;
+	font-size: 11px;
+}
+
+#the-comment-list td.comment {
+	width: 70%;
+}
+
+#the-comment-list td.comment p {
+	margin-left: 8px;
+}
\ No newline at end of file