Index: options-discussion.php
===================================================================
--- options-discussion.php	(revision 3264)
+++ options-discussion.php	(working copy)
@@ -22,7 +22,7 @@
 <h2><?php _e('Discussion Options') ?></h2> 
 <form method="post" action="options.php"> 
 <fieldset class="options">
-<legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> 
+<legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend> 
 <ul> 
 <li> 
 <label for="default_pingback_flag"> 
Index: wp-admin.css
===================================================================
--- wp-admin.css	(revision 3264)
+++ wp-admin.css	(working copy)
@@ -539,7 +539,15 @@
 	width: 100%;
 }
 
-#postcustom table input, #postcustom table textarea {
+#metakeyselect {
+	width: 200px;
+}
+
+#metakeyinput {
+	width: 192px;
+}
+
+#metavalue {
 	width: 95%;
 }
 
@@ -551,21 +559,24 @@
 	width: 15em;
 }
 
-#template div {
-	margin-right: 190px;
+#template table {
+	width: 100%;
 }
 
 #template textarea {
 	font: small 'Courier New', Courier, monospace;
-	width: 99%;
+	width: 98%;
 }
 
 #templateside {
-	float: right;
 	width: 170px;
 }
 
-#templateside h3, #postcustom p {
+#templateside h3 {
+	margin: 0 0 0 3px;
+}
+
+#postcustom p {
 	margin: 0;
 }
 
Index: theme-editor.php
===================================================================
--- theme-editor.php	(revision 3264)
+++ theme-editor.php	(working copy)
@@ -110,46 +110,38 @@
 		echo '<h2>' . sprintf(__('Editing <code>%s</code>'), $file_show) . '</h2>';
 	} else {
 		echo '<h2>' . sprintf(__('Browsing <code>%s</code>'), $file_show) . '</h2>';
-	}
-	?>
-	<div id="templateside">
-  <h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
+	} ?>
 
-<?php
-if ($allowed_files) :
-?>
-  <ul>
-<?php foreach($allowed_files as $allowed_file) : ?>
-		 <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo get_file_description($allowed_file); ?></a></li>
-<?php endforeach; ?>
-  </ul>
-<?php endif; ?>
-</div> 
-	<?php
-	if (!$error) {
-	?> 
   <form name="template" id="template" action="theme-editor.php" method="post">
-		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-     <input type="hidden" name="theme" value="<?php echo $theme ?>" />
-		 </div>
+   <table cellpadding="4px">
+    <tr>
+     <td>
+<?php if (!$error) { ?> 
+      <textarea rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
+      <input type="hidden" name="action" value="update" /> 
+      <input type="hidden" name="file" value="<?php echo $file ?>" /> 
+      <input type="hidden" name="theme" value="<?php echo $theme ?>" />
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
-<?php
-	echo "<input type='submit' name='submit' value='	" . __('Update File') . " &raquo;' tabindex='2' />";
-?>
-</p>
+      <p class="submit"><input type='submit' name='submit' value='	<?php _e('Update File'); ?> &raquo;' tabindex='2' /></p>
 <?php else : ?>
-<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
+      <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
-	} else {
-		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-	}
-	?>
-<div class="clear"> &nbsp; </div>
+<?php } else echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>'; ?>
+     </td>
+     <td id="templateside" valign="top">
+      <h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
+<?php if ($allowed_files) : ?>
+      <ul>
+<?php foreach($allowed_files as $allowed_file) : ?>
+       <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo get_file_description($allowed_file); ?></a></li>
+<?php endforeach; ?>
+      </ul>
+<?php endif; ?>
+     </td>
+    </tr>
+   </table>
+  </form> 
+ <div class="clear"> &nbsp; </div>
 </div> 
 <?php
 break;
Index: admin-functions.php
===================================================================
--- admin-functions.php	(revision 3264)
+++ admin-functions.php	(working copy)
@@ -839,11 +839,11 @@
 <h3><?php _e('Add a new custom field:') ?></h3>
 <table cellspacing="3" cellpadding="3">
 	<tr>
