diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php
index 4b4f622d95..e841688591 100644
--- a/wp-admin/media-new.php
+++ b/wp-admin/media-new.php
@@ -1,12 +1,117 @@
 <?php
 /**
- * Upload new media Administration Screen.
+ * Manage media uploaded file.
+ *
+ * There are many filters in here for media. Plugins can extend functionality
+ * by hooking into the filters.
  *
  * @package WordPress
  * @subpackage Administration
  */
 
-$_GET['inline'] = 'true';
-/** Administration bootstrap */
+/** Load WordPress Administration Bootstrap */
 require_once('./admin.php');
-require_once('./media-upload.php');
+
+if (!current_user_can('upload_files'))
+	wp_die(__('You do not have permission to upload files.'));
+
+wp_enqueue_script('plupload-handlers');
+wp_enqueue_script('image-edit');
+wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_style('imgareaselect');
+wp_enqueue_script( 'media-gallery' );
+
+
+// IDs should be integers
+$ID = isset($ID) ? (int) $ID : 0;
+$post_id = isset($post_id)? (int) $post_id : 0;
+
+// Require an ID for the edit screen
+if ( isset($action) && $action == 'edit' && !$ID )
+	wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+	$errors = array();
+
+	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+		check_admin_referer('media-form');
+		// Upload File button was clicked
+		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
+		unset($_FILES);
+		if ( is_wp_error($id) ) {
+			$errors['upload_error'] = $id;
+			$id = false;
+		}
+	}
+
+	if ( isset($_GET['upload-page-form']) ) {
+		$errors = array_merge($errors, (array) media_upload_form_handler());
+
+		$location = 'upload.php';
+		if ( $errors )
+			$location .= '?message=3';
+
+		wp_redirect( admin_url($location) );
+		exit;
+	}
+
+	if ( isset( $_REQUEST['post_id'] ) )
+		wp_die( __( 'Cheatin&#8217; uh?' ) );
+
+	$title = __('Upload New Media');
+	$parent_file = 'upload.php';
+	get_current_screen()->add_help_tab( array(
+	'id'		=> 'overview',
+	'title'		=> __('Overview'),
+	'content'	=>
+		'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
+		'<ul>' .
+			'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
+			'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
+			'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
+		'</ul>' .
+		'<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
+	) );
+	get_current_screen()->set_help_sidebar(
+		'<p><strong>' . __('For more information:') . '</strong></p>' .
+		'<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
+		'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	);
+
+	require_once('./admin-header.php');
+
+	$form_class = 'media-upload-form wp-upload-form type-form validate';
+
+	if ( get_user_setting('uploader') )
+		$form_class .= ' html-uploader';
+	?>
+	<div class="wrap">
+	<?php screen_icon(); ?>
+	<h2><?php echo esc_html( $title ); ?></h2>
+
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
+
+	<?php media_upload_form(); ?>
+
+	<script type="text/javascript">
+	jQuery(function($){
+		var preloaded = $(".media-item.preloaded");
+		if ( preloaded.length > 0 ) {
+			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
+		}
+		updateMediaForm();
+		post_id = 0;
+		shortform = 1;
+	});
+	</script>
+	<input type="hidden" name="post_id" id="post_id" value="0" />
+	<?php wp_nonce_field('media-form'); ?>
+	<div id="media-items" class="hide-if-no-js"></div>
+	<?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
+	</form>
+	</div>
+
+<?php
+	include('./admin-footer.php');
\ No newline at end of file
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 8c5dac2894..96af66bb8d 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -34,94 +34,6 @@ $post_id = isset($post_id)? (int) $post_id : 0;
 if ( isset($action) && $action == 'edit' && !$ID )
 	wp_die( __( 'Cheatin&#8217; uh?' ) );
 
-if ( isset($_GET['inline']) ) {
-	$errors = array();
-
-	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		check_admin_referer('media-form');
-		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
-			$errors['upload_error'] = $id;
-			$id = false;
-		}
-	}
-
-	if ( isset($_GET['upload-page-form']) ) {
-		$errors = array_merge($errors, (array) media_upload_form_handler());
-
-		$location = 'upload.php';
-		if ( $errors )
-			$location .= '?message=3';
-
-		wp_redirect( admin_url($location) );
-		exit;
-	}
-
-	if ( isset( $_REQUEST['post_id'] ) )
-		wp_die( __( 'Cheatin&#8217; uh?' ) );
-
-	$title = __('Upload New Media');
-	$parent_file = 'upload.php';
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-			'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-			'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
-		'</ul>' .
-		'<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
-	) );
-	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="http://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</a>') . '</p>' .
-		'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-
-	require_once('./admin-header.php');
-
-	$form_class = 'media-upload-form wp-upload-form type-form validate';
-
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
-	?>
-	<div class="wrap">
-	<?php screen_icon(); ?>
-	<h2><?php echo esc_html( $title ); ?></h2>
-
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-upload.php?inline=&amp;upload-page-form='); ?>" class="<?php echo $form_class; ?>" id="file-form">
-
-	<?php media_upload_form(); ?>
-
-	<script type="text/javascript">
-	jQuery(function($){
-		var preloaded = $(".media-item.preloaded");
-		if ( preloaded.length > 0 ) {
-			preloaded.each(function(){prepareMediaItem({id:this.id.replace(/[^0-9]/g, '')},'');});
-		}
-		updateMediaForm();
-		post_id = 0;
-		shortform = 1;
-	});
-	</script>
-	<input type="hidden" name="post_id" id="post_id" value="0" />
-	<?php wp_nonce_field('media-form'); ?>
-	<div id="media-items" class="hide-if-no-js"></div>
-	<?php submit_button( __( 'Save all changes' ), 'button savebutton hidden', 'save' ); ?>
-	</form>
-	</div>
-
-<?php
-	include('./admin-footer.php');
-
-} else {
 	if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
 		wp_die( __( 'Cheatin&#8217; uh?' ) );
 
@@ -144,4 +56,3 @@ if ( isset($_GET['inline']) ) {
 		do_action("media_upload_$type");
 	else
 		do_action("media_upload_$tab");
-}