Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php	(revision 17488)
+++ wp-admin/network.php	(working copy)
@@ -211,16 +211,16 @@
 		<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
 		<p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
 		<?php // @todo: Link to an MS readme? ?>
-		<table class="form-table">
-			<tr>
-				<th><label><input type='radio' name='subdomain_install' value='1'<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
-				<td><?php printf( _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ), $hostname ); ?></td>
-			</tr>
-			<tr>
-				<th><label><input type='radio' name='subdomain_install' value='0'<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
-				<td><?php printf( _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ), $hostname ); ?></td>
-			</tr>
-		</table>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><label><input type='radio' name='subdomain_install' value='1'<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></div>
+				<div class="form-input"><?php printf( _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ), $hostname ); ?></div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label><input type='radio' name='subdomain_install' value='0'<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></div>
+				<div class="form-input"><?php printf( _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ), $hostname ); ?></div>
+			</div>
+		</div>
 
 <?php
 	endif;
@@ -230,69 +230,69 @@
 		?>
 		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
 		<p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></h3>
-		<table class="form-table">
-			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
-				<td>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Server Address' ); ?></div>
+				<div class="form-input">
 					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</div>
+		</div>
 		<?php endif; ?>
 
 		<h3><?php esc_html_e( 'Network Details' ); ?></h3>
-		<table class="form-table">
+		<div class="form-fields">
 		<?php if ( 'localhost' == $hostname ) : ?>
-			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
-				<td><?php
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Sub-directory Install' ); ?></div>
+				<div class="form-input"><?php
 					_e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
 					// Uh oh:
 					if ( !allow_subdirectory_install() )
 						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
-			</tr>
+				?></div>
+			</div>
 		<?php elseif ( !allow_subdomain_install() ) : ?>
-			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
-				<td><?php
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Sub-directory Install' ); ?></div>
+				<div class="form-input"><?php
 					_e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
 					// Uh oh:
 					if ( !allow_subdirectory_install() )
 						echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
-			</tr>
+				?></div>
+			</div>
 		<?php elseif ( !allow_subdirectory_install() ) : ?>
-			<tr>
-				<th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
-				<td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Sub-domain Install' ); ?></div>
+				<div class="form-input"><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
 					echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
-			</tr>
+				?></div>
+			</div>
 		<?php endif; ?>
 		<?php if ( ! $is_www ) : ?>
-			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Server Address' ); ?></div>
+				<div class="form-input">
 					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
-				</td>
-			</tr>
+				</div>
+			</div>
 		<?php endif; ?>
-			<tr>
-				<th scope='row'><?php esc_html_e( 'Network Title' ); ?></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Network Title' ); ?></div>
+				<div class="form-input">
 					<input name='sitename' type='text' size='45' value='<?php echo esc_attr( $site_name ); ?>' />
 					<br /><?php _e( 'What would you like to call your network?' ); ?>
-				</td>
-			</tr>
-			<tr>
-				<th scope='row'><?php esc_html_e( 'Admin E-mail Address' ); ?></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><?php esc_html_e( 'Admin E-mail Address' ); ?></div>
+				<div class="form-input">
 					<input name='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' />
 					<br /><?php _e( 'Your email address.' ); ?>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</div>
+		</div>
 		<?php submit_button( __( 'Install' ), 'primary', 'submit' ); ?>
 	</form>
 	<?php
Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 17488)
+++ wp-admin/options-privacy.php	(working copy)
@@ -34,19 +34,21 @@
 <form method="post" action="options.php">
 <?php settings_fields('privacy'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Site Visibility') ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Site Visibility') ?> </span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Site Visibility') ?></div>
+<div class="form-input">
+<fieldset><legend class="screen-reader-text"><span><?php _e('Site Visibility') ?> </span></legend>
 <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 site to be visible to everyone, including search engines (like Google, Bing, Technorati) and archivers');?></label><br/>
 <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
 <label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label>
 <?php do_action('blog_privacy_selector'); ?>
-</fieldset></td>
-</tr>
+</fieldset>
+</div>
+</div>
 <?php do_settings_fields('privacy', 'default'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('privacy'); ?>
 
Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php	(revision 17488)
+++ wp-admin/includes/file.php	(working copy)
@@ -1021,37 +1021,37 @@
 	}
 	_e('If you do not remember your credentials, you should contact your web host.');
 ?></p>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
-<td><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> size="40" /></td>
-</tr>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><label for="hostname"><?php _e('Hostname') ?></label></div>
+<div class="form-input"><input name="hostname" type="text" id="hostname" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> size="40" /></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="username"><?php echo $label_user; ?></label></th>
-<td><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><label for="username"><?php echo $label_user; ?></label></div>
+<div class="form-input"><input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> size="40" /></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="password"><?php echo $label_pass; ?></label></th>
-<td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><label for="password"><?php echo $label_pass; ?></label></div>
+<div class="form-input"><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> size="40" /></div>
+</div>
 
 <?php if ( isset($types['ssh']) ) : ?>
-<tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
-<th scope="row"><?php _e('Authentication Keys') ?>
+<div class="form-row" id="ssh_keys" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">
+<div class="form-label"><?php _e('Authentication Keys') ?>
 <div class="key-labels textright">
 <label for="public_key"><?php _e('Public Key:') ?></label ><br />
 <label for="private_key"><?php _e('Private Key:') ?></label>
-</div></th>
-<td><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> size="40" />
-<div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></td>
-</tr>
+</div></div>
+<div class="form-input"><br /><input name="public_key" type="text" id="public_key" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> size="40" /><br /><input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> size="40" />
+<div><?php _e('Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above.') ?></div></div>
+</div>
 <?php endif; ?>
 
-<tr valign="top">
-<th scope="row"><?php _e('Connection Type') ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e('Connection Type') ?></div>
+<div class="form-input">
 <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
 <?php
 	$disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
@@ -1062,9 +1062,9 @@
 	</label>
 	<?php endforeach; ?>
 </fieldset>
-</td>
-</tr>
-</table>
+</div>
+</div>
+</div>
 
 <?php
 foreach ( (array) $extra_fields as $field ) {
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 17488)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -760,18 +760,18 @@
 	</tr>
 	<tr>
 		<td colspan="2">
-			<table cellpadding="3" cellspacing="5" class="form-table">
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </span></legend>
+			<div class="form-fields">
+				<div class="form-row">
+					<div class="form-label"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?> </span></legend>
 						<label for="me">
 						<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
 						<?php _e('another web address of mine') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+ 					<div class="form-label"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?> </span></legend>
 						<label for="contact">
 						<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?></label>
 						<label for="acquaintance">
@@ -780,30 +780,30 @@
 						<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?></label>
 						<label for="friendship">
 						<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> /> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+ 					<div class="form-label"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </span></legend>
 						<label for="met">
 						<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+ 					<div class="form-label"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </span></legend>
 						<label for="co-worker">
 						<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?></label>
 						<label for="colleague">
 						<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+ 					<div class="form-label"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
 						<label for="co-resident">
 						<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?></label>
@@ -813,11 +813,11 @@
 						<label for="geographical">
 						<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+ 					<div class="form-label"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
 						<label for="child">
 						<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?>  />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?></label>
@@ -836,11 +836,11 @@
 						<label for="family">
 						<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?></label>
-					</fieldset></td>
-				</tr>
-				<tr>
-					<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </th>
-					<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
+					</fieldset></div>
+				</div>
+				<div class="form-row">
+					<div class="form-label"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </div>
+					<div class="form-input"><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
 						<label for="muse">
 						<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?></label>
@@ -853,9 +853,9 @@
 						<label for="romantic">
 						<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
 						<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?></label>
-					</fieldset></td>
-				</tr>
-			</table>
+					</fieldset></div>
+				</div>
+			</div>
 		</td>
 	</tr>
 </table>
@@ -873,22 +873,22 @@
  */
 function link_advanced_meta_box($link) {
 ?>
-<table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5">
-	<tr class="form-field">
-		<th valign="top"  scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-		<td><input type="text" name="link_image" class="code" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" style="width: 95%" /></td>
-	</tr>
-	<tr class="form-field">
-		<th valign="top"  scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-		<td><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo  ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></td>
-	</tr>
-	<tr class="form-field">
-		<th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-		<td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
-	</tr>
-	<tr class="form-field">
-		<th valign="top"  scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
-		<td><select name="link_rating" id="link_rating" size="1">
+<div class="form-fields">
+	<div class="form-row form-field">
+		<div class="form-label"><label for="link_image"><?php _e('Image Address') ?></label></div>
+		<div class="form-input"><input type="text" name="link_image" class="code" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" style="width: 95%" /></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="rss_uri"><?php _e('RSS Address') ?></label></div>
+		<div class="form-input"><input name="link_rss" class="code" type="text" id="rss_uri" value="<?php echo  ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" size="50" style="width: 95%" /></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="link_notes"><?php _e('Notes') ?></label></div>
+		<div class="form-input"><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="link_rating"><?php _e('Rating') ?></label></div>
+		<div class="form-input"><select name="link_rating" id="link_rating" size="1">
 		<?php
 			for ($r = 0; $r <= 10; $r++) {
 				echo('            <option value="'. esc_attr($r) .'" ');
@@ -897,9 +897,9 @@
 				echo('>'.$r.'</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
-		</td>
-	</tr>
-</table>
+		</div>
+	</div>
+</div>
 <?php
 }
 
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 17488)
+++ wp-admin/includes/template.php	(working copy)
@@ -622,9 +622,11 @@
 	$minute = '<input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" />';
 
 	echo '<div class="timestamp-wrap">';
+	echo '<input type="radio" name="publish_when[]" value="immediately" id="immediately" checked="checked" /> <label for="immediately">' . __( 'Immediately' ) . '</label><br />';
+	echo '<input type="radio" name="publish_when[]" value="future" id="future" /> <label for="future">';
 	/* translators: 1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input */
 	printf(__('%1$s%2$s, %3$s @ %4$s : %5$s'), $month, $day, $year, $hour, $minute);
-
+	echo '</label>';
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
 	if ( $multi ) return;
@@ -1160,9 +1162,9 @@
 		call_user_func($section['callback'], $section);
 		if ( !isset($wp_settings_fields) || !isset($wp_settings_fields[$page]) || !isset($wp_settings_fields[$page][$section['id']]) )
 			continue;
-		echo '<table class="form-table">';
+		echo '<div class="form-fields">';
 		do_settings_fields($page, $section['id']);
-		echo '</table>';
+		echo '</div>';
 	}
 }
 
@@ -1187,15 +1189,15 @@
 		return;
 
 	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
-		echo '<tr valign="top">';
+		echo '<div class="field-row">';
 		if ( !empty($field['args']['label_for']) )
-			echo '<th scope="row"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></th>';
+			echo '<div class="form-label"><label for="' . $field['args']['label_for'] . '">' . $field['title'] . '</label></div>';
 		else
