diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index 45f9ce797a..1ffedd2a72 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -89,6 +89,7 @@ textarea, input, select {
 	margin-left: 15px;
 	margin-right: 15px;
 	padding: 0;
+	max-width: 960px;
 }
 
 .wrap h2 {
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 204b9e3989..1fe4fb841c 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -163,6 +163,7 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )
 <?php do_action('submitpost_box'); ?>
 </div>
 
+<div id="post-body">
 <div id="titlediv">
 <h3><?php _e('Title') ?></h3>
 <div class="inside">
@@ -340,7 +341,7 @@ if ( $authors && count( $authors ) > 1 ) :
 <?php do_meta_boxes('post', 'advanced', $post); ?>
 
 <?php do_action('dbx_post_sidebar'); ?>
-
+</div>
 </div>
 
 </div>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 688182416c..6a60b6b2e8 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -67,6 +67,7 @@ function xfn_check($class, $value = '', $deprecated = '') {
 <?php do_action('submitlink_box'); ?>
 </div>
 
+<div id="post-body">
 <div id="namediv" class="stuffbox">
 <h3><?php _e('Name') ?></h3>
 <div class="inside">
@@ -298,6 +299,7 @@ function xfn_check($class, $value = '', $deprecated = '') {
 <input type="hidden" name="action" value="add" />
 <?php endif; ?>
 
+</div>
 </div>
 
 </div>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 91ed2b979a..72457212c5 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -146,6 +146,7 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
 <?php do_action('submitpage_box'); ?>
 </div>
 
+<div id="post-body">
 <div id="titlediv">
 <h3><?php _e('Title') ?></h3>
 <div class="inside">
@@ -269,6 +270,7 @@ if ( $authors && count( $authors ) > 1 ) :
 
 <?php do_meta_boxes('page', 'advanced', $post); ?>
 
+</div>
 </div>
 
 </div>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 085e71d24e..711014f40f 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -391,7 +391,7 @@ input.disabled, textarea.disabled {
 	width: auto;
 }
 
-#poststuff {
+#poststuff #post-body {
 	margin-right: 16em;
 }
 
@@ -1141,10 +1141,9 @@ html, body {
 }
 
 .submitbox {
-	position: absolute;
 	background-color: #eaf3fa;
 	width: 200px;
-	right: 15px;
+	float: right;
 }
 
 
@@ -1401,7 +1400,8 @@ ul.view-switch li.current a {
 
 #the-comment-list td.comment {
 	width: 65%;
-	padding-right: 10%;
+	max-width: 460px;
+	word-wrap: break-word;
 }
 
 #the-comment-list td.comment p {