diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index f06391ba60..db1d360303 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -15,54 +15,43 @@ include('admin-header.php');
 <tr valign="top">
 <th scope="row"><?php _e('Default article settings') ?></th>
 <td>
-<ul>
-<li>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
 <?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label>
-</li>
-<li>
+<br />
 <label for="default_ping_status">
 <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
 <?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label>
-</li>
-<li>
+<br />
 <label for="default_comment_status">
 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
 <?php _e('Allow people to post comments on the article') ?></label>
-</li>
-</ul>
+<br />
 <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">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
 <?php _e('Anyone posts a comment') ?> </label>
-</li>
-<li>
+<br />
 <label for="moderation_notify">
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
 <?php _e('A comment is held for moderation') ?> </label>
-</li>
-</ul>
 </td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Before a comment appears') ?></th>
 <td>
-<ul>
-<li>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
 <?php _e('An administrator must always approve the comment') ?> </label>
-</li>
-<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>
+<br />
+<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>
+<br />
+<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>
 </td>
 </tr>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index ad8b4df87c..e0406058a1 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -91,11 +91,8 @@ foreach ( range(-12, 12, 0.5) as $offset ) {
 <tr>
 <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>
-<tr>
-<th scope="row">&nbsp;</th>
-<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>
+<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong><br />
+<?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('Week Starts On') ?></th>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 447a22c798..b139c1ee35 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -29,26 +29,30 @@ include('admin-header.php');
 </tr>
 
 <tr>
-<td></td>
-<td>
+<th colspan="2">
 <label for="uploads_use_yearmonth_folders">
 <input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1" <?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
 <?php _e('Organize my uploads into month- and year-based folders'); ?>
 </label>
-</td>
+</th>
+</tr>
+</table>
+<table class="niceblue">
+<tr>
+	<th colspan="2"><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
+<label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label>
+</th>
+</tr>
+<tr>
+	<th colspan="2"><label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_option('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
+</th>
 </tr>
 </table>
-
-<p><input name="use_linksupdate" type="checkbox" id="use_linksupdate" value="1" <?php checked('1', get_option('use_linksupdate')); ?> />
-<label for="use_linksupdate"><?php _e('Track Links&#8217; Update Times') ?></label></p>
-<p>
-<label><input type="checkbox" name="hack_file" value="1" <?php checked('1', get_option('hack_file')); ?> /> <?php _e('Use legacy <code>my-hacks.php</code> file support') ?></label>
-</p>
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,upload_url_path" />
-<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
+<input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
 </p>
 </form>
 </div>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 09142636e1..779b8d06da 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -129,19 +129,19 @@ $structures = array(
 <h3><?php _e('Common settings'); ?></h3>
 <table class="niceblue">
 	<tr>
-		<td><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label>
+		<th><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>
 		<td><code><?php echo get_option('home'); ?>/?p=123</code></span></td>
 	</tr>
 	<tr>
-		<td><label><input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Date and name based'); ?></label></td>
+		<th><label><input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Date and name based'); ?></label></th>
 		<td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
 	</tr>
 	<tr>
-		<td><label><input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></td>
+		<th><label><input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
 		<td><code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></td>
 	</tr>
 	<tr>
-		<td>
+		<th>
 			<label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog"
 			<?php if ( !in_array($permalink_structure, $structures) ) { ?>
 			checked="checked"
@@ -149,7 +149,7 @@ $structures = array(
 			 />
 			<?php _e('Custom Structure'); ?>
 			</label>
-		</td>
+		</th>
 		<td>
 			<input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo attribute_escape($permalink_structure); ?>" size="50" />
 		</td>
@@ -173,7 +173,7 @@ $structures = array(
 		<td><input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /></td>
 	</tr>
 </table>
-<input type="submit" name="submit" class="button" value="<?php _e('Save Changes') ?>" />
+<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/Make_a_Directory_Writable">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-writing.php b/wp-admin/options-writing.php
index dc7bdedd38..6ffae2bc06 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -62,20 +62,20 @@ endforeach;
 
 <table class="niceblue">
 <tr valign="top">
-<th scope="row"><?php _e('Thumbnail size:') ?></th>
+<th scope="row"><?php _e('Thumbnail size') ?></th>
 <td>
-<label for="thumbnail_size_w"><?php _e('Width:'); ?></label>
+<label for="thumbnail_size_w"><?php _e('Width'); ?></label>
 <input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" size="6" />
-<label for="thumbnail_size_h"><?php _e('Height:'); ?></label>
+<label for="thumbnail_size_h"><?php _e('Height'); ?></label>
 <input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" />
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Medium size:') ?></th>
+<th scope="row"><?php _e('Medium size') ?></th>
 <td>
-<label for="medium_size_w"><?php _e('Width:'); ?></label>
+<label for="medium_size_w"><?php _e('Width'); ?></label>
 <input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" size="6" />
-<label for="medium_size_h"><?php _e('Height:'); ?></label>
+<label for="medium_size_h"><?php _e('Height'); ?></label>
 <input name="medium_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('medium_size_h'); ?>" size="6" />
 </td>
 </tr>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index f2d2476dc4..d6e4f1d994 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -926,6 +926,7 @@ html, body {
 	margin-bottom: 9px;
 	padding: 10px;
 	border-bottom: 8px solid #fff;
+	line-height: 20px;
 }
 
 .niceblue th {