-			echo '<th scope="row">' . $field['title'] . '</th>';
-		echo '<td>';
+			echo '<div class="form-label">' . $field['title'] . '</div>';
+		echo '<div class="field-input">';
 		call_user_func($field['callback'], $field['args']);
-		echo '</td>';
-		echo '</tr>';
+		echo '</div>';
+		echo '</div>';
 	}
 }
 
Index: wp-admin/includes/ms.php
===================================================================
--- wp-admin/includes/ms.php	(revision 17488)
+++ wp-admin/includes/ms.php	(working copy)
@@ -612,48 +612,48 @@
 
 function choose_primary_blog() {
 	?>
-	<table class="form-table">
-	<tr>
-	<?php /* translators: My sites label */ ?>
-		<th scope="row"><?php _e( 'Primary Site' ); ?></th>
-		<td>
-		<?php
-		$all_blogs = get_blogs_of_user( get_current_user_id() );
-		$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
-		if ( count( $all_blogs ) > 1 ) {
-			$found = false;
-			?>
-			<select name="primary_blog">
-				<?php foreach( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
-						$found = true;
-					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog,  $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
-				} ?>
-			</select>
+	<div class="form-fields">
+		<div class="form-row">
+		<?php /* translators: My sites label */ ?>
+			<div class="form-label"><?php _e( 'Primary Site' ); ?></div>
+			<div class="form-input">
 			<?php
-			if ( !$found ) {
+			$all_blogs = get_blogs_of_user( get_current_user_id() );
+			$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
+			if ( count( $all_blogs ) > 1 ) {
+				$found = false;
+				?>
+				<select name="primary_blog">
+					<?php foreach( (array) $all_blogs as $blog ) {
+						if ( $primary_blog == $blog->userblog_id )
+							$found = true;
+						?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog,  $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
+					} ?>
+				</select>
+				<?php
+				if ( !$found ) {
+					$blog = array_shift( $all_blogs );
+					update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+				}
+			} elseif ( count( $all_blogs ) == 1 ) {
 				$blog = array_shift( $all_blogs );
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+				echo $blog->domain;
+				if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
+					update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			} else {
+				echo "N/A";
 			}
-		} elseif ( count( $all_blogs ) == 1 ) {
-			$blog = array_shift( $all_blogs );
-			echo $blog->domain;
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
-		} else {
-			echo "N/A";
-		}
-		?>
-		</td>
-	</tr>
+			?>
+			</div>
+		</div>
 	<?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
-		<tr>
-			<th scope="row" colspan="2" class="th-full">
+		<div class="form-row">
+			<div class="form-input input-full">
 				<a href="<?php echo apply_filters( 'wp_signup_location', network_home_url( 'wp-signup.php' ) ); ?>"><?php _e( 'Create a New Site' ); ?></a>
 			</th>
-		</tr>
+		</div>
 	<?php endif; ?>
-	</table>
+	</div>
 	<?php
 }
 
Index: wp-admin/revision.php
===================================================================
--- wp-admin/revision.php	(revision 17488)
+++ wp-admin/revision.php	(working copy)
@@ -153,16 +153,14 @@
 
 <h2 class="long-header"><?php echo $h2; ?></h2>
 
-<table class="form-table ie-fixed">
-	<col class="th" />
+<div class="form-fields">
 <?php if ( 'diff' == $action ) : ?>
-<tr id="revision">
-	<th scope="row"></th>
-	<th scope="col" class="th-full">
+<div class="form-row" id="revision">
+	<div class="form-input input-full">
 		<span class="alignleft"><?php printf( __('Older: %s'), wp_post_revision_title( $left_revision ) ); ?></span>
 		<span class="alignright"><?php printf( __('Newer: %s'), wp_post_revision_title( $right_revision ) ); ?></span>
-	</th>
-</tr>
+	</div>
+</div>
 <?php endif;
 
 // use get_post_to_edit filters?
@@ -180,10 +178,10 @@
 	}
 	?>
 
-	<tr id="revision-field-<?php echo $field; ?>">
-		<th scope="row"><?php echo esc_html( $field_title ); ?></th>
-		<td><div class="pre"><?php echo $content; ?></div></td>
-	</tr>
+	<div class="form-row" id="revision-field-<?php echo $field; ?>">
+		<div class="form-label"><?php echo esc_html( $field_title ); ?></div>
+		<div class="form-input"><div class="pre"><?php echo $content; ?></div></div>
+	</div>
 
 	<?php
 
@@ -193,7 +191,7 @@
 
 	?>
 
-	<tr><td colspan="2"><div class="updated"><p><?php _e( 'These revisions are identical.' ); ?></p></div></td></tr>
+	<div class="form-row"><div class="form-input"><div class="updated"><p><?php _e( 'These revisions are identical.' ); ?></p></div></div></div>
 
 	<?php
 
@@ -201,10 +199,8 @@
 
 ?>
 
-</table>
+</div>
 
-<br class="clear" />
-
 <h3><?php echo $title; ?></h3>
 
 <?php
Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 17488)
+++ wp-admin/custom-header.php	(working copy)
@@ -432,13 +432,10 @@
 <?php } ?>
 
 <h3><?php _e( 'Header Image' ) ?></h3>
-<table class="form-table">
-<tbody>
-
-
-<tr valign="top">
-<th scope="row"><?php _e( 'Preview' ); ?></th>
-<td >
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e( 'Preview' ); ?></div>
+<div class="form-input">
 	<?php if ( $this->admin_image_div_callback ) {
 	  call_user_func( $this->admin_image_div_callback );
 	} else {
@@ -454,12 +451,12 @@
 		<div id="desc"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
 	</div>
 	<?php } ?>
-</td>
-</tr>
+</div>
+</div>
 <?php if ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Upload Image' ); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Upload Image' ); ?></div>
+<div class="form-input">
 	<p><?php _e( 'You can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.' ); ?><br />
 	<?php printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); ?></p>
 	<form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
@@ -471,19 +468,17 @@
 		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
 	</p>
 	</form>
-</td>
-</tr>
+</div>
+</div>
 <?php endif; ?>
-</tbody>
-</table>
+</div>
 
 <form method="post" action="<?php echo esc_attr( add_query_arg( 'step', 1 ) ) ?>">
-<table class="form-table">
-<tbody>
+<div class="form-fields">
 	<?php if ( ! empty( $this->default_headers ) ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Default Images' ); ?></div>
+<div class="form-input">
 <?php if ( current_theme_supports( 'custom-header-uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers.' ) ?></p>
 <?php else: ?>
@@ -492,71 +487,65 @@
 	<?php
 		$this->show_default_header_selector();
 	?>
-</td>
-</tr>
+</div>
+</div>
 	<?php endif;
 
 	if ( get_header_image() ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Remove Image' ); ?></div>
+<div class="form-input">
 	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
 	<?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
-</td>
-</tr>
+</div>
+</div>
 	<?php endif;
 
 	if ( defined( 'HEADER_IMAGE' ) ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Reset Image' ); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Reset Image' ); ?></div>
+<div class="form-input">
 	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
 	<?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
-</td>
-</tr>
+</div>
+</div>
 	<?php endif; ?>
-</tbody>
-</table>
+</div>
 
 	<?php if ( $this->header_text() ) : ?>
 <h3><?php _e( 'Header Text' ) ?></h3>
-<table class="form-table">
-<tbody>
-<tr valign="top" class="hide-if-no-js">
-<th scope="row"><?php _e( 'Display Text' ); ?></th>
-<td>
+<div class="form-fields">
+<div class="form-row" class="hide-if-no-js">
+<div class="form-label"><?php _e( 'Display Text' ); ?></div>
+<div class="form-input">
 	<p>
 	<?php $hidetext = get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ); ?>
 	<label><input type="radio" value="1" name="hidetext" id="hidetext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) )  ? true : false ); ?> /> <?php _e( 'No' ); ?></label>
 	<label><input type="radio" value="0" name="hidetext" id="showtext"<?php checked( ( 'blank' == $hidetext || empty( $hidetext ) ) ? false : true ); ?> /> <?php _e( 'Yes' ); ?></label>
 	</p>
-</td>
-</tr>
-
-<tr valign="top" id="text-color-row">
-<th scope="row"><?php _e( 'Text Color' ); ?></th>
-<td>
+</div>
+</div>
+<div class="form-row" id="text-color-row">
+<div class="form-label"><?php _e( 'Text Color' ); ?></div>
+<div class="form-input">
 	<p>
 		<input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) ); ?>" />
 		<span class="description hide-if-js"><?php _e( 'If you want to hide header text, add <strong>#blank</strong> as text color.' );?></span>
 		<input type="button" class="button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color' ); ?>" id="pickcolor" />
 	</p>
 	<div id="color-picker" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
-</td>
-</tr>
-
+</div>
+</div>
 	<?php if ( defined('HEADER_TEXTCOLOR') && get_theme_mod('header_textcolor') ) { ?>
-<tr valign="top">
-<th scope="row"><?php _e('Reset Text Color'); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e('Reset Text Color'); ?></div>
+<div class="form-input">
 	<p><?php _e( 'This will restore the original header text. You will not be able to restore any customizations.' ) ?></p>
 	<?php submit_button( __( 'Restore Original Header Text' ), 'button', 'resettext', false ); ?>
-</td>
-</tr>
+</div>
+</div>
 	<?php } ?>
-
-</tbody>
-</table>
+</div>
 	<?php endif;
 
 do_action( 'custom_header_options' );
Index: wp-admin/comment.php
===================================================================
--- wp-admin/comment.php	(revision 17488)
+++ wp-admin/comment.php	(working copy)
@@ -150,28 +150,28 @@
 ?>
 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
 
-<table class="form-table comment-ays">
-<tr class="alt">
-<th scope="row"><?php _e('Author'); ?></th>
-<td><?php echo $comment->comment_author; ?></td>
-</tr>
+<div class="form-fields comment-ays">
+<div class="form-row alt">
+<div class="form-label"><?php _e('Author'); ?></div>
+<div class="form-field"><?php echo $comment->comment_author; ?></div>
+</div>
 <?php if ( $comment->comment_author_email ) { ?>
-<tr>
-<th scope="row"><?php _e('E-mail'); ?></th>
-<td><?php echo $comment->comment_author_email; ?></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><?php _e('E-mail'); ?></div>
+<div class="form-field"><?php echo $comment->comment_author_email; ?></div>
+</div>
 <?php } ?>
 <?php if ( $comment->comment_author_url ) { ?>
-<tr>
-<th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
-</tr>
+<div class="form-field">
+<div class="form-label"><?php _e('URL'); ?></div>
+<div class="form-field"><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></div>
+</div>
 <?php } ?>
-<tr>
-<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td><?php echo $comment->comment_content; ?></td>
-</tr>
-</table>
+<div class="form-row">
+<div class="form-label"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></div>
+<div class="form-field"><?php echo $comment->comment_content; ?></div>
+</div>
+</div>
 
 <p><?php _e('Are you sure you want to do this?'); ?></p>
 
