Index: wp-admin/network.php
===================================================================
--- wp-admin/network.php	(revision 19602)
+++ wp-admin/network.php	(working copy)
@@ -221,16 +221,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="field-row">
+				<div class="field-label"><label><input type='radio' name='subdomain_install' value='1'<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></div>
+				<div clsas="field-input"><?php printf( _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ), $hostname ); ?></div>
+			</div>
+			<div class="field-row">
+				<div class="field-label"><label><input type='radio' name='subdomain_install' value='0'<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></div>
+				<div class="field-input"><?php printf( _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ), $hostname ); ?></div>
+			</div>
+		</div>
 
 <?php
 	endif;
@@ -240,69 +240,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 ); ?></p>
-		<table class="form-table">
-			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
-				<td>
+		<div class="form-fields">
+			<div class="field-row">
+				<div class="field-label"><?php esc_html_e( 'Server Address' ); ?></div>
+				<div class="field-row">
 					<?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="field-row">
+				<div class="field-label"><?php esc_html_e( 'Sub-directory Install' ); ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><?php esc_html_e( 'Sub-directory Install' ); ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><?php esc_html_e( 'Sub-domain Install' ); ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><?php esc_html_e( 'Server Address' ); ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><?php esc_html_e( 'Network Title' ); ?></div>
+				<div class="field-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 class="field-row">
+				<div class="field-label"><?php esc_html_e( 'Admin E-mail Address' ); ?></div>
+				<div class="field-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/network/site-new.php
===================================================================
--- wp-admin/network/site-new.php	(revision 19602)
+++ wp-admin/network/site-new.php	(working copy)
@@ -118,10 +118,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="field-row form-required">
+			<div class="field-label"><?php _e( 'Site Address' ) ?></div>
+			<div class="field-input">
 			<?php if ( is_subdomain_install() ) { ?>
 				<input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
 			<?php } else {
@@ -129,20 +129,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 esc_attr_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 esc_attr_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="field-row form-required">
+			<div class="field-label"><?php _e( 'Site Title' ) ?></div>
+			<div class="field-input"><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></div>
+		</div>
+		<div class="field-row form-required">
+			<div class="field-label"><?php _e( 'Admin Email' ) ?></div>
+			<div class="field-input"div class="field-input"><input name="blog[email]" type="text" class="regular-text" title="<?php esc_attr_e( 'Email' ) ?>"/></div>
+		</div>
+		<div class="field-row">
+			<div class="field-label label-full"><?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 19602)
+++ wp-admin/network/site-info.php	(working copy)
@@ -120,34 +120,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>
+	<div class="form-fields">
+		<div class="field-row 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="form-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="form-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="field-row 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="form-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="form-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-row">
+			<div class="field-label"><?php _ex( 'Registered', 'site' ) ?></div>
+			<div class="form-input"><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" size="40" /></div>
+		</div>
+		<div class="form-row">
+			<div class="field-label"><?php _e( 'Last Updated' ); ?></div>
+			<div class="form-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 ) {
@@ -157,16 +157,16 @@
 		}
 		$attribute_fields['mature'] = __( 'Mature' );
 		?>
-		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
-			<td>
+		<div class="form-row">
+			<div class="field-label"><?php _e( 'Attributes' ); ?></div>
+			<div class="form-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 19602)
+++ wp-admin/network/settings.php	(working copy)
@@ -119,35 +119,35 @@
 	<form method="post" action="settings.php">
 		<?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="field-row">
+				<div class="field-label"><label for="site_name"><?php _e( 'Network Name' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-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="field-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 />
@@ -155,143 +155,143 @@
 					<?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="field-row">
+				<div class="field-label"><?php _e( 'Registration notification' ) ?></div>
 				<?php
 				if ( !get_site_option( 'registrationnotification' ) )
 					update_site_option( 'registrationnotification', 'yes' );
 				?>
-				<td>
+				<div class="field-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="field-row" id="addnewusers">
+				<div class="field-label"><?php _e( 'Add New Users' ) ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="first_post"><?php _e( 'First Post' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="first_page"><?php _e( 'First Page' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></div>
+				<div class="field-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( 'Site upload space' ) ?></th>
-				<td>
+		<div class="form-fields">
+			<div class="field-row">
+				<div class="field-label"><?php _e( 'Site upload space' ) ?></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></div>
+				<div class="field-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="field-row">
+				<div class="field-label"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></div>
+				<div class="field-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();
@@ -299,25 +299,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>
+		<div class="form-fields">
+				<div class="field-row">
+					<div class="field-label"><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></div>
+					<div class="field-input">
 						<select name="WPLANG" id="WPLANG">
 							<?php mu_dropdown_languages( $languages, get_site_option( 'WPLANG' ) ); ?>
 						</select>
-					</td>
-				</tr>
-		</table>
+					</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="field-row">
+				<div class="field-label"><?php _e( 'Enable administration menus' ); ?></div>
+				<div class="field-input">
 			<?php
 			$menu_perms = get_site_option( 'menu_items' );
 			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
@@ -325,9 +325,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 19602)
+++ wp-admin/network/site-settings.php	(working copy)
@@ -110,7 +110,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'" );
@@ -130,27 +130,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="field-row">
+					<div class="field-label"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></div>
+					<div class="field-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="field-row">
+					<div class="field-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="field-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="field-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 19602)
+++ wp-admin/network/site-users.php	(working copy)
@@ -254,14 +254,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-table">
+		<div class="field-row">
+			<div class="field-label"><?php _e( 'Username' ); ?></div>
+			<div class="field-input"><input type="text" class="regular-text" name="newuser" id="newuser" /></div>
+		</div>
+		<div class="field-row">
+			<div class="field-label"><?php _e( 'Role'); ?></div>
+			<div class="field-input"><select name="new_role" id="new_role_0">
 			<?php
 			reset( $editblog_roles );
 			foreach ( $editblog_roles as $role => $role_assoc ){
@@ -270,9 +270,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', false, array( 'id' => 'submit-add-existing-user' ) ); ?>
 </form>
@@ -283,18 +283,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="field-row">
+			<div class="field-label"><?php _e( 'Username' ) ?></div>
+			<div class="field-input"><input type="text" class="regular-text" name="user[username]" /></div>
+		</div>
+		<div class="field-row">
+			<div class="field-label"><?php _e( 'Email' ) ?></div>
+			<div class="field-input"><input type="text" class="regular-text" name="user[email]" /></div>
+		</div>
+		<div class="field-row">
+			<div class="field-label"><?php _e( 'Role'); ?></div>
+			<div class="field-input"><select name="new_role" id="new_role_0">
 			<?php
 			reset( $editblog_roles );
 			foreach ( $editblog_roles as $role => $role_assoc ){
@@ -303,12 +303,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="field-row">
+			<div class="field-label label-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', false, array( 'id' => 'submit-add-user' ) ); ?>
 </form>
Index: wp-admin/network/user-new.php
===================================================================
--- wp-admin/network/user-new.php	(revision 19602)
+++ wp-admin/network/user-new.php	(working copy)
@@ -87,19 +87,19 @@
 	</div>
 <?php } ?>
 	<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="field-row form-required">
+			<div class="field-label"><?php _e( 'Username' ) ?></div>
+			<div class="field-input"><input type="text" class="regular-text" name="user[username]" /></div>
+		</div>
+		<div class="field-row form-required">
+			<div class="field-label"><?php _e( 'Email' ) ?></div>
+			<div><input type="text" class="regular-text" name="user[email]" /></div>
+		</div>
+		<div class="field-row">
+			<div class="field-label label-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>
