diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 162d3a40b1..f06391ba60 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -11,8 +11,10 @@ include('admin-header.php');
 <h2><?php _e('Discussion Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<h3><?php _e('Usual settings for an article:') ?></h3>
-<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
+<table class="niceblue">
+<tr valign="top">
+<th scope="row"><?php _e('Default article settings') ?></th>
+<td>
 <ul>
 <li>
 <label for="default_pingback_flag">
@@ -30,8 +32,12 @@ include('admin-header.php');
 <?php _e('Allow people to post comments on the article') ?></label>
 </li>
 </ul>
-
-<h3><?php _e('E-mail me whenever:') ?></h3>
+<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('E-mail me whenever') ?></th>
+<td>
 <ul>
 <li>
 <label for="comments_notify">
@@ -44,8 +50,11 @@ include('admin-header.php');
 <?php _e('A comment is held for moderation') ?> </label>
 </li>
 </ul>
-
-<h3><?php _e('Before a comment appears:') ?></h3>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Before a comment appears') ?></th>
+<td>
 <ul>
 <li>
 <label for="comment_moderation">
@@ -55,20 +64,29 @@ include('admin-header.php');
 <li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li>
 <li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
 </ul>
-
-<h3><?php _e('Comment Moderation') ?></h3>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Comment Moderation') ?></th>
+<td>
 <p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
 
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
 </p>
-
-<h3><?php _e('Comment Blacklist') ?></h3>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Comment Blacklist') ?></th>
+<td>
 <p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
 <p>
 <textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
 </p>
+</td>
+</tr>
+</table>
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index e8f4378d92..359972e0f9 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -13,31 +13,31 @@ include('./admin-header.php');
 <?php wp_nonce_field('update-options') ?>
 <table class="niceblue">
 <tr valign="top">
-<th scope="row"><?php _e('Blog title:') ?></th>
+<th scope="row"><?php _e('Blog Title') ?></th>
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Tagline:') ?></th>
+<th scope="row"><?php _e('Tagline') ?></th>
 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
 <br />
 <?php _e('In a few words, explain what this blog is about.') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('WordPress address (URL):') ?></th>
+<th scope="row"><?php _e('WordPress address (URL)') ?></th>
 <td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Blog address (URL):') ?></th>
+<th scope="row"><?php _e('Blog address (URL)') ?></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /><br /><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('E-mail address:') ?> </th>
+<th scope="row"><?php _e('E-mail address') ?> </th>
 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
 <br />
 <?php _e('This address is used only for admin purposes.') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Membership:') ?></th>
+<th scope="row"><?php _e('Membership') ?></th>
 <td> <label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
 <?php _e('Anyone can register') ?></label><br />
@@ -48,27 +48,27 @@ include('./admin-header.php');
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('New User Default Role:') ?></th>
+<th scope="row"><?php _e('New User Default Role') ?></th>
 <td><label for="default_role">
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th>
+<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is') ?> </th>
 <td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
+<th scope="row"><?php _e('Times in the blog should differ by') ?> </th>
 <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
 <?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Default date format:') ?></th>
+<th scope="row"><?php _e('Date Format') ?></th>
 <td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Default time format:') ?></th>
+<th scope="row"><?php _e('Time Format') ?></th>
 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
 </tr>
@@ -77,7 +77,7 @@ include('./admin-header.php');
 <td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') ?> </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Weeks in the calendar should start on:') ?></th>
+<th scope="row"><?php _e('Week Starts On') ?></th>
 <td><select name="start_of_week" id="start_of_week">
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 0cfcf13046..447a22c798 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -15,7 +15,7 @@ include('admin-header.php');
 <h3><?php _e('Uploading'); ?></h3>
 <table class="niceblue">
 <tr valign="top">