Index: wp-admin/user-new.php
===================================================================
--- wp-admin/user-new.php	(revision 17488)
+++ wp-admin/user-new.php	(working copy)
@@ -236,25 +236,25 @@
 <input name="action" type="hidden" value="adduser" />
 <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 
-<table class="form-table">
-	<tr class="form-field form-required">
-		<th scope="row"><label for="adduser-email"><?php echo $label; ?></label></th>
-		<td><input name="email" type="text" id="adduser-email" value="" /></td>
-	</tr>
-	<tr class="form-field">
-		<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
-		<td><select name="role" id="adduser-role">
+<div class="form-fields">
+	<div class="form-row form-field form-required">
+		<div class="form-label"><label for="adduser-email"><?php echo $label; ?></label></div>
+		<div class="form-input"><input name="email" type="text" id="adduser-email" value="" /></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="adduser-role"><?php _e('Role'); ?></label></div>
+		<div class="form-input"><select name="role" id="adduser-role">
 			<?php wp_dropdown_roles( get_option('default_role') ); ?>
 			</select>
-		</td>
-	</tr>
+		</div>
+	</div>
 <?php if ( is_super_admin() ) { ?>
-	<tr>
-		<th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
-	</tr>
+	<div class="form-row">
+		<div class="form-label"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></div>
+		<div class="form-input"><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></div>
+	</div>
 <?php } ?>
-</table>
+</div>
 <?php submit_button( __( 'Add Existing User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
 </form>
 <?php
@@ -282,63 +282,63 @@
 }
 
 ?>
-<table class="form-table">
-	<tr class="form-field form-required">
-		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></td>
-	</tr>
-	<tr class="form-field form-required">
-		<th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
-	</tr>
+<div class="form-fields">
+	<div class="form-row form-field form-required">
+		<div class="form-label"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></div>
+		<div class="form-input"><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" /></div>
+	</div>
+	<div class="form-row form-field form-required">
+		<div class="form-label"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></div>
+		<div class="form-input"><input name="email" type="text" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></div>
+	</div>
 <?php if ( !is_multisite() ) { ?>
-	<tr class="form-field">
-		<th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
-		<td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr($new_user_firstname); ?>" /></td>
-	</tr>
-	<tr class="form-field">
-		<th scope="row"><label for="last_name"><?php _e('Last Name') ?> </label></th>
-		<td><input name="last_name" type="text" id="last_name" value="<?php echo esc_attr($new_user_lastname); ?>" /></td>
-	</tr>
-	<tr class="form-field">
-		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
-		<td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
-	</tr>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="first_name"><?php _e('First Name') ?> </label></div>
+		<div class="form-input"><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr($new_user_firstname); ?>" /></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="last_name"><?php _e('Last Name') ?> </label></div>
+		<div class="form-input"><input name="last_name" type="text" id="last_name" value="<?php echo esc_attr($new_user_lastname); ?>" /></div>
+	</div>
+	<div class="form-row form-field">
+		<div class="form-label"><label for="url"><?php _e('Website') ?></label></div>
+		<div class="form-input"><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></div>
+	</div>
 <?php if ( apply_filters('show_password_fields', true) ) : ?>
-	<tr class="form-field form-required">
-		<th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
-		<td><input name="pass1" type="password" id="pass1" autocomplete="off" />
+	<div class="form-row form-field form-required">
+		<div class="form-label"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></div>
+		<div class="form-input"><input name="pass1" type="password" id="pass1" autocomplete="off" />
 		<br />
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		<br />
 		<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
 		<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
-		</td>
-	</tr>
-	<tr>
-		<th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th>
-		<td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked( $new_user_send_password ); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></td>
-	</tr>
+		</div>
+	</div>
+	<div class="form-row">
+		<div class="form-label"><label for="send_password"><?php _e('Send Password?') ?></label></div>
+		<div class="form-input"><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked( $new_user_send_password ); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></div>
+	</div>
 <?php endif; ?>
 <?php } // !is_multisite ?>
-	<tr class="form-field">
-		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
-		<td><select name="role" id="role">
+	<div class="form-row form-field">
+		<div class="form-label"><label for="role"><?php _e('Role'); ?></label></div>
+		<div class="form-input"><select name="role" id="role">
 			<?php
 			if ( !$new_user_role )
 				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>
-		</td>
-	</tr>
+		</div>
+	</div>
 	<?php if ( is_multisite() && is_super_admin() ) { ?>
-	<tr>
-		<th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1"  <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
-	</tr>
+	<div class="form-row">
+		<div class="form-label"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></div>
+		<div class="form-input"><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1"  <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></div>
+	</div>
 	<?php } ?>
-</table>
+</div>
 
 <?php submit_button( __( 'Add New User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
 
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 17488)
+++ wp-admin/options-general.php	(working copy)
@@ -80,48 +80,48 @@
 <form method="post" action="options.php">
 <?php settings_fields('general'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription"  value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
-</tr>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><label for="blogname"><?php _e('Site Title') ?></label></div>
+<div class="form-input"><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="blogdescription"><?php _e('Tagline') ?></label></div>
+<div class="form-input"><input name="blogdescription" type="text" id="blogdescription"  value="<?php form_option('blogdescription'); ?>" class="regular-text" />
+<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></div>
+</div>
 <?php if ( !is_multisite() ) { ?>
-<tr valign="top">
-<th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="home"><?php _e('Site address (URL)') ?></label></th>
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
-<td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
-<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Membership') ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><label for="users_can_register">
+<div class="form-row">
+<div class="form-label"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></div>
+<div class="form-input"><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="home"><?php _e('Site address (URL)') ?></label></div>
+<div class="form-input"><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="admin_email"><?php _e('E-mail address') ?> </label></div>
+<div class="form-input"><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text" />
+<span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Membership') ?></div>
+<div class="form-input"> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><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>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
-<td>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="default_role"><?php _e('New User Default Role') ?></label></div>
+<div class="form-input">
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
-</td>
-</tr>
+</div>
+</div>
 <?php } else { ?>
-<tr valign="top">
-<th scope="row"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></th>
-<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
+<div class="form-row">
+<div class="form-label"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></div>
+<div class="form-input"><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
 <span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
@@ -130,15 +130,15 @@
 <p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
 </div>
 <?php endif; ?>
-</td>
-</tr>
+</div>
+</div>
 <?php } ?>
-<tr>
+<div class="form-row">
 <?php
 if ( !wp_timezone_supported() ) : // no magic timezone support here
 ?>
-<th scope="row"><label for="gmt_offset"><?php _e('Timezone') ?> </label></th>
-<td>
+<div class="form-label"><label for="gmt_offset"><?php _e('Timezone') ?> </label></div>
+<div class="form-input">
 <select name="gmt_offset" id="gmt_offset">
 <?php
 $current_offset = get_option('gmt_offset');
@@ -170,7 +170,7 @@
 <?php endif; ?>
 <br />
 <span class="description"><?php _e('Unfortunately, you have to manually update this for daylight saving time. The PHP Date/Time library is not supported by your web host.'); ?></span>
-</td>
+</div>
 <?php
 else: // looks like we can do nice timezone selection!
 $current_offset = get_option('gmt_offset');
@@ -193,8 +193,8 @@
 }
 
 ?>
-<th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
-<td>
+<div class="form-label"><label for="timezone_string"><?php _e('Timezone') ?></label></div>
+<div class="form-input">
 
 <select id="timezone_string" name="timezone_string">
 <?php echo wp_timezone_choice($tzstring); ?>
@@ -248,13 +248,13 @@
 	?>
 	</span>
 <?php endif; ?>
-</td>
+</div>
 
 <?php endif; ?>
-</tr>
-<tr>
-<th scope="row"><?php _e('Date Format') ?></th>
-<td>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Date Format') ?></div>
+<div class="form-input">
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 
@@ -283,11 +283,11 @@
 	echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
 ?>
 	</fieldset>
-</td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Time Format') ?></th>
-<td>
+</div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Time Format') ?></div>
+<div class="form-input">
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 
@@ -314,36 +314,36 @@
 	;
 ?>
 	</fieldset>
-</td>
-</tr>
-<tr>
-<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
-<td><select name="start_of_week" id="start_of_week">
+</div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="start_of_week"><?php _e('Week Starts On') ?></label></div>
+<div class="form-input"><select name="start_of_week" id="start_of_week">
 <?php
 for ($day_index = 0; $day_index <= 6; $day_index++) :
 	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
 	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
 endfor;
 ?>
-</select></td>
-</tr>
+</select></div>
+</div>
 <?php do_settings_fields('general', 'default'); ?>
 <?php
 	$languages = get_available_languages();
 	if ( is_multisite() && !empty( $languages ) ):
 ?>
-	<tr valign="top">
-		<th width="33%" scope="row"><?php _e('Site language:') ?></th>
-		<td>
+	<div class="form-row">
+		<div class="form-label"><?php _e('Site language:') ?></div>
+		<div class="form-input">
 			<select name="WPLANG" id="WPLANG">
 				<?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
 			</select>
-		</td>
-	</tr>
+		</div>
+	</div>
 <?php
 	endif;
 ?>
-</table>
+</div>
 
 <?php do_settings_sections('general'); ?>
 
Index: wp-admin/options-media.php
===================================================================
--- wp-admin/options-media.php	(revision 17488)
+++ wp-admin/options-media.php	(working copy)
@@ -39,95 +39,95 @@
 <h3><?php _e('Image sizes') ?></h3>
 <p><?php _e('The sizes listed below determine the maximum dimensions in pixels to use when inserting an image into the body of a post.'); ?></p>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Thumbnail size') ?></th>
-<td>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Thumbnail size') ?></div>
+<div class="form-input">
 <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'); ?>" class="small-text" />
 <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'); ?>" class="small-text" /><br />
 <input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
 <label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label>
-</td>
-</tr>
+</div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Medium size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Medium size'); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e('Medium size') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Medium size'); ?></span></legend>
 <label for="medium_size_w"><?php _e('Max Width'); ?></label>
 <input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" class="small-text" />
 <label for="medium_size_h"><?php _e('Max Height'); ?></label>
 <input name="medium_size_h" type="text" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" class="small-text" />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Large size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Large size'); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e('Large size') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Large size'); ?></span></legend>
 <label for="large_size_w"><?php _e('Max Width'); ?></label>
 <input name="large_size_w" type="text" id="large_size_w" value="<?php form_option('large_size_w'); ?>" class="small-text" />
 <label for="large_size_h"><?php _e('Max Height'); ?></label>
 <input name="large_size_h" type="text" id="large_size_h" value="<?php form_option('large_size_h'); ?>" class="small-text" />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
 <?php do_settings_fields('media', 'default'); ?>
-</table>
+</div>
 
 <h3><?php _e('Embeds') ?></h3>
 
-<table class="form-table">
+<div class="form-fields">
 
-<tr valign="top">
-<th scope="row"><?php _e('Auto-embeds'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e('Auto-embeds'); ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></span></legend>
 <label for="embed_autourls"><input name="embed_autourls" type="checkbox" id="embed_autourls" value="1" <?php checked( '1', get_option('embed_autourls') ); ?>/> <?php _e('When possible, embed the media content from a URL directly onto the page. For example: links to Flickr and YouTube.'); ?></label>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e('Maximum embed size') ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e('Maximum embed size') ?></div>
+<div class="form-input">
 <label for="embed_size_w"><?php _e('Width'); ?></label>
 <input name="embed_size_w" type="text" id="embed_size_w" value="<?php form_option('embed_size_w'); ?>" class="small-text" />
 <label for="embed_size_h"><?php _e('Height'); ?></label>
 <input name="embed_size_h" type="text" id="embed_size_h" value="<?php form_option('embed_size_h'); ?>" class="small-text" />
 <?php if ( !empty($content_width) ) echo '<br />' . __("If the width value is left blank, embeds will default to the max width of your theme."); ?>
-</td>
-</tr>
+</div>
+</div>
 
 <?php do_settings_fields('media', 'embeds'); ?>
-</table>
+</div>
 
 <?php if ( !is_multisite() ) : ?>
 <h3><?php _e('Uploading Files'); ?></h3>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
-<td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></div>
+<div class="form-input"><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
 <span class="description"><?php _e('Default is <code>wp-content/uploads</code>'); ?></span>
-</td>
-</tr>
+</div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
+<div class="form-row">
+<div class="form-label"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></div>
+<div class="form-input"><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
 <span class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></span>
-</td>
-</tr>
+</div>
+</div>
 
-<tr>
-<th scope="row" colspan="2" class="th-full">
+<div class="form-row">
+<div class="form-label label-full">
 <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>
-</th>
-</tr>
+</div>
+</div>
 
 <?php do_settings_fields('media', 'uploads'); ?>
-</table>
+</div>
 <?php endif; ?>
 
 <?php do_settings_sections('media'); ?>
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 17488)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -85,36 +85,34 @@
 <div id="namediv" class="stuffbox">
 <h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
 <div class="inside">
-<table class="form-table editcomment">
-<tbody>
-<tr valign="top">
-	<td class="first"><?php _e( 'Name:' ); ?></td>
-	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
-</tr>
-<tr valign="top">
-	<td class="first">
+<div class="form-fields editcomment">
+<div class="form-row">
+	<div class="form-label first"><?php _e( 'Name:' ); ?></div>
+	<div class="form-input"><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></div>
+</div>
+<div class="form-row">
+	<div class="form-label first">
 	<?php
 		if ( $comment->comment_author_email ) {
 			printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) );
 		} else {
 			_e( 'E-mail:' );
 		}
