diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 4ef9edb9c0..e2de04dfe9 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -105,6 +105,8 @@ if ( function_exists('mb_strlen') ) {
 <?php
 do_action('admin_notices');
 
+screen_meta($pagenow);
+
 if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
 }
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 167015cd92..8ab6c00c05 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -131,8 +131,6 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 ?>
 
-<?php screen_meta('edit-categories') ?>
-
 <div class="wrap nosubsub">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 554b62951b..3be966dd37 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -81,8 +81,6 @@ $post_id = isset($_GET['p']) ? (int) $_GET['p'] : 0;
 $search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
 $search = attribute_escape( $search_dirty ); ?>
 
-<?php screen_meta('edit-comments') ?>
-
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 85423919c2..b2bd6fc85c 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -465,8 +465,13 @@ function post_revisions_meta_box($post) {
 add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core');
 endif;
 
+do_action('do_meta_boxes', 'post', 'normal', $post);
+do_action('do_meta_boxes', 'post', 'advanced', $post);
+do_action('do_meta_boxes', 'post', 'side', $post);
+
+require_once('admin-header.php');
+
 ?>
-<?php screen_meta('post'); ?>
 
 <?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index c56ab2b819..7ad595b208 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -60,8 +60,6 @@ $messages[4] = __('Category not added.');
 $messages[5] = __('Category not updated.');
 $messages[6] = __('Categories deleted.'); ?>
 
-<?php screen_meta('edit-link-categories') ?>
-
 <div class="wrap nosubsub">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 80e6e0c686..a4cdb2c9d8 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -16,7 +16,7 @@ if ( ! empty($cat_ID) ) {
 	/**
 	 * @var string
 	 */
-	$heading = '';
+	$heading = '<h2>' . __('Edit Category') . '</h2>';
 	$submit_text = __('Edit Category');
 	$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
 	$action = 'editedcat';
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index cd35761cb2..c282424d88 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -307,13 +307,29 @@ function link_advanced_meta_box($link) {
 </table>
 <?php
 }
-add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); ?>
+add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); 
+
+do_action('do_meta_boxes', 'link', 'normal', $link);
+do_action('do_meta_boxes', 'link', 'advanced', $link);
+do_action('do_meta_boxes', 'link', 'side', $link);
+
+require_once ('admin-header.php');
+
+?>
 
-<?php screen_meta('link') ?>
 
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
+<?php
+$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
+	'<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
+?>
+
+<?php if ( isset( $_GET['added'] ) && '' != $_POST['link_name']) : ?>
+<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
+<?php endif; ?>
+
 <?php
 if ( !empty($form) )
 	echo $form;
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index e603d1dd2f..728e603165 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -369,9 +369,13 @@ function page_revisions_meta_box($post) {
 }
 add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
 endif;
-?>
 
-<?php screen_meta('page'); ?>
+do_action('do_meta_boxes', 'page', 'normal', $post);
+do_action('do_meta_boxes', 'page', 'advanced', $post);
+do_action('do_meta_boxes', 'page', 'side', $post);
+
+require_once('admin-header.php');
+?>
 
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index b60740d7c2..12754fb594 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -101,8 +101,6 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<?php screen_meta('edit-pages') ?>
-
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index f9adb6118d..5cd8cbe2fc 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -129,8 +129,6 @@ $messages[4] = __('Tag not added.');
 $messages[5] = __('Tag not updated.');
 $messages[6] = __('Tags deleted.'); ?>
 
-<?php screen_meta('edit-tags') ?>
-
 <div class="wrap nosubsub">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 5ebe980af2..bf2f9304fe 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -90,8 +90,6 @@ if ( empty($_GET['mode']) )
 else
 	$mode = attribute_escape($_GET['mode']); ?>
 
