diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index e261e8540..6a36c3a8e 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -216,28 +216,30 @@ function has_meta($postid) {
 function list_meta($meta) {
 	global $post_ID;	
 	// Exit if no meta
-	if (!$meta) return;
-
-	
-	print "
-	<table id='meta-list'>
-		<tr>
-			<th>Key</th>
-			<th>Value</th>
-			<th>&nbsp</th>
-		</tr>\n";
+	if (!$meta) return;	
+?>
+<table id='meta-list' width='98%'>
+	<tr>
+		<th><?php _e('Key') ?></th>
+		<th><?php _e('Value') ?></th>
+		<th colspan='2'><?php _e('Action') ?></th>
+	</tr>
+<?php
 		
 	foreach ($meta as $entry) {
-		// TBD: Still need to add edit/del logic...
-		print "
-		<tr>
-			<td>{$entry['meta_key']}</td>
-			<td>{$entry['meta_value']}</td>
-			<td><a href=\"?action=deletemeta&amp;meta_id={$entry['meta_id']}&amp;post={$entry['post_id']}\">Delete</a></td>
-		</tr>\n";
+		$style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
+		echo "
+	<tr $style>
+		<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' value='{$entry['meta_key']}' /></td>
+		<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='40'>{$entry['meta_value']}</textarea></td>
+		<td align='center'><input name='updatemeta' type='submit' id='updatemeta' tabindex='6' value='" . __('Update') ."' /></td>
+		<td align='center'><input name='deletemeta[{$entry['meta_id']}]' type='submit' id='deletemeta' tabindex='6' value='" . __('Delete') ."' /></td>
+	</tr>
+";
 	}
-	print "
-	</table>\n";
+	echo "
+	</table>
+";
 }
 
 // Get a list of previously defined keys
@@ -256,43 +258,37 @@ function get_meta_keys() {
 function meta_form() {
 	$keys = get_meta_keys();
 ?>
-<h4><?php _e('Add new custom data to this post:') ?></h4>
-<div id="postcustomkeys">
-<p><?php _e('Select existing key or enter new key') ?></p>
-<?php
-if ($keys) {
-?>
-<select id="metakeyselect" name="metakeyselect">
+<h3><?php _e('Add new custom data to this post:') ?></h3>
+<table width="100%" cellspacing="3" cellpadding="3">
+	<tr>
+<th colspan="2"><?php _e('Key') ?></th>
+<th><?php _e('Value') ?></th>
+<th></th>
+</tr>
+	<tr valign="top">
+		<td align="right"><select id="metakeyselect" name="metakeyselect">
 <option value="#NONE#">- Select -</option>
 <?php
 	foreach($keys as $key) {
-		echo "<option value='$key'>$key</option>\n";
+		echo "\n\t<option value='$key'>$key</option>";
 	}
 ?>
-</select>
-<?php
-} // if ($keys)
-?>
-<input type="text" id="metakeyinput" name="metakeyinput" />
-</div>
-<div id="postcustomvals">
-<p><?php _e('Custom Value') ?></p>
+</select> or </td><td><input type="text" id="metakeyinput" name="metakeyinput" /></td>
+		<td><textarea id="metavalue" name="metavalue" rows="3" cols="25"></textarea></td>
+		<td></td>
+	</tr>
 
-<textarea id="metavalue" name="metavalue" rows="3" cols="25"></textarea>
-</div>
-<br style="clear: both;" />
-<div id="postcustomsubmit">
-<input type="submit" id="save" name="save" value="<?php _e('Add Custom') ?>">
-</div>
+</table>
+<p class="submit"><input type="submit" id="save" name="save" value="<?php _e('Add Custom Fields &raquo;') ?>"></p>
 <?php
 }
 
 function add_meta($post_ID) {
 	global $wpdb, $tablepostmeta;
 	
-	$metakeyselect = trim($_POST['metakeyselect']);
-	$metakeyinput = trim($_POST['metakeyinput']);
-	$metavalue = trim($_POST['metavalue']);
+	$metakeyselect = $wpdb->escape( stripslashes( trim($_POST['metakeyselect']) ) );
+	$metakeyinput  = $wpdb->escape( stripslashes( trim($_POST['metakeyinput']) ) );
+	$metavalue     = $wpdb->escape( stripslashes( trim($_POST['metavalue']) ) );
 
 	if (!empty($metavalue) && ((('#NONE#' != $metakeyselect) && !empty($metakeyselect)) || !empty($metakeyinput))) {
 		// We have a key/value pair. If both the select and the 
@@ -314,7 +310,7 @@ function add_meta($post_ID) {
 
 function del_meta($mid) {
 	global $wpdb, $tablepostmeta;
-	
+
 	$result = $wpdb->query("DELETE FROM $tablepostmeta WHERE meta_id = '$mid'");
 }
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index a5c1e9fdd..8cf4bf5cb 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -139,19 +139,6 @@ if ($action != 'editcomment') {
     }
 }
 ?>
-<fieldset id="postcustom">
-<legend><?php _e('Post Custom') ?></legend>
-<?php 
-if($metadata = has_meta($post_ID)) {
-?>
-<?php
-	list_meta($metadata); 
-?>
-<?php
-}
-	meta_form();
-?>
-</fieldset>
 
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>
@@ -179,11 +166,23 @@ if ('' != $pinged) {
 if ($user_level > 4) {
 	touch_time(($action == 'edit'));
 }
-if ('edit' == $action) echo "
-<p><a href='post.php?action=delete&amp;post=$post_ID' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), addslashes($edited_post_title)) . "')\">" .  __('Delete this post') . "</a></p>";
 ?>
-
+<fieldset id="postcustom">
+<legend><?php _e('Custom Fields') ?></legend>
+<?php 
+if($metadata = has_meta($post_ID)) {
+?>
+<?php
+	list_meta($metadata); 
+?>
+<?php
+}
+	meta_form();
+?>
+</fieldset>
 </div>
 </form>
-
+<?php if ('edit' == $action) echo "
+<p><a class='delete' href='post.php?action=delete&amp;post=$post_ID' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), addslashes($edited_post_title)) . "')\">" .  __('Delete this post') . "</a></p>";
+?>
 </div>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index c54428787..67a6e4417 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -329,7 +329,7 @@ textarea, input, select {
 	border: 1px solid #aaa;
 	margin: 0.25em;
 	padding: 0.25em;
-	width: 30em;
+	width: 98%;
 }
 
 #postcustom p {
@@ -337,28 +337,27 @@ textarea, input, select {
 }
 
 #postcustom table {
-	background-color: #eee;
 	border: 1px solid #ccc;
-	color: #000;
-	margin-bottom: 1em;
-	padding: 0px;
+	margin: .5em;
 	width: 100%;
+	
+}
+
+#postcustom table input, #postcustom table textarea {
+	width: 97%;
 }
 
 #postcustom td, #postcustom th {
 	color: #000;
-	margin: 1px;
-	padding: 0.2em;
+	margin: 0.2em;
+	padding: .3em;
 }
 
-#postcustomkeys {
-	float: left;
-	width: 49%;
+#postcustom #updatemeta, #postcustom #deletemeta {
+	width: 90%;
+	margin: auto;
 }
 
-#postcustomkeys input, #postcustom select, #postcustom textarea {
-	width: 95%;
-}
 fieldset legend a {
 	border-bottom: none;
 }