-?></td>
-	<td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
-</tr>
-<tr valign="top">
-	<td class="first">
+?></div>
+	<div class="form-input"><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></div>
+</div>
+<div class="form-row">
+	<div class="form-label first">
 	<?php
 		if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
 			$link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
 			printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
 		} else {
 			_e( 'URL:' );
-		} ?></td>
-	<td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" tabindex="3" /></td>
-</tr>
-</tbody>
-</table>
+		} ?></div>
+	<div class="form-input"><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" tabindex="3" /></div>
+</div>
+</div>
 <br />
 </div>
 </div>
Index: wp-admin/edit-tag-form.php
===================================================================
--- wp-admin/edit-tag-form.php	(revision 17488)
+++ wp-admin/edit-tag-form.php	(working copy)
@@ -35,35 +35,35 @@
 <input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag->term_id) ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>" />
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?>
-	<table class="form-table">
-		<tr class="form-field form-required">
-			<th scope="row" valign="top"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
-			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
-		</tr>
+	<div class="form-fields">
+		<div class="form-field form-required">
+			<div class="form-label"><label for="name"><?php _ex('Name', 'Taxonomy Name'); ?></label></div>
+			<div class="form-input"><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></div>
+		</div>
 <?php if ( !global_terms_enabled() ) { ?>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></th>
-			<td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
-			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
-		</tr>
+		<div class="form-field">
+			<div class="form-label"><label for="slug"><?php _ex('Slug', 'Taxonomy Slug'); ?></label></div>
+			<div class="form-input"><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
+			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></div>
+		</div>
 <?php } ?>
 <?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></th>
