diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 5a77c5a5d0..7ea1415b66 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -18,7 +18,13 @@ include('admin-header.php');
 <div class="wrap">
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='discussion' />
+<input type="hidden" name="action" value="update" />
 <?php wp_nonce_field('discussion-options') ?>
+
+<p class="submit">
+<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><?php _e('Default article settings') ?></th>
@@ -172,7 +178,6 @@ echo apply_filters('default_avatar_select', $avatar_list);
 <?php do_settings_sections('discussion'); ?>
 
 <p class="submit">
-<input type="hidden" name="action" value="update" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 5d3d9c8880..3525127821 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -50,8 +50,14 @@ include('./admin-header.php');
 
 <div class="wrap">
 <form method="post" action="options.php">
-<?php wp_nonce_field('general-options') ?>
 <input type='hidden' name='option_page' value='general' />
+<input type="hidden" name="action" value="update" />
+<?php wp_nonce_field('general-options') ?>
+
+<p class="submit">
+<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><label for="blogname"><?php _e('Blog Title') ?></label></th>
@@ -206,8 +212,8 @@ endfor;
 
 <?php do_settings_sections('general'); ?>
 
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-<input type="hidden" name="action" value="update" />
+<p class="submit">
+<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
 
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 022a3187fd..416223daec 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -19,6 +19,15 @@ include('admin-header.php');
 <div class="wrap">
 
 <form action="options.php" method="post">
+<input type="hidden" name="action" value="update" />
+<?php wp_nonce_field( 'media-options' ); ?>
+<input type='hidden' name='option_page' value='media' />
+<input type="hidden" name="page_options" value="thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h,image_default_size,image_default_align,image_default_link_type,large_size_w,large_size_h" /> <!-- is this needed anymore TODO -->
+
+<p class="submit">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>
 
 <table class="form-table">
@@ -116,10 +125,6 @@ include('admin-header.php');
 <?php do_settings_sections('media'); ?>
 
 <p class="submit">
-	<input type="hidden" name="action" value="update" />
-	<?php wp_nonce_field( 'media-options' ); ?>
-	<input type='hidden' name='option_page' value='media' />
-	<input type="hidden" name="page_options" value="thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h,image_default_size,image_default_align,image_default_link_type,large_size_w,large_size_h" />
 	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 7bac2171ea..5a04abb867 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -19,7 +19,13 @@ include('admin-header.php');
 <div class="wrap">
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='misc' />
+<input type="hidden" name="action" value="update" />
 <?php wp_nonce_field('misc-options') ?>
+
+<p class="submit">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
+</p>
+
 <h3><?php _e('Uploading'); ?></h3>
 <table class="form-table">
 <tr valign="top">
@@ -72,10 +78,10 @@ include('admin-header.php');
 <?php do_settings_sections('misc'); ?>
 
 <p class="submit">
-<input type="hidden" name="action" value="update" />
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
 </p>
+
 </form>
 </div>
 
-<?php include('./admin-footer.php'); ?>
+<?php include('./admin-footer.php'); ?>
\ No newline at end of file
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 3b9cd7ab73..dc4e00f276 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -125,6 +125,12 @@ else
 <div class="wrap">
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
+
+
+<p class="submit">
+	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
+</p>
+
   <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
@@ -195,7 +201,9 @@ $structures = array(
 
 <?php do_settings_sections('permalink'); ?>
 
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" /></p>
+<p class="submit">
+	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
+</p>
   </form>
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
   <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index e1ab331ffe..201677a562 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -19,6 +19,12 @@ include('./admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('privacy-options') ?>
 <input type='hidden' name='option_page' value='privacy' />
+<input type="hidden" name="action" value="update" />
+
+<p class="submit">
+	<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><?php _e('Blog Visibility') ?> </th>
@@ -35,8 +41,8 @@ include('./admin-header.php');
 
 <?php do_settings_sections('privacy'); ?>
 
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
-<input type="hidden" name="action" value="update" />
+<p class="submit">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 372da4d858..2863473134 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -19,6 +19,12 @@ include('admin-header.php');
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('reading-options') ?>
 <input type='hidden' name='option_page' value='reading' />
+<input type="hidden" name="action" value="update" />
+
+<p class="submit">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <table class="form-table">
 <?php if ( get_pages() ): ?>
 <tr valign="top">
@@ -74,8 +80,7 @@ include('admin-header.php');
 <?php do_settings_fields('reading', 'default'); ?>
 </table>
 <p class="submit">
-<input type="hidden" name="action" value="update" />
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 0f339ec6ef..32b6aff96e 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -19,6 +19,12 @@ include('admin-header.php');
 <form method="post" action="options.php">
 <?php wp_nonce_field('writing-options') ?>
 <input type='hidden' name='option_page' value='writing' />
+<input type="hidden" name="action" value="update" />
+
+<p class="submit">
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+</p>
+
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></th>
@@ -142,8 +148,7 @@ endforeach;
 <?php do_settings_sections('writing'); ?>
 
 <p class="submit">
-<input type="hidden" name="action" value="update" />
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+	<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
 </div>