diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 6ef00608d..154feb6e7 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -888,7 +888,10 @@ abbr.required,
 	color: #333;
 }
 
-#timestampdiv input {
+#timestampdiv input,
+#emaildiv input,
+#uridiv input,
+.stuffbox #name {
 	border-color: #ddd;
 }
 
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 8857ab1fe..6ef3cbc94 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -87,7 +87,6 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 </div>
 
 <div id="postdiv" class="postarea">
-<h3><?php _e('Comment') ?></h3>
 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 38ed28e6d..88a219a03 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -405,8 +405,12 @@ textarea.all-options, input.all-options {
 	padding: 0;
 }
 
-#emaildiv input, #uridiv input, .stuffbox #name {
+#emaildiv input,
+#uridiv input,
+.stuffbox #name {
 	width: 94%;
+	border-style: solid;
+	border-width: 1px;
 }
 
 #wpbody-content .metabox-holder {
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 863b5e356..cc0646c60 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -1478,9 +1478,12 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 	if (($rows < 3) || ($rows > 100))
 		$rows = 12;
 
-	$rows = "rows='$rows'";	?>
+	$richedit =  user_can_richedit();
+	$rows = "rows='$rows'";
+	
+	if ( $richedit || $media_buttons ) { ?>
 	<div id="editor-toolbar">
-	<?php if ( user_can_richedit() ) {
+	<?php if ( $richedit ) {
 		$wp_default_editor = wp_default_editor(); ?>
 		<div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('<?php echo $id; ?>')" /></div>
 		<?php if ( 'html' == $wp_default_editor ) {
@@ -1491,15 +1494,16 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 			add_filter('the_editor_content', 'wp_richedit_pre'); ?>
 			<a id="edButtonHTML" onclick="switchEditors.go('<?php echo $id; ?>', 'html');"><?php _e('HTML'); ?></a>
 			<a id="edButtonPreview" class="active" onclick="switchEditors.go('<?php echo $id; ?>', 'tinymce');"><?php _e('Visual'); ?></a>
-		<?php } 
-	}
+		<?php }
+		}
 
-	if ( $media_buttons ) { ?>
-		<div id="media-buttons" class="hide-if-no-js">
-		<?php do_action( 'media_buttons' ); ?>
-		</div>
-	<?php } ?>
+		if ( $media_buttons ) { ?>
+			<div id="media-buttons" class="hide-if-no-js">
+			<?php do_action( 'media_buttons' ); ?>
+			</div>
+		<?php } ?>
 	</div>
+	<?php } ?>
 
 	<div id="quicktags">
 	<?php wp_print_scripts( 'quicktags' ); ?>