-			<td>
+		<div class="form-field">
+			<div class="form-label"><label for="parent"><?php _ex('Parent', 'Taxonomy Parent'); ?></label></div>
+			<div class="form-input">
 				<?php wp_dropdown_categories(array('hide_empty' => 0, 'hide_if_empty' => false, 'name' => 'parent', 'orderby' => 'name', 'taxonomy' => $taxonomy, 'selected' => $tag->parent, 'exclude_tree' => $tag->term_id, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
 				<?php if ( 'category' == $taxonomy ) : ?>
 				<span class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></span>
 				<?php endif; ?>
-			</td>
-		</tr>
+			</div>
+		</div>
 <?php endif; // is_taxonomy_hierarchical() ?>
-		<tr class="form-field">
-			<th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
-			<td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
-			<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
-		</tr>
+		<div class="form-field">
+			<div class="form-label"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></div>
+			<div class="form-input"><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $tag->description; // textarea_escaped ?></textarea><br />
+			<span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></div>
+		</div>
 		<?php
 		// Back compat hooks
 		if ( 'category' == $taxonomy )
@@ -75,7 +75,7 @@
 
 		do_action($taxonomy . '_edit_form_fields', $tag, $taxonomy);
 		?>
-	</table>
+	</div>
 <?php
 // Back compat hooks
 if ( 'category' == $taxonomy )
Index: wp-admin/network/site-new.php
===================================================================
--- wp-admin/network/site-new.php	(revision 17488)
+++ wp-admin/network/site-new.php	(working copy)
@@ -112,10 +112,10 @@
 } ?>
 <form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>">
 <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
-	<table class="form-table">
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address' ) ?></th>
-			<td>
+	<div class="form-fields">
+		<div class="form-row form-field form-required">
+			<div class="form-input"><?php _e( 'Site Address' ) ?></div>
+			<div class="form-input">
 			<?php if ( is_subdomain_install() ) { ?>
 				<input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
 			<?php } else {
@@ -123,20 +123,20 @@
 			<?php }
 			echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
 			?>
-			</td>
-		</tr>
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Title' ) ?></th>
-			<td><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></td>
-		</tr>
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Admin Email' ) ?></th>
-			<td><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></td>
-		</tr>
-		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
-		</tr>
-	</table>
+			</div>
+		</div>
+		<div class="form-row form-field form-required">
+			<div class="form-input"><?php _e( 'Site Title' ) ?></div>
+			<div class="form-input"><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></div>
+		</div>
+		<div class="form-row form-field form-required">
+			<div class="form-input"><?php _e( 'Admin Email' ) ?></div>
+			<div class="form-input"><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></div>
+		</div>
+		<div class="form-row form-field">
+			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></div>
+		</div>
+	</div>
 	<?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
 	</form>
 </div>
Index: wp-admin/network/site-info.php
===================================================================
--- wp-admin/network/site-info.php	(revision 17488)
+++ wp-admin/network/site-info.php	(working copy)
@@ -111,34 +111,34 @@
 <form method="post" action="site-info.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Domain' ) ?></th>
+	<dev class="form-fields">
+		<div class="form-input form-field form-required">
+			<div class="field-label"><?php _e( 'Domain' ) ?></div>
 			<?php
 			$protocol = is_ssl() ? 'https://' : 'http://';
 			if ( $is_main_site ) { ?>
-			<td><code><?php echo $protocol; echo esc_attr( $details->domain ) ?></code></td>
+			<div class="field-input"><code><?php echo $protocol; echo esc_attr( $details->domain ) ?></code></div>
 			<?php } else { ?>
-			<td><?php echo $protocol; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33" /></td>
+			<div class="field-input"><?php echo $protocol; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33" /></div>
 			<?php } ?>
-		</tr>
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Path' ) ?></th>
+		</div>
+		<div class="form-input form-field form-required">
+			<div class="field-label"><?php _e( 'Path' ) ?></div>
 			<?php if ( $is_main_site ) { ?>
-			<td><code><?php echo esc_attr( $details->path ) ?></code></td>
+			<div class="field-input"><code><?php echo esc_attr( $details->path ) ?></code></div>
 			<?php } else { ?>
-			<td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style='margin-bottom:5px;' />
-			<br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_blog_option( $id, 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_blog_option( $id, 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
+			<div class="field-input"><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style='margin-bottom:5px;' />
+			<br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_blog_option( $id, 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_blog_option( $id, 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></div>
 			<?php } ?>
-		</tr>
-		<tr class="form-field">
-			<th scope="row"><?php _ex( 'Registered', 'site' ) ?></th>
-			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></td>
-		</tr>
-		<tr class="form-field">
-			<th scope="row"><?php _e( 'Last Updated' ); ?></th>
-			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" size="40" /></td>
-		</tr>
+		</div>
+		<div class="form-input form-field">
+			<div class="field-label"><?php _ex( 'Registered', 'site' ) ?></div>
+			<div class="field-input"><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></div>
+		</div>
+		<div class="form-input form-field">
+			<div class="field-label"><?php _e( 'Last Updated' ); ?></div>
+			<div class="field-input"><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" size="40" /></div>
+		</div>
 		<?php
 		$attribute_fields = array( 'public' => __( 'Public' ) );
 		if ( ! $is_main_site ) {
@@ -148,16 +148,16 @@
 		}
 		$attribute_fields['mature'] = __( 'Mature' );
 		?>
-		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
-			<td>
+		<div class="field-row">
+			<div class="field-label"><?php _e( 'Attributes' ); ?></div>
+			<div class="field-input">
 			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
 				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
-			</td>
-		</tr>
-	</table>
+			</div>
+		</div>
+	</div>
 	<?php submit_button(); ?>
 </form>
 
Index: wp-admin/network/settings.php
===================================================================
--- wp-admin/network/settings.php	(revision 17488)
+++ wp-admin/network/settings.php	(working copy)
@@ -49,35 +49,35 @@
 	<form method="post" action="edit.php?action=siteoptions">
 		<?php wp_nonce_field( 'siteoptions' ); ?>
 		<h3><?php _e( 'Operational Settings' ); ?></h3>
-		<table class="form-table">
-			<tr valign="top">
-				<th scope="row"><label for="site_name"><?php _e( 'Network Name' ) ?></label></th>
-				<td>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><label for="site_name"><?php _e( 'Network Name' ) ?></label></div>
+				<div class="form-input">
 					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
 					<br />
 					<?php _e( 'What you would like to call this website.' ) ?>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></div>
+				<div class="form-input">
 					<input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" />
 					<br />
 					<?php printf( __( 'Registration and support emails will come from this address. An address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</div>
+		</div>
 		<h3><?php _e( 'Registration Settings' ); ?></h3>
-		<table class="form-table">
-			<tr valign="top">
-				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><?php _e( 'Allow new registrations' ) ?></div>
 				<?php
 				if ( !get_site_option( 'registration' ) )
 					update_site_option( 'registration', 'none' );
 				$reg = get_site_option( 'registration' );
 				?>
-				<td>
+				<div class="form-input">
 					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
@@ -85,152 +85,152 @@
 					<?php if ( is_subdomain_install() )
 						_e( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' );
 					?>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
+			<div class="form-row">
+				<div class="form-label"><?php _e( 'Registration notification' ) ?></div>
 				<?php
 				if ( !get_site_option( 'registrationnotification' ) )
 					update_site_option( 'registrationnotification', 'yes' );
 				?>
-				<td>
+				<div class="form-input">
 					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top" id="addnewusers">
-				<th scope="row"><?php _e( 'Add New Users' ) ?></th>
-				<td>
+			<div class="form-row" id="addnewusers">
+				<div class="form-label"><?php _e( 'Add New Users' ) ?></div>
+				<div class="form-input">
 					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.' ); ?></label>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></div>
+				<div class="form-input">
 					<input name="illegal_names" type="text" id="illegal_names" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
 					<br />
 					<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></div>
+				<div class="form-input">
 					<?php $limited_email_domains = get_site_option( 'limited_email_domains' );
 					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
 					<textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5">
 <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
 					<br />
 					<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></div>
+				<div class="form-input">
 					<textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5">
 <?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
 					<br />
 					<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
-				</td>
-			</tr>
+				</div>
+			</div>
 
-		</table>
+		</div>
 		<h3><?php _e('New Site Settings'); ?></h3>
-		<table class="form-table">
+		<div class="form-fields">
 
-			<tr valign="top">
-				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></div>
+				<div class="form-input">
 					<textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( stripslashes( get_site_option( 'welcome_email' ) ) ) ?></textarea>
 					<br />
 					<?php _e( 'The welcome email sent to new site owners.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></div>
+				<div class="form-input">
 					<textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea>
 					<br />
 					<?php _e( 'The welcome email sent to new users.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="first_post"><?php _e( 'First Post' ) ?></label></div>
+				<div class="form-input">
 					<textarea name="first_post" id="first_post" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( stripslashes( get_site_option( 'first_post' ) ) ) ?></textarea>
 					<br />
 					<?php _e( 'The first post on a new site.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="first_page"><?php _e( 'First Page' ) ?></label></div>
+				<div class="form-input">
 					<textarea name="first_page" id="first_page" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( stripslashes( get_site_option('first_page') ) ) ?></textarea>
 					<br />
 					<?php _e( 'The first page on a new site.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></div>
+				<div class="form-input">
 					<textarea name="first_comment" id="first_comment" rows="5" cols="45" class="large-text">
 <?php echo esc_textarea( stripslashes( get_site_option('first_comment') ) ) ?></textarea>
 					<br />
 					<?php _e( 'The first comment on a new site.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></div>
+				<div class="form-input">
 					<input type="text" size="40" name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" />
 					<br />
 					<?php _e( 'The author of the first comment on a new site.' ) ?>
-				</td>
-			</tr>
-			<tr valign="top">
-				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
-				<td>
+				</div>
+			</div>
+			<div class="form-row">
+				<div class="form-label"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></div>
+				<div class="form-input">
 					<input type="text" size="40" name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
 					<br />
 					<?php _e( 'The URL for the first comment on a new site.' ) ?>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</div>
+		</div>
 		<h3><?php _e( 'Upload Settings' ); ?></h3>
-		<table class="form-table">
-			<tr valign="top">
-				<th scope="row"><?php _e( 'Media upload buttons' ) ?></th>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><?php _e( 'Media upload buttons' ) ?></div>
 				<?php $mu_media_buttons = get_site_option( 'mu_media_buttons', array() ); ?>
-				<td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br />
+				<div class="form-input"><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br />
 				<label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br />
 				<label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br />
-				<?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td>
-			</tr>
+				<?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><?php _e( 'Site upload space' ) ?></th>
-				<td>
+			<div class="form-row">
+				<div class="form-label"><?php _e( 'Site upload space' ) ?></div>
+				<div class="form-input">
 				<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="text" id="blog_upload_space" value="' . esc_attr( get_site_option('blog_upload_space', 10) ) . '" size="3" />' ); ?></label><br />
-				</td>
-			</tr>
+				</div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
-				<td><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option('upload_filetypes', 'jpg jpeg png gif') ) ?>" size="45" /></td>
-			</tr>
+			<div class="form-row">
+				<div class="form-label"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></div>
+				<div class="form-input"><input name="upload_filetypes" type="text" id="upload_filetypes" class="large-text" value="<?php echo esc_attr( get_site_option('upload_filetypes', 'jpg jpeg png gif') ) ?>" size="45" /></div>
+			</div>
 
-			<tr valign="top">
-				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
-				<td><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="text" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" size="5" />' ); ?></td>
-			</tr>
-		</table>
+			<div class="form-row">
+				<div class="form-label"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></div>
+				<div class="form-input"><?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="text" id="fileupload_maxk" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" size="5" />' ); ?></div>
+			</div>
+		</div>
 
 <?php
 		$languages = get_available_languages();
@@ -238,25 +238,25 @@
 			$lang = get_site_option( 'WPLANG' );
 ?>
 		<h3><?php _e( 'Language Settings' ); ?></h3>
-		<table class="form-table">
-				<tr valign="top">
-					<th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
-					<td>
-						<select name="WPLANG" id="WPLANG">
-							<?php mu_dropdown_languages( $languages, get_site_option( 'WPLANG' ) ); ?>
-						</select>
-					</td>
-				</tr>
-		</table>
+		<div class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></div>
+				<div class="form-input">
+					<select name="WPLANG" id="WPLANG">
+						<?php mu_dropdown_languages( $languages, get_site_option( 'WPLANG' ) ); ?>
+					</select>
+				</div>
+			</div>
+		</div>
 <?php
 		} // languages
 ?>
 
 		<h3><?php _e( 'Menu Settings' ); ?></h3>
-		<table id="menu" class="form-table">
-			<tr valign="top">
-				<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
-				<td>
+		<div id="menu" class="form-fields">
+			<div class="form-row">
+				<div class="form-label"><?php _e( 'Enable administration menus' ); ?></div>
+				<div class="form-input">
 			<?php
 			$menu_perms = get_site_option( 'menu_items' );
 			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
@@ -264,9 +264,9 @@
 				echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" .  ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
 			}
 			?>
-				</td>
-			</tr>
-		</table>
+				</div>
+			</div>
+		</div>
 
 		<?php do_action( 'wpmu_options' ); // Add more options here ?>
 
Index: wp-admin/network/site-settings.php
===================================================================
--- wp-admin/network/site-settings.php	(revision 17488)
+++ wp-admin/network/site-settings.php	(working copy)
@@ -101,7 +101,7 @@
 <form method="post" action="site-settings.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
+	<div class="form-fields">
 		<?php
 		$blog_prefix = $wpdb->get_blog_prefix( $id );
 		$options = $wpdb->get_results( "SELECT * FROM {$blog_prefix}options WHERE option_name NOT LIKE '\_%' AND option_name NOT LIKE '%user_roles'" );
@@ -121,27 +121,27 @@
 			}
 			if ( strpos( $option->option_value, "\n" ) !== false ) {
 			?>
-				<tr class="form-field">
-					<th scope="row"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></th>
-					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
-				</tr>
+				<div class="form-row form-field">
+					<div class="form-label"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></div>
+					<div class="form-input"><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></div>
+				</div>
 			<?php
 			} else {
 			?>
-				<tr class="form-field">
-					<th scope="row"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></th>
+				<div class="form-row form-field">
+					<div class="form-label"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></div>
 					<?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
-					<td><code><?php echo esc_html( $option->option_value ) ?></code></td>
+					<div class="form-input"><code><?php echo esc_html( $option->option_value ) ?></code></div>
 					<?php } else { ?>
-					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ) ?>]" type="text" id="<?php echo esc_attr( $option->option_name ) ?>" value="<?php echo esc_attr( $option->option_value ) ?>" size="40" <?php disabled( $disabled ) ?> /></td>
+					<div class="form-input"><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ) ?>]" type="text" id="<?php echo esc_attr( $option->option_name ) ?>" value="<?php echo esc_attr( $option->option_value ) ?>" size="40" <?php disabled( $disabled ) ?> /></div>
 					<?php } ?>
-				</tr>
+				</div>
 			<?php
 			}
 		} // End foreach
 		do_action( 'wpmueditblogaction', $id );
 		?>
-	</table>
+	</div>
 	<?php submit_button(); ?>
 </form>
 
Index: wp-admin/network/site-users.php
===================================================================
--- wp-admin/network/site-users.php	(revision 17488)
+++ wp-admin/network/site-users.php	(working copy)
@@ -244,14 +244,14 @@
 <form action="site-users.php?action=adduser" id="adduser" method="post">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
-		<tr>
-			<th scope="row"><?php _e( 'Username' ); ?></th>
-			<td><input type="text" class="regular-text" name="newuser" id="newuser" /></td>
-		</tr>
-		<tr>
-			<th scope="row"><?php _e( 'Role'); ?></th>
-			<td><select name="new_role" id="new_role_0">
+	<div class="form-fields">
+		<div class="form-row">
+			<div class="form-label"><?php _e( 'Username' ); ?></div>
+			<div class="form-input"><input type="text" class="regular-text" name="newuser" id="newuser" /></div>
+		</div>
+		<div class="form-row">
+			<div class="form-label"><?php _e( 'Role'); ?></div>
+			<div class="form-input"><select name="new_role" id="new_role_0">
 			<?php
 			reset( $editblog_roles );
 			foreach ( $editblog_roles as $role => $role_assoc ){
@@ -260,9 +260,9 @@
 				echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
 			}
 			?>
-			</select></td>
-		</tr>
-	</table>
+			</select></div>
+		</div>
+	</div>
 	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 	<?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
 </form>
@@ -273,18 +273,18 @@
 <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-	<table class="form-table">
-		<tr>
-			<th scope="row"><?php _e( 'Username' ) ?></th>
-			<td><input type="text" class="regular-text" name="user[username]" /></td>
-		</tr>
-		<tr>
-			<th scope="row"><?php _e( 'Email' ) ?></th>
-			<td><input type="text" class="regular-text" name="user[email]" /></td>
-		</tr>
-		<tr>
-			<th scope="row"><?php _e( 'Role'); ?></th>
-			<td><select name="new_role" id="new_role_0">
+	<div class="form-fields">
+		<div class="form-row">
+			<div class="form-label"><?php _e( 'Username' ) ?></div>
+			<div class="form-input"><input type="text" class="regular-text" name="user[username]" /></div>
+		</div>
+		<div class="form-row">
+			<div class="form-label"><?php _e( 'Email' ) ?></div>
+			<div class="form-input"><input type="text" class="regular-text" name="user[email]" /></div>
+		</div>
+		<div class="form-row">
+			<div class="form-label"><?php _e( 'Role'); ?></div>
+			<div class="form-input"><select name="new_role" id="new_role_0">
 			<?php
 			reset( $editblog_roles );
 			foreach ( $editblog_roles as $role => $role_assoc ){
@@ -293,12 +293,12 @@
 				echo '<option ' . $selected . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
 			}
 			?>
-			</select></td>
-		</tr>
-		<tr class="form-field">
-			<td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
-		</tr>
-	</table>
+			</select></div>
+		</div>
+		<div class="form-row form-field">
+			<div class="form-input input-full"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></div>
+		</div>
+	</div>
 	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
 	<?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
 </form>
Index: wp-admin/network/user-new.php
===================================================================
--- wp-admin/network/user-new.php	(revision 17488)
+++ wp-admin/network/user-new.php	(working copy)
@@ -72,19 +72,19 @@
 		echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
 } ?>
 	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">	
-	<table class="form-table">
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Username' ) ?></th>
-			<td><input type="text" class="regular-text" name="user[username]" /></td>
-		</tr>
-		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Email' ) ?></th>
-			<td><input type="text" class="regular-text" name="user[email]" /></td>
-		</tr>
-		<tr class="form-field">
-			<td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
-		</tr>
-	</table>
+	<div class="form-fields">
+		<div class="form-row form-field form-required">
+			<div class="form-label"><?php _e( 'Username' ) ?></div>
+			<div class="form-input"><input type="text" class="regular-text" name="user[username]" /></div>
+		</div>
+		<div class="form-row form-field form-required">
+			<div class="form-label"><?php _e( 'Email' ) ?></div>
+			<div class="form-input"><input type="text" class="regular-text" name="user[email]" /></div>
+		</div>
+		<div class="form-row form-field">
+			<div class="form-input input-full"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></div>
+		</div>
+	</div>
 	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 	<?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
 	</form>
Index: wp-admin/options-discussion.php
===================================================================
--- wp-admin/options-discussion.php	(revision 17488)
+++ wp-admin/options-discussion.php	(working copy)
@@ -33,10 +33,10 @@
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Default article settings') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings') ?></span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Default article settings') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings') ?></span></legend>
 <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.') ?></label>