-<?php screen_meta('edit-posts') ?>
-
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index f6aaa0a354..f804fdb329 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -2650,7 +2650,7 @@ function do_meta_boxes($page, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	do_action('do_meta_boxes', $page, $context, $object);
+	//do_action('do_meta_boxes', $page, $context, $object);
 
 	$hidden = (array) get_user_option( "meta-box-hidden_$page" );
 
@@ -3177,10 +3177,19 @@ function _post_states($post) {
 function screen_meta($screen) {
 	global $wp_meta_boxes;
 
-	$column_screens = array('edit-posts' => 'post', 'edit-pages' => 'page', 'edit-tags' => 'tag', 'edit-categories' => 'category',
-		'edit-link-categories' => 'link-category', 'edit-links' => 'link', 'edit-users' => 'user', 'edit-media' => 'media',
+	$screen = str_replace('.php', '', $screen);
+
+	$column_screens = array('edit' => 'post', 'edit-pages' => 'page', 'edit-tags' => 'tag', 'categories' => 'category',
+		'edit-link-categories' => 'link-category', 'link-manager' => 'link', 'users' => 'user', 'upload' => 'media',
 		'edit-comments' => 'comment');
 
+	$screen = str_replace('-new', '', $screen);
+	$screen = str_replace('-add', '', $screen);
+	$meta_screens = array('index' => 'dashboard');
+
+	if ( isset($meta_screens[$screen]) )
+		$screen = $meta_screens[$screen];
+error_log("screen: $screen");
 	$show_screen = false;
 	if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens[$screen]) )
 		$show_screen = true;
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 386878a0ff..b4921ce533 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -28,8 +28,6 @@ require_once('admin-header.php');
 $today = current_time('mysql', 1);
 ?>
 
-<?php screen_meta('dashboard'); ?>
-
 <div class="wrap">
 <h2><?php echo wp_specialchars( $title ); ?></h2>
 
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index de0f268bf4..e7d861bff9 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -20,17 +20,6 @@ wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
 wp_enqueue_script('link');
 wp_enqueue_script('xfn');
 
-$link_added = ( isset($_GET['added']) && '' != $_POST['link_name'] ) ?
-	'<div id="message" class="updated fade"><p>' . __('Link added.') . '</p></div>' : '';
-
-require('admin-header.php');
-?>
-
-<?php if ( isset( $_GET['added'] ) && '' != $_POST['link_name']) : ?>
-<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div>
-<?php endif; ?>
-
-<?php
 $link = get_default_link_to_edit();
 include('edit-link-form.php');
 
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 8e91caf493..10e0ef1565 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -74,8 +74,6 @@ switch ($order_by) {
 		break;
 } ?>
 
-<?php screen_meta('edit-links') ?>
-
 <div class="wrap nosubsub">
 <h2><?php echo wp_specialchars( $title ); ?></h2> 
 
diff --git a/wp-admin/link.php b/wp-admin/link.php
index b123bc6d5f..f4b9740b6b 100644
--- a/wp-admin/link.php
+++ b/wp-admin/link.php
@@ -106,7 +106,6 @@ switch ($action) {
 		if (!$link = get_link_to_edit($link_id))
 			wp_die(__('Link not found.'));
 
-		include_once ('admin-header.php');
 		include ('edit-link-form.php');
 		include ('admin-footer.php');
 		break;
diff --git a/wp-admin/page-new.php b/wp-admin/page-new.php
index ab2215ddba..05ad921073 100644
--- a/wp-admin/page-new.php
+++ b/wp-admin/page-new.php
@@ -19,20 +19,13 @@ add_thickbox();
 wp_enqueue_script('media-upload');
 wp_enqueue_script('word-count');
 
-require_once('admin-header.php');
-?>
-
-<?php if ( (isset($_GET['posted']) && $_GET['posted'])  || isset($_GET['saved'])  ) : ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Page saved.') ?></strong> <a href="edit-pages.php"><?php _e('Manage pages'); ?></a> | <a href="<?php echo get_page_link( isset($_GET['posted']) ? $_GET['posted'] : $_GET['saved'] ); ?>"><?php _e('View page') ; ?></a></p></div>
-<?php endif; ?>
-
-<?php
 if ( current_user_can('edit_pages') ) {
 	$action = 'post';
 	$post = get_default_page_to_edit();
 
 	include('edit-page-form.php');
 }
-?>
 
-<?php include('admin-footer.php'); ?>
+include('admin-footer.php');
+
+?>
diff --git a/wp-admin/page.php b/wp-admin/page.php
index 1b5ddbe99b..baf064d231 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -115,8 +115,6 @@ case 'edit':
 		}
 	}
 
-	require_once('admin-header.php');
-
 	if ( !current_user_can('edit_page', $page_ID) )
 		die ( __('You are not allowed to edit this page.') );
 
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 233e6f4c89..229f3d06c3 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -19,9 +19,8 @@ add_thickbox();
 wp_enqueue_script('media-upload');
 wp_enqueue_script('word-count');
 
-require_once ('./admin-header.php');
-
-if ( ! current_user_can('edit_posts') ) { ?>
+if ( ! current_user_can('edit_posts') ) {
+	require_once ('./admin-header.php'); ?>
 <div class="wrap">
 <p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to add the <code>edit_posts</code> capability to your user, in order to be authorized to post.<br />
 You can also <a href="mailto:%s?subject=Promotion?">e-mail the admin</a> to ask for a promotion.<br />
@@ -33,15 +32,6 @@ When you&#8217;re promoted, just reload this page and you&#8217;ll be able to bl
 	exit();
 }
 
-if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
-<?php
-endif;
-?>
-
-
-<?php
-
 // Show post form.
 $post = get_default_post_to_edit();
 include('edit-form-advanced.php');
diff --git a/wp-admin/post.php b/wp-admin/post.php
index fc7d6e5cba..f9494d79e2 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -158,8 +158,6 @@ case 'edit':
 
 	$title = __('Edit Post');
 
-	require_once('admin-header.php');
-
 	if ( !current_user_can('edit_post', $post_ID) )
 		die ( __('You are not allowed to edit this post.') );
 
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 39afda7465..f6652a68d9 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -145,8 +145,6 @@ if ( is_singular() ) {
 
 require_once('admin-header.php'); ?>
 
-<?php screen_meta('edit-media') ?>
-
 <?php
 if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
 	$_GET['message'] = '1';
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 60ba8d1ba7..d772f6cc2a 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -41,8 +41,6 @@ wp_enqueue_script('admin-forms');
 
 require_once ('admin-header.php');
 
-screen_meta('user');
-
 ?>
 <div class="wrap">
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 7b9514eeaa..0e40ed562f 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -220,8 +220,6 @@ default:
 		}
 	endif; ?>
 
-<?php screen_meta('edit-users') ?>
-
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
 		<ul>