-<th colspan="2"><?php _e('Key') ?></th>
+<th width="225px"><?php _e('Key') ?></th>
 <th><?php _e('Value') ?></th>
 </tr>
 	<tr valign="top">
-		<td align="right" width="18%">
+		<td align="right" width="225px">
 <?php if ($keys) : ?>
 <select id="metakeyselect" name="metakeyselect" tabindex="7">
 <option value="#NONE#"><?php _e('- Select -'); ?></option>
@@ -853,11 +853,10 @@
 		echo "\n\t<option value='$key'>$key</option>";
 	}
 ?>
-</select> <?php _e('or'); ?>
+</select><br /><?php _e('or'); ?> 
 <?php endif; ?>
-</td>
-<td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
-		<td><textarea id="metavalue" name="metavalue" rows="3" cols="25" tabindex="8"></textarea></td>
+<input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
+		<td><textarea id="metavalue" name="metavalue" rows="3" tabindex="8"></textarea></td>
 	</tr>
 
 </table>
Index: plugin-editor.php
===================================================================
--- plugin-editor.php	(revision 3264)
+++ plugin-editor.php	(working copy)
@@ -73,48 +73,48 @@
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif; ?>
  <div class="wrap"> 
-  <?php
+<?php
 	if (is_writeable($real_file)) {
 		echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
 	} else {
 		echo '<h2>' . sprintf(__('Browsing <strong>%s</strong>'), $file) . '</h2>';
-	}
-	?>
-	<div id="templateside">
-<h3><?php _e('Plugin files') ?></h3>
+	} ?>
 
+ <form name="template" id="template" action="plugin-editor.php" method="post">
+  <table cellpadding="2px">
+   <tr>
+    <td>
+<?php if (!$error) { ?> 
+     <textarea rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
+     <input type="hidden" name="action" value="update" /> 
+     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
+<?php if ( is_writeable($real_file) ) : ?>
+     <p class="submit"><input type='submit' name='submit' value='	<?php _e('Update File'); ?> &raquo;' tabindex='2' /></p>
+<?php else : ?>
+     <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
+<?php endif; ?>
+    </td>
+    <td id="templateside" valign="top">
+     <h3><?php _e('Plugin files') ?></h3>
 <?php
 if ($plugin_files) :
 ?>
-  <ul>
+     <ul>
 <?php foreach($plugin_files as $plugin_file) : ?>
-		 <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
+      <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
 <?php endforeach; ?>
-  </ul>
+     </ul>
 <?php endif; ?>
-</div>
-	<?php	if (!$error) { ?> 
-  <form name="template" id="template" action="plugin-editor.php" method="post">
-		 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-		</div>
-<?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
-<?php
-	echo "<input type='submit' name='submit' value='	" . __('Update File') . " &raquo;' tabindex='2' />";
-?>
-</p>
-<?php else : ?>
-<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
-<?php endif; ?>
-   </form> 
+    </td>
+   </tr>
+  </table>
+ </form> 
   <?php
 	} else {
 		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
 	}
 	?>
-<div class="clear"> &nbsp; </div>
+ <div class="clear"> &nbsp; </div>
 </div> 
 <?php
 break;
Index: import/blogger.php
===================================================================
--- import/blogger.php	(revision 3264)
+++ import/blogger.php	(working copy)
@@ -16,7 +16,7 @@
 
 		echo "<div class='wrap'><h2>$title</h2><p>$welcome</p>";
 		if ( function_exists('curl_init') )
-			echo "<iframe src='admin.php?import=blogger&amp;noheader=true' height='350px' width = '99%'>$noiframes</iframe><p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
+			echo "<iframe src='admin.php?import=blogger&amp;noheader=true' height='350px' width = '666px'>$noiframes</iframe><p><a href='admin.php?import=blogger&amp;restart=true&amp;noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
 		else
 			echo "<p>$incompat</p>";
 		echo "</div>\n";