@@ -50,11 +50,11 @@
 <?php _e('Allow people to post comments on new articles') ?></label>
 <br />
 <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Other comment settings') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Other comment settings') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings') ?></span></legend>
 <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_registration">
@@ -110,11 +110,11 @@
 printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
 
 ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('E-mail me whenever') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('E-mail me whenever') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever') ?></span></legend>
 <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>
@@ -122,40 +122,40 @@
 <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>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Before a comment appears') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Before a comment appears') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears') ?></span></legend>
 <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>
 <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>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Comment Moderation') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Comment Moderation') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation') ?></span></legend>
 <p><label for="comment_max_links"><?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" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ) ?></label></p>
 
 <p><label for="moderation_keys"><?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="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.') ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
 </p>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Comment Blacklist') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Comment Blacklist') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist') ?></span></legend>
 <p><label for="blacklist_keys"><?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 &#8220;press&#8221; will match &#8220;WordPress&#8221;.') ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
 </p>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('discussion', 'default'); ?>
-</table>
+</div>
 
 <h3><?php _e('Avatars') ?></h3>
 
@@ -163,10 +163,10 @@
 
 <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Avatar Display') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Avatar Display') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
 <?php
 	$yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
 	foreach ( $yesorno as $key => $value) {
@@ -174,11 +174,11 @@
 		echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />";
 	}
 ?>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Maximum Rating') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Maximum Rating') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating') ?></span></legend>
 
 <?php
 $ratings = array(
@@ -197,11 +197,11 @@
 endforeach;
 ?>
 
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Default Avatar') ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Default Avatar') ?></div>
+<div class="form-input defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar') ?></span></legend>
 
 <?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
 
@@ -234,10 +234,10 @@
 echo apply_filters('default_avatar_select', $avatar_list);
 ?>
 
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('discussion', 'avatars'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('discussion'); ?>
 
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 17488)
+++ wp-admin/options.php	(working copy)
@@ -171,7 +171,7 @@
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type='hidden' name='option_page' value='options' />
-  <table class="form-table">
+  <div class="form-fields">
 <?php
 $options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
 
@@ -197,18 +197,18 @@
 	}
 	$name = esc_attr( $option->option_name );
 	echo "
-<tr>
-	<th scope='row'><label for='$name'>" . esc_html( $option->option_name ) . "</label></th>
-<td>";
+<div class='form-row'>
+	<div class='form-label'><label for='$name'>" . esc_html( $option->option_name ) . "</label></div>
+<div class='form-input'>";
 	if ( strpos( $value, "\n" ) !== false )
 		echo "<textarea class='$class' name='$name' id='$name' cols='30' rows='5'>" . esc_textarea( $value ) . "</textarea>";
 	else
 		echo "<input class='regular-text $class' type='text' name='$name' id='$name' value='" . esc_attr( $value ) . "'" . disabled( $disabled, true, false ) . " />";
-	echo "</td>
-</tr>";
+	echo "</div>
+</div>";
 endforeach;
 ?>
-  </table>
+  </div>
 
 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
 
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 17488)
+++ wp-admin/user-edit.php	(working copy)
@@ -65,10 +65,10 @@
  */
 function use_ssl_preference($user) {
 ?>
-	<tr>
-		<th scope="row"><?php _e('Use https')?></th>
-		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
-	</tr>
+	<div class="form-row">
+		<div class="form-label"><?php _e('Use https')?></div>
+		<div class="form-input"><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></div>
+	</div>
 <?php
 }
 
@@ -185,39 +185,39 @@
 
 <h3><?php _e('Personal Options'); ?></h3>
 
-<table class="form-table">
+<div class="form-fields">
 <?php if ( rich_edit_exists() && !( IS_PROFILE_PAGE && !$user_can_edit ) ) : // don't bother showing the option if the editor has been removed ?>
-	<tr>
-		<th scope="row"><?php _e('Visual Editor')?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
-	</tr>
+	<div class="form-row">
+		<div class="form-label"><?php _e('Visual Editor')?></div>
+		<div class="form-input"><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></div>
+	</div>
 <?php endif; ?>
 <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
-<tr>
-<th scope="row"><?php _e('Admin Color Scheme')?></th>
-<td><?php do_action( 'admin_color_scheme_picker' ); ?></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><?php _e('Admin Color Scheme')?></div>
+<div class="form-input"><?php do_action( 'admin_color_scheme_picker' ); ?></div>
+</div>
 <?php
 endif; // $_wp_admin_css_colors
 if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
-<tr>
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Keyboard Shortcuts' ); ?></div>
+<div class="form-input"><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></div>
+</div>
 <?php endif; ?>
-<tr class="show-admin-bar">
-<th scope="row"><?php _e('Show Admin Bar')?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></span></legend>
+<div class="form-row" class="show-admin-bar">
+<div class="form-label"><?php _e('Show Admin Bar')?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Show Admin Bar') ?></span></legend>
 <label for="admin_bar_front">
 <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1" <?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
 <?php /* translators: Show admin bar when viewing site */ _e( 'when viewing site' ); ?></label><br />
 <label for="admin_bar_admin">
 <input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
 <?php /* translators: Show admin bar in dashboard */ _e( 'in dashboard' ); ?></label>
-</td>
-</tr>
+</div>
+</div>
 <?php do_action('personal_options', $profileuser); ?>
-</table>
+</div>
 <?php
 	if ( IS_PROFILE_PAGE )
 		do_action('profile_personal_options', $profileuser);
@@ -225,15 +225,15 @@
 
 <h3><?php _e('Name') ?></h3>
 
-<table class="form-table">
-	<tr>
-		<th><label for="user_login"><?php _e('Username'); ?></label></th>
-		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
-	</tr>
+<div class="form-fields">
+	<div class="form-row">
+		<div class="form-label"><label for="user_login"><?php _e('Username'); ?></label></div>
+		<div class="form-input"><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></div>
+	</div>
 
 <?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
-<tr><th><label for="role"><?php _e('Role:') ?></label></th>
-<td><select name="role" id="role">
+<div class="form-row"><div class="form-label"><label for="role"><?php _e('Role:') ?></label></div>
+<div class="form-input"><select name="role" id="role">
 <?php
 // Get the highest/primary role for this user
 // TODO: create a function that does this: wp_get_user_role()
@@ -253,34 +253,34 @@
 <?php endif; //!IS_PROFILE_PAGE
 
 if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
-<tr><th><label for="role"><?php _e('Super Admin'); ?></label></th>
-<td>
+<div class="form-row"><div class="form-label"><label for="role"><?php _e('Super Admin'); ?></label></div>
+<div class="form-input">
 <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
 <?php else : ?>
 <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
 <?php endif; ?>
-</td></tr>
+</div></div>
 <?php } ?>
 
-<tr>
-	<th><label for="first_name"><?php _e('First Name') ?></label></th>
-	<td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
-</tr>
+<div class="form-row">
+	<div class="form-label"><label for="first_name"><?php _e('First Name') ?></label></div>
+	<div class="form-input"><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></div>
+</div>
 
-<tr>
-	<th><label for="last_name"><?php _e('Last Name') ?></label></th>
-	<td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
-</tr>
+<div class="form-row">
+	<div class="form-label"><label for="last_name"><?php _e('Last Name') ?></label></div>
+	<div class="form-input"><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></div>
+</div>
 
-<tr>
-	<th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
-</tr>
+<div class="form-row">
+	<div class="form-label"><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></div>
+	<div class="form-input"><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></div>
+</div>
 
-<tr>
-	<th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
-	<td>
+<div class="form-row">
+	<div class="form-label"><label for="display_name"><?php _e('Display name publicly as') ?></label></div>
+	<div class="form-input">
 		<select name="display_name" id="display_name">
 		<?php
 			$public_display = array();
@@ -305,16 +305,16 @@
 			}
 		?>
 		</select>
-	</td>
-</tr>
-</table>
+	</div>
+</div>
+</div>
 
 <h3><?php _e('Contact Info') ?></h3>
 
-<table class="form-table">
-<tr>
-	<th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" />
+<div class="form-fields">
+<div class="form-row">
+	<div class="form-label"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></div>
+	<div class="form-input"><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" />
 	<?php
 	$new_email = get_option( $current_user->ID . '_new_email' );
 	if ( $new_email && $new_email != $current_user->user_email ) : ?>
@@ -322,49 +322,49 @@
 	<p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?></p>
 	</div>
 	<?php endif; ?>
-	</td>
-</tr>
+	</div>
+</div>
 
-<tr>
-	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="text" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
-</tr>
+<div class="form-row">
+	<div class="form-label"><label for="url"><?php _e('Website') ?></label></div>
+	<div class="form-input"><input type="text" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></div>
+</div>
 
 <?php
 	foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) {
 ?>
-<tr>
-	<th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
-	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
-</tr>
+<div class="form-row">
+	<div class="form-label"><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></div>
+	<div class="form-input"><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></div>
+</div>
 <?php
 	}
 ?>
-</table>
+</div>
 
 <h3><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h3>
 
-<table class="form-table">
-<tr>
-	<th><label for="description"><?php _e('Biographical Info'); ?></label></th>
-	<td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description; // textarea_escaped ?></textarea><br />
-	<span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span></td>
-</tr>
+<div class="form-fields">
+<div class="form-row">
+	<div class="form-label"><label for="description"><?php _e('Biographical Info'); ?></label></div>
+	<div class="form-input"><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description; // textarea_escaped ?></textarea><br />
+	<span class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></span></div>
+</div>
 
 <?php
 $show_password_fields = apply_filters('show_password_fields', true, $profileuser);
 if ( $show_password_fields ) :
 ?>
-<tr id="password">
-	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
-	<td><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
+<div class="form-row" id="password">
+	<div class="form-label"><label for="pass1"><?php _e('New Password'); ?></label></div>
+	<div class="form-input"><input type="password" name="pass1" id="pass1" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?></span><br />
 		<input type="password" name="pass2" id="pass2" size="16" value="" autocomplete="off" /> <span class="description"><?php _e("Type your new password again."); ?></span><br />
 		<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
 		<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
-	</td>
-</tr>
+	</div>
+</div>
 <?php endif; ?>
-</table>
+</div>
 
 <?php
 	if ( IS_PROFILE_PAGE )
@@ -375,10 +375,10 @@
 
 <?php if ( count($profileuser->caps) > count($profileuser->roles) && apply_filters('additional_capabilities_display', true, $profileuser) ) { ?>
 <br class="clear" />
-	<table width="99%" style="border: none;" cellspacing="2" cellpadding="3" class="editform">
-		<tr>
-			<th scope="row"><?php _e('Additional Capabilities') ?></th>
-			<td><?php
+	<div class="form-fields editform">
+		<div class="form-row">
+			<div class="form-label"><?php _e('Additional Capabilities') ?></div>
+			<div class="form-input"><?php
 			$output = '';
 			foreach ( $profileuser->caps as $cap => $value ) {
 				if ( !$wp_roles->is_role($cap) ) {
@@ -388,9 +388,9 @@
 				}
 			}
 			echo $output;
-			?></td>
-		</tr>
-	</table>
+			?></div>
+		</div>
+	</div>
 <?php } ?>
 
 <input type="hidden" name="action" value="update" />
Index: wp-admin/css/install-rtl.dev.css
===================================================================
--- wp-admin/css/install-rtl.dev.css	(revision 17488)
+++ wp-admin/css/install-rtl.dev.css	(working copy)
@@ -15,7 +15,8 @@
 	font-family: Tahoma, arial;
 	margin-right: 0;
 }
-.form-table th {
+.form-table th,
+.form-fields .form-label {
 	text-align: right;
 }
 #user_login, #admin_email, #pass1, #pass2 {
Index: wp-admin/css/wp-admin-rtl.dev.css
===================================================================
--- wp-admin/css/wp-admin-rtl.dev.css	(revision 17488)
+++ wp-admin/css/wp-admin-rtl.dev.css	(working copy)
@@ -213,18 +213,19 @@
 	margin-left: 5px;
 }
 /* Tables used on comment.php and option/setting pages */