-<th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
+<th scope="row"><?php _e('Store uploads in this folder'); ?></th>
 <td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo attribute_escape(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" size="40" />
 <br />
 <?php _e('Default is <code>wp-content/uploads</code>'); ?>
@@ -23,7 +23,7 @@ include('admin-header.php');
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e('Full URL path to files (optional)'); ?>:</th>
+<th scope="row"><?php _e('Full URL path to files (optional)'); ?></th>
 <td><input name="upload_url_path" type="text" id="upload_url_path" class="code" value="<?php echo attribute_escape( get_option('upload_url_path')); ?>" size="40" />
 </td>
 </tr>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index af7a629d53..70c62eaf7f 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -171,7 +171,7 @@ checked="checked"
 	  <?php _e('Tag base'); ?>: <input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" />
      </p>
     <p class="submit">
-      <input type="submit" name="submit" value="<?php _e('Update Permalink Structure') ?>" />
+      <input type="submit" name="submit" value="<?php _e('Save Changes') ?>" />
     </p>
   </form>
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 94f2d8167b..053781fd1b 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -13,7 +13,7 @@ include('./admin-header.php');
 <?php wp_nonce_field('update-options') ?>
 <table class="niceblue">
 <tr valign="top">
-<th scope="row"><?php _e('Blog visibility:') ?> </th>
+<th scope="row"><?php _e('Blog Visibility') ?> </th>
 <td>
 <p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
 <label for="blog-public"><?php _e('I would like my blog to be visible to everyone, including search engines (like Google, Sphere, Technorati) and archivers');?></label></p>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index cff80a762c..6829cf1cbc 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -14,7 +14,7 @@ include('admin-header.php');
 <table class="niceblue">
 <?php if ( get_pages() ): ?>
 <tr valign="top">
-<th scope="row"><?php _e('Front page displays:')?></th>
+<th scope="row"><?php _e('Front page displays')?></th>
 <td>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
@@ -41,17 +41,17 @@ include('admin-header.php');
 </tr>
 <?php endif; ?>
 <tr valign="top">
-<th scope="row"><?php _e('Blog pages show at most:') ?></th>
+<th scope="row"><?php _e('Blog pages show at most') ?></th>
 <td>
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Syndication feeds show the most recent:') ?></th>
+<th scope="row"><?php _e('Syndication feeds show the most recent') ?></th>
 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('For each article in a feed, show:') ?> </th>
+<th scope="row"><?php _e('For each article in a feed, show') ?> </th>
 <td>
 <p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text') ?></label><br />
 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
@@ -72,7 +72,7 @@ include('admin-header.php');
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Show Avatars with Rating:') ?></th>
+<th scope="row"><?php _e('Show Avatars with Rating') ?></th>
 <td>
 <select name="avatar_rating" id="avatar_rating">
 <?php
@@ -86,7 +86,7 @@ endforeach;
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Encoding for pages and feeds:') ?></th>
+<th scope="row"><?php _e('Encoding for pages and feeds') ?></th>
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
 <?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
 </tr>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index ab3c31acd9..4b3fd32044 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -14,12 +14,12 @@ include('admin-header.php');
 
 <table class="niceblue">
 <tr valign="top">
-<th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th>
+<th scope="row"> <?php _e('Size of the post box') ?></th>
 <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
 <?php _e('lines') ?></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Formatting:') ?></th>
+<th scope="row"><?php _e('Formatting') ?></th>
 <td>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
@@ -28,7 +28,7 @@ include('admin-header.php');
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default post category:') ?></th>
+<th scope="row"><?php _e('Default Post Category') ?></th>
 <td><select name="default_category" id="default_category">
 <?php
 $categories = get_categories('get=all');
@@ -42,7 +42,7 @@ endforeach;
 </select></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default link category:') ?></th>
+<th scope="row"><?php _e('Default Link Category') ?></th>
 <td><select name="default_link_category" id="default_link_category">
 <?php
 $link_categories = get_terms('link_category', 'get=all');
@@ -62,24 +62,24 @@ endforeach;
 
 <table class="niceblue">
 <tr valign="top">
-<th scope="row"><?php _e('Mail server:') ?></th>
+<th scope="row"><?php _e('Mail Server') ?></th>
 <td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
 <label for="mailserver_port"><?php _e('Port:') ?></label>
 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" size="6" />
 </td>
 </tr>
 <tr valign="top">
-<th width="33%" scope="row"><?php _e('Login name:') ?></th>
+<th scope="row"><?php _e('Login Name') ?></th>
 <td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Password:') ?></th>
+<th scope="row"><?php _e('Password') ?></th>
 <td>
 <input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" size="40" />
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Default mail category:') ?></th>
+<th scope="row"><?php _e('Default Mail Category') ?></th>
 <td><select name="default_email_category" id="default_email_category">
 <?php
 //Alreay have $categories from default_category