diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index f1ed4d6d5b..60617053fd 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -98,6 +98,8 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 $status_links = array();
 $num_comments = wp_count_comments();
 $stati = array('moderated' => sprintf(__('Awaiting Moderation (%s)'), "<span class='comment-count'>$num_comments->moderated</span>"), 'approved' => __('Approved'));
+$class = ( '' === $comment_status ) ? ' class="current"' : '';
+$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('All Comments')."</a>";
 foreach ( $stati as $status => $label ) {
 	$class = '';
 
@@ -106,8 +108,6 @@ foreach ( $stati as $status => $label ) {
 
 	$status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>';
 }
-$class = ( '' === $comment_status ) ? ' class="current"' : '';
-$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('All Comments')."</a>";
 echo implode(' | </li>', $status_links) . '</li>';
 unset($status_links);
 ?>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index c90e692a6c..d8f0e8be88 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -259,7 +259,7 @@ if (current_user_can('upload_files') && false) {
 <h2><?php _e('Advanced Options'); ?></h2>
 
 <div id="postexcerpt" class="postbox <?php echo postbox_classes('postexcerpt', 'post'); ?>">
-<h3><?php _e('Optional Excerpt') ?></h3>
+<h3><?php _e('Excerpt') ?></h3>
 <div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea></div>
 </div>
 
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 5ea942e5b6..569fc68bbf 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -75,6 +75,8 @@ $avail_post_stati = get_available_post_statuses('page');
 
 $status_links = array();
 $num_posts = wp_count_posts('page', 'readable');
+$class = empty($_GET['post_status']) ? ' class="current"' : '';
+$status_links[] = "<li><a href=\"edit-pages.php\"$class>".__('All Pages')."</a>";
 foreach ( $post_stati as $status => $label ) {
 	$class = '';
 
@@ -87,8 +89,6 @@ foreach ( $post_stati as $status => $label ) {
 	$status_links[] = "<li><a href=\"edit-pages.php?post_status=$status\"$class>" .
 	sprintf($label[2], $num_posts->$status) . '</a>';
 }
-$class = empty($_GET['post_status']) ? ' class="current"' : '';
-$status_links[] = "<li><a href=\"edit-pages.php\"$class>".__('All Pages')."</a>";
 echo implode(' |</li>', $status_links) . '</li>';
 unset($status_links);
 ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 8da14ab17f..0752da21df 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -82,6 +82,8 @@ if ( is_single() ) {
 <?php
 $status_links = array();
 $num_posts = wp_count_posts('post', 'readable');
+$class = empty($_GET['post_status']) ? ' class="current"' : '';
+$status_links[] = "<li><a href=\"edit.php\"$class>".__('All Posts')."</a>";
 foreach ( $post_stati as $status => $label ) {
 	$class = '';
 
@@ -96,8 +98,6 @@ foreach ( $post_stati as $status => $label ) {
 	$status_links[] = "<li><a href=\"edit.php?post_status=$status\"$class>" .
 	sprintf($label[2], $num_posts->$status) . '</a>';
 }
-$class = empty($_GET['post_status']) ? ' class="current"' : '';
-$status_links[] = "<li><a href=\"edit.php\"$class>".__('All Posts')."</a>";
 echo implode(' |</li>', $status_links) . '</li>';
 unset($status_links);
 ?>
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 7d6f27e947..b6c760e0e7 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -929,6 +929,8 @@ $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_po
 foreach ( $matches as $type => $reals )
 	foreach ( $reals as $real )
 		$num_posts[$type] += $_num_posts[$real];
+$class = empty($_GET['post_mime_type']) ? ' class="current"' : '';
+$type_links[] = "<li><a href='" . remove_query_arg(array('post_mime_type', 'paged', 'm')) . "'$class>".__('All Types')."</a>";
 foreach ( $post_mime_types as $mime_type => $label ) {
 	$class = '';
 
@@ -940,8 +942,6 @@ foreach ( $post_mime_types as $mime_type => $label ) {
 
 	$type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false)) . "'$class>" . sprintf($label[2], "<span id='$mime_type-counter'>{$num_posts[$mime_type]}</span>") . '</a>';
 }
-$class = empty($_GET['post_mime_type']) ? ' class="current"' : '';
-$type_links[] = "<li><a href='" . remove_query_arg(array('post_mime_type', 'paged', 'm')) . "'$class>".__('All Types')."</a>";
 echo implode(' | </li>', $type_links) . '</li>';
 unset($type_links);
 ?>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index a4c87b6a45..89a23faba6 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -88,6 +88,8 @@ $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_po
 foreach ( $matches as $type => $reals )
 	foreach ( $reals as $real )
 		$num_posts[$type] += $_num_posts[$real];
+$class = empty($_GET['post_mime_type']) ? ' class="current"' : '';
+$type_links[] = "<li><a href=\"upload.php\"$class>".__('All Types')."</a>";
 foreach ( $post_mime_types as $mime_type => $label ) {
 	$class = '';
 
@@ -100,8 +102,6 @@ foreach ( $post_mime_types as $mime_type => $label ) {
 	$type_links[] = "<li><a href=\"upload.php?post_mime_type=$mime_type\"$class>" .
 	sprintf($label[2], $num_posts[$mime_type]) . '</a>';
 }
-$class = empty($_GET['post_mime_type']) ? ' class="current"' : '';
-$type_links[] = "<li><a href=\"upload.php\"$class>".__('All Types')."</a>";
 echo implode(' | </li>', $type_links) . '</li>';
 unset($type_links);
 ?>