-.form-table th {
+.form-table th,
+.form-fields .form-label {
 	text-align: right;
 }
-.form-table input.tog {
+.form-fields input.tog {
 	margin-right: 0;
 	margin-left: 2px;
 	float: right;
 }
-.form-table table.color-palette {
+.form-fields table.color-palette {
 	float: right;
 }
-#profile-page .form-table #rich_editing {
+#profile-page .form-fields #rich_editing {
 	margin-right: 0;
 	margin-left: 5px;
 }
Index: wp-admin/css/colors-classic.dev.css
===================================================================
--- wp-admin/css/colors-classic.dev.css	(revision 17488)
+++ wp-admin/css/colors-classic.dev.css	(working copy)
@@ -48,7 +48,8 @@
 
 body,
 #wpbody,
-.form-table .pre {
+.form-table .pre,
+.form-fields .pre {
 	color: #174f69;
 }
 
@@ -143,7 +144,8 @@
 }
 
 .form-table th,
-.form-wrap label {
+.form-wrap label,
+.form-fields .form-label {
 	color: #222;
 	text-shadow: #fff 0 1px 0;
 }
@@ -1455,7 +1457,8 @@
 	background-color: #bbb;
 }
 
-.form-table .color-palette td {
+.form-table .color-palette td,
+.form-fields .color-palette td {
 	border-color: #fff;
 }
 
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 17488)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -48,7 +48,8 @@
 
 body,
 #wpbody,
-.form-table .pre {
+.form-table .pre,
+.form-fields .pre {
 	color: #333;
 }
 
@@ -143,7 +144,8 @@
 }
 
 .form-table th,
-.form-wrap label {
+.form-wrap label,
+.form-fields .form-label {
 	color: #222;
 	text-shadow: #fff 0 1px 0;
 }
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 17488)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -3351,45 +3351,56 @@
   15.0 - Comments Screen
 ------------------------------------------------------------------------------*/
 
-.form-table {
-	border-collapse: collapse;
+.form-fields {
+	clear: both;
 	margin-top: 0.5em;
+	margin-bottom: -8px;
 	width: 100%;
-	margin-bottom: -8px;
-	clear: both;
 }
 
-.form-table td {
-	margin-bottom: 9px;
-	padding: 8px 10px;
+.form-fields .form-row {
+	clear: both;
 	line-height: 20px;
-	font-size: 11px;
+	overflow: hidden;
 }
 
-.form-table th,
+.form-fields .form-label {
+	float: left;
+	padding: 10px;
+	width: 200px;
+}
+
+.form-fields .label-full {
+	width: 100%;
+}
+
+.form-fields .form-label,
 .form-wrap label {
-	font-weight: normal;
 	text-shadow: rgba(255,255,255,1) 0 1px 0;
 }
 
-.form-table th {
-	vertical-align: top;
-	text-align: left;
-	padding: 10px;
-	width: 200px;
+.form-fields .form-input {
+	font-size: 11px;
+	margin-left: 220px;
+	padding: 8px 10px;
 }
 
-.form-table th.th-full {
-	width: auto;
+.form-fields .form-input.input-full {
+	margin: 0;
 }
 
-.form-table div.color-option {
+.form-fields .form-input p {
+	margin-top: 4px;
+}
+
+.form-fields div.color-option {
 	display: block;
 	clear: both;
 	margin-top: 12px;
 }
 
-.form-table input.tog {
+.form-fields input.tog {
+	clear: both;
 	margin-top: 2px;
 	margin-right: 2px;
 	float: left;
@@ -3399,20 +3410,57 @@
 	margin-top: 4px;
 }
 
-.form-table table.color-palette {
+.form-fields table.color-palette {
 	vertical-align: bottom;
 	float: left;
 	margin: -12px 3px 11px;
 }
 
-.form-table .color-palette td {
+.form-fields .color-palette td {
 	border-width: 1px 1px 0;
-	border-style: solid solid none;
+	border-style: none none;
 	height: 10px;
 	line-height: 20px;
+	padding: 8px 10px;
 	width: 10px;
 }
 
+.form-table {
+	border-collapse: collapse;
+	margin-top: 0.5em;
+	width: 100%;
+	margin-bottom: -8px;
+	clear: both;
+}
+
+.form-table td {
+	margin-bottom: 9px;
+	padding: 8px 10px;
+	line-height: 20px;
+	font-size: 11px;
+}
+
+.form-table th,
+.form-wrap label {
+	font-weight: normal;
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+}
+
+.form-table th {
+	vertical-align: top;
+	text-align: left;
+	padding: 10px;
+	width: 200px;
+}
+
+.form-table th.th-full {
+	width: auto;
+}
+
+.form-table td p {
+	margin-top: 4px;
+}
+
 .commentlist li {
 	padding: 1em 1em .2em;
 	margin: 0;
@@ -3872,12 +3920,12 @@
   18.0 - Users
 ------------------------------------------------------------------------------*/
 
-#profile-page .form-table textarea {
+#profile-page .form-fields textarea {
 	width: 500px;
 	margin-bottom: 6px;
 }
 
-#profile-page .form-table #rich_editing {
+#profile-page .form-fields #rich_editing {
 	margin-right: 5px
 }
 
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 17488)
+++ wp-admin/options-reading.php	(working copy)
@@ -63,7 +63,7 @@
 
 <?php if ( ! get_pages() ) : ?>
 <input name="show_on_front" type="hidden" value="posts" />
-<table class="form-table">
+<div class="form-fields">
 <?php
 	if ( 'posts' != get_option( 'show_on_front' ) ) :
 		update_option( 'show_on_front', 'posts' );
@@ -73,10 +73,10 @@
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
 		update_option( 'show_on_front', 'posts' );
 ?>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e( 'Front page displays' ); ?></th>
-<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e( 'Front page displays' ); ?></div>
+<div class="form-input" id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
 		<?php _e( 'Your latest posts' ); ?>
@@ -94,34 +94,33 @@
 <?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
 <div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
 <?php endif; ?>
-</fieldset></td>
-</tr>
+</fieldset></div>
 <?php endif; ?>
-<tr valign="top">
-<th scope="row"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></th>
-<td>
+<div class="form-row">
+<div class="form-label"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></div>
+<div class="form-input">
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option( 'posts_per_page' ); ?>" class="small-text" /> <?php _e( 'posts' ); ?>
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></th>
-<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
+</div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></div>
+<div class="form-input"><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e( 'For each article in a feed, show' ); ?> </div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
 <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>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></th>
-<td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
-<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></td>
-</tr>
+<div class="form-row">
+<div class="form-label"><label for="blog_charset"><?php _e( 'Encoding for pages and feeds' ); ?></label></div>
+<div class="form-input"><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option( 'blog_charset' ); ?>" class="regular-text" />
+<span class="description"><?php _e( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended, if you are adventurous there are some <a href="http://en.wikipedia.org/wiki/Character_set">other encodings</a>)' ); ?></span></div>
+</div>
 <?php do_settings_fields( 'reading', 'default' ); ?>
-</table>
+</div>
 
 <?php do_settings_sections( 'reading' ); ?>
 
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 17488)
+++ wp-admin/options-permalink.php	(working copy)
@@ -172,35 +172,35 @@
 	);
 ?>
 <h3><?php _e('Common settings'); ?></h3>
-<table class="form-table">
-	<tr>
-		<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></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
-	</tr>
-	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix; ?>/archives/123</code></td>
-	</tr>
-	<tr>
-		<th>
+<div class="form-fields">
+	<div class="form-row">
+		<div class="form-label"><label><input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></div>
+		<div class="form-input"><code><?php echo get_option('home'); ?>/?p=123</code></div>
+	</div>
+	<div class="form-row">
+		<div class="form-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></div>
+		<div class="form-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></div>
+	</div>
+	<div class="form-row">
+		<div class="form-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></div>
+		<div class="form-input"><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></div>
+	</div>
+	<div class="form-row">
+		<div class="form-label"><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></div>
+		<div class="form-input"><code><?php echo get_option('home') . $blog_prefix . $prefix; ?>/archives/123</code></div>
+	</div>
+	<div class="form-row">
+		<div class="form-label">
 			<label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
 			<?php _e('Custom Structure'); ?>
 			</label>
-		</th>
-		<td>
+		</div>
+		<div class="form-input">
 			<?php echo $blog_prefix; ?>
 			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
-		</td>
-	</tr>
-</table>
+		</div>
+	</div>
+</div>
 
 <h3><?php _e('Optional'); ?></h3>
 <?php if ( $is_apache || $iis7_permalinks ) : ?>
@@ -209,17 +209,17 @@
 	<p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
 <?php endif; ?>
 
-<table class="form-table">
-	<tr>
-		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
-	</tr>
-	<tr>
-		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
-	</tr>
+<div class="form-fields">
+	<div class="form-row">
+		<div class="form-label"><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></div>
+		<div class="form-input"><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></div>
+	</div>
+	<div class="form-row">
+		<div class="form-label"><label for="tag_base"><?php _e('Tag base'); ?></label></div>
+		<div class="form-input"><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></div>
+	</div>
 	<?php do_settings_fields('permalink', 'optional'); ?>
-</table>
+</div>
 
 <?php do_settings_sections('permalink'); ?>
 
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 17488)
+++ wp-admin/options-writing.php	(working copy)
@@ -33,56 +33,56 @@
 <form method="post" action="options.php">
 <?php settings_fields('writing'); ?>
 
-<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>
-<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" class="small-text" />
-<?php _e('lines') ?></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Formatting') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></div>
+<div class="form-input"><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" class="small-text" />
+<?php _e('lines') ?></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('Formatting') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
-<td>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="default_category"><?php _e('Default Post Category') ?></label></div>
+<div class="form-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_category', 'orderby' => 'name', 'selected' => get_option('default_category'), 'hierarchical' => true));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php
 if ( current_theme_supports( 'post-formats' ) ) :
 	$post_formats = get_theme_support( 'post-formats' );
 	if ( is_array( $post_formats[0] ) ) :
 ?>
-<tr valign="top">
-<th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
-<td>
+<div class="form-row">
+<div class="form-label"><label for="default_post_format"><?php _e('Default Post Format') ?></label></div>
+<div class="form-input">
 	<select name="default_post_format" id="default_post_format">
 		<option value="0"><?php _e('Standard'); ?></option>
 <?php foreach ( $post_formats[0] as $format ): ?>
 		<option<?php selected( get_option('default_post_format'), $format ); ?> value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
 <?php endforeach; ?>
 	</select></label>
-</td>
-</tr>
+</div>
+</div>
 <?php endif; endif; ?>
-<tr valign="top">
-<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
-<td>
+<div class="form-row">
+<div class="form-label"><label for="default_link_category"><?php _e('Default Link Category') ?></label></div>
+<div class="form-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_link_category', 'orderby' => 'name', 'selected' => get_option('default_link_category'), 'hierarchical' => true, 'taxonomy' => 'link_category'));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php do_settings_fields('writing', 'default'); ?>
-</table>
+</div>
 
 
 <h3 class="title"><?php _e('Press This') ?></h3>
@@ -95,57 +95,57 @@
 <h3><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
 
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><label for="mailserver_url"><?php _e('Mail Server') ?></label></th>
-<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" class="regular-text code" />
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><label for="mailserver_url"><?php _e('Mail Server') ?></label></div>
+<div class="form-input"><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" class="regular-text code" />
 <label for="mailserver_port"><?php _e('Port') ?></label>
 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" class="small-text" />
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="mailserver_login"><?php _e('Login Name') ?></label></th>
-<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" class="regular-text" /></td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="mailserver_pass"><?php _e('Password') ?></label></th>
-<td>
+</div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="mailserver_login"><?php _e('Login Name') ?></label></div>
+<div class="form-input"><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" class="regular-text" /></div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="mailserver_pass"><?php _e('Password') ?></label></div>
+<div class="form-input">
 <input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" class="regular-text" />
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></th>
-<td>
+</div>
+</div>
+<div class="form-row">
+<div class="form-label"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></div>
+<div class="form-input">
 <?php
 wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_category', 'orderby' => 'name', 'selected' => get_option('default_email_category'), 'hierarchical' => true));
 ?>
-</td>
-</tr>
+</div>
+</div>
 <?php do_settings_fields('writing', 'post_via_email'); ?>
-</table>
+</div>
 <?php } ?>
 
 <h3><?php _e('Remote Publishing') ?></h3>
 <p><?php printf(__('To post to WordPress from a desktop blogging client or remote website that uses the Atom Publishing Protocol or one of the XML-RPC publishing interfaces you must enable them below.')) ?></p>
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Atom Publishing Protocol') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Atom Publishing Protocol') ?></span></legend>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Atom Publishing Protocol') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('Atom Publishing Protocol') ?></span></legend>
 <label for="enable_app">
 <input name="enable_app" type="checkbox" id="enable_app" value="1" <?php checked('1', get_option('enable_app')); ?> />
 <?php _e('Enable the Atom Publishing Protocol.') ?></label><br />
-</fieldset></td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('XML-RPC') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('XML-RPC') ?></span></legend>
+</fieldset></div>
+</div>
+<div class="form-row">
+<div class="form-label"><?php _e('XML-RPC') ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e('XML-RPC') ?></span></legend>
 <label for="enable_xmlrpc">
 <input name="enable_xmlrpc" type="checkbox" id="enable_xmlrpc" value="1" <?php checked('1', get_option('enable_xmlrpc')); ?> />
 <?php _e('Enable the WordPress, Movable Type, MetaWeblog and Blogger XML-RPC publishing protocols.') ?></label><br />
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php do_settings_fields('writing', 'remote_publishing'); ?>
-</table>
+</div>
 
 <?php if ( apply_filters( 'enable_update_services_configuration', true ) ) { ?>
 <h3><?php _e('Update Services') ?></h3>
Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 17488)
+++ wp-admin/custom-background.php	(working copy)
@@ -178,11 +178,10 @@
 	} else {
 ?>
 <h3><?php _e('Background Image'); ?></h3>
-<table class="form-table">
-<tbody>
-<tr valign="top">
-<th scope="row"><?php _e('Preview'); ?></th>
-<td>
+<div class="form-fields">
+<div class="form-row">
+<div class="form-label"><?php _e('Preview'); ?></div>
+<div class="form-input">
 <?php
 $background_styles = '';
 if ( $bgcolor = get_background_color() )
@@ -202,56 +201,54 @@
 <?php } ?>
 </div>
 <?php } ?>
-</td>
-</tr>
+</div>
+</div>
 <?php if ( get_background_image() ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e('Remove Image'); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e('Remove Image'); ?></div>
+<div class="form-input">
 <form method="post" action="">
 <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
 <?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
 <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
 </form>
-</td>
-</tr>
+</div>
+</div>
 <?php endif; ?>
 
 <?php if ( defined( 'BACKGROUND_IMAGE' ) ) : // Show only if a default background image exists ?>
-<tr valign="top">
-<th scope="row"><?php _e('Restore Original Image'); ?></th>
-<td>
+<div class="form-row">
+<div class="form-label"><?php _e('Restore Original Image'); ?></div>
+<div class="form-input">
 <form method="post" action="">
 <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
 <?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
 <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
 </form>
-</td>
-</tr>
+</div>
+</div>
 
 <?php endif; ?>
-<tr valign="top">
-<th scope="row"><?php _e('Upload Image'); ?></th>
-<td><form enctype="multipart/form-data" id="upload-form" method="post" action="">
+<div class="form-row">
+<div class="form-label"><?php _e('Upload Image'); ?></div>
+<div class="form-input"><form enctype="multipart/form-data" id="upload-form" method="post" action="">
 <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
 <input type="hidden" name="action" value="save" />
 <?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload') ?>
 <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
 </p>
 </form>
-</td>
-</tr>
-</tbody>
-</table>
+</div>
+</div>
+</div>
 
 <h3><?php _e('Display Options') ?></h3>
 <form method="post" action="">
-<table class="form-table">
-<tbody>
+<div class="form-fields">
 <?php if ( get_background_image() ) : ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Position' ); ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
 <label>
 <input name="background-position-x" type="radio" value="left"<?php checked('left', get_theme_mod('background_position_x', 'left')); ?> />
 <?php _e('Left') ?>
@@ -264,22 +261,22 @@
 <input name="background-position-x" type="radio" value="right"<?php checked('right', get_theme_mod('background_position_x', 'left')); ?> />
 <?php _e('Right') ?>
 </label>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e( 'Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Repeat' ); ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
 <label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('No Repeat'); ?></option></label>
 	<label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile'); ?></option></label>
 	<label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Horizontally'); ?></option></label>
 	<label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Vertically'); ?></option></label>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 
-<tr valign="top">
-<th scope="row"><?php _e( 'Attachment' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Attachment' ); ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
 <label>
 <input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'scroll')); ?> />
 <?php _e('Scroll') ?>
@@ -288,19 +285,18 @@
 <input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'scroll')); ?> />
 <?php _e('Fixed') ?>
 </label>
-</fieldset></td>
-</tr>
+</fieldset></div>
+</div>
 <?php endif; // get_background_image() ?>
-<tr valign="top">
-<th scope="row"><?php _e( 'Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<div class="form-row">
+<div class="form-label"><?php _e( 'Color' ); ?></div>
+<div class="form-input"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
 <input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr(get_background_color()) ?>" />
 <a class="hide-if-no-js" href="#" id="pickcolor"><?php _e('Select a Color'); ?></a>
 <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
-</fieldset></td>
-</tr>
-</tbody>
-</table>
+</fieldset></div>
+</div>
+</div>
 
 <?php wp_nonce_field('custom-background'); ?>
 <?php submit_button( null, 'primary', 'save-background-options' ); ?>
