diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index a19da5fc5b..8dc2c8bd41 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -67,31 +67,6 @@ addLoadEvent(focusit);
 <?php endif; ?>
 <div id="poststuff">
 
-<div id="titlediv">
-<h3><?php _e('Title') ?></h3>
-<div class="inside">
-	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" />
-<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
-	<div id="edit-slug-box">
-<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : 
-	echo $sample_permalink_html;
-endif; ?>
-	</div>
-</div>
-</div>
-
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Post') ?></h3>
-<?php the_editor($post->post_content); ?>
-<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
-<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
-<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
-</div>
-
-<?php echo $form_pingback ?>
-<?php echo $form_prevstatus ?>
-
 <div class="submitbox" id="submitpost">
 
 <div id="previewview">
@@ -186,6 +161,31 @@ if ( ('edit' == $action) && current_user_can('delete_post', $post_ID) )
 <?php do_action('submitpost_box'); ?>
 </div>
 
+<div id="titlediv">
+<h3><?php _e('Title') ?></h3>
+<div class="inside">
+	<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" />
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+	<div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : 
+	echo $sample_permalink_html;
+endif; ?>
+	</div>
+</div>
+</div>
+
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<h3><?php _e('Post') ?></h3>
+<?php the_editor($post->post_content); ?>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+</div>
+
+<?php echo $form_pingback ?>
+<?php echo $form_prevstatus ?>
+
 <p class="submit">
 
 <span id="autosave"></span>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 558a28b9f7..6e29ea078e 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -21,33 +21,6 @@ addLoadEvent(focusit);
 
 <div id="poststuff">
 
-<div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
-<div class="inside">
-<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
-</div>
-</div>
-
-<div id="emaildiv" class="stuffbox">
-<h3><?php _e('E-mail') ?></h3>
-<div class="inside">
-<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
-</div>
-</div>
-
-<div id="uridiv" class="stuffbox">
-<h3><?php _e('URL') ?></h3>
-<div class="inside">
-<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="2" />
-</div>
-</div>
-
-<div id="postdiv" class="postarea">
-<h3><?php _e('Comment') ?></h3>
-<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false); ?>
-<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-</div>
-
 <div class="submitbox" id="submitcomment">
 
 <div id="previewview">
@@ -95,6 +68,33 @@ echo "<a href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment
 <?php do_action('submitcomment_box'); ?>
 </div>
 
+<div id="namediv" class="stuffbox">
+<h3><?php _e('Name') ?></h3>
+<div class="inside">
+<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
+</div>
+</div>
+
+<div id="emaildiv" class="stuffbox">
+<h3><?php _e('E-mail') ?></h3>
+<div class="inside">
+<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
+</div>
+</div>
+
+<div id="uridiv" class="stuffbox">
+<h3><?php _e('URL') ?></h3>
+<div class="inside">
+<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="2" />
+</div>
+</div>
+
+<div id="postdiv" class="postarea">
+<h3><?php _e('Comment') ?></h3>
+<?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+</div>
+
 <?php do_meta_boxes('comment', 'normal', $comment); ?>
 
 <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" />
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 8e35f83244..873a13ce85 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -39,27 +39,6 @@ function xfn_check($class, $value = '', $deprecated = '') {
 
 <div id="poststuff">
 
-<div id="namediv" class="stuffbox">
-<h3><?php _e('Name') ?></h3>
-<div class="inside">
-	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" />
-</div>
-</div>
-
-<div id="addressdiv" class="stuffbox">
-<h3><?php _e('Address') ?></h3>
-<div class="inside">
-	<input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" />
-</div>
-</div>
-
-<div id="descriptiondiv" class="stuffbox">
-<h3><?php _e('Description') ?></h3>
-<div class="inside">
-	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" />
-</div>
-</div>
-
 <div class="submitbox" id="submitlink">
 
 <div id="previewview">
@@ -88,6 +67,27 @@ function xfn_check($class, $value = '', $deprecated = '') {
 <?php do_action('submitlink_box'); ?>
 </div>
 
+<div id="namediv" class="stuffbox">
+<h3><?php _e('Name') ?></h3>
+<div class="inside">
+	<input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" />
+</div>
+</div>
+
+<div id="addressdiv" class="stuffbox">
+<h3><?php _e('Address') ?></h3>
+<div class="inside">
+	<input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" />
+</div>
+</div>
+
+<div id="descriptiondiv" class="stuffbox">
+<h3><?php _e('Description') ?></h3>
+<div class="inside">
+	<input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" />
+</div>
+</div>
+
 <div id="linkcategorydiv" class="postbox <?php echo postbox_classes('linkcategorydiv', 'link'); ?>">
 <h3><?php _e('Categories') ?></h3>
 <div class="inside">
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 29bc3e5f07..899a23ada3 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -47,28 +47,6 @@ addLoadEvent(focusit);
 </script>
 <div id="poststuff">
 
-<div id="titlediv">
-<h3><?php _e('Title') ?></h3>
-<div class="inside">
-  <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" />
-<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
-	<div id="edit-slug-box">
-<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : 
-	echo $sample_permalink_html;
-endif; ?>
-	</div>
-</div>
-</div>
-
-<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
-<h3><?php _e('Page') ?></h3>
-<?php the_editor($post->post_content); ?>
-<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
-<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
-<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
-</div>
-
 <div class="submitbox" id="submitpage">
 
 <div id="previewview">
@@ -162,6 +140,28 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
 <?php do_action('submitpage_box'); ?>
 </div>
 
+<div id="titlediv">
+<h3><?php _e('Title') ?></h3>
+<div class="inside">
+  <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" />
+<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
+	<div id="edit-slug-box">
+<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : 
+	echo $sample_permalink_html;
+endif; ?>
+	</div>
+</div>
+</div>
+
+<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
+<h3><?php _e('Page') ?></h3>
+<?php the_editor($post->post_content); ?>
+<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
+<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
+<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
+</div>
+
 <p class="submit">
 
 <span id="autosave"></span>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 1e8b7d995e..11cb2bd4c2 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1110,7 +1110,6 @@ html, body {
 	position: absolute;
 	background-color: #eaf3fa;
 	width: 200px;
-	top: 234px;
 	right: 15%;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;