Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 3003)
+++ wp-admin/users.php	(working copy)
@@ -3,7 +3,7 @@
 require_once( ABSPATH . WPINC . '/registration-functions.php');
 
 $title = __('Users');
-$parent_file = 'profile.php';
+$parent_file = 'users.php';
 	
 $action = $_REQUEST['action'];
 
Index: wp-admin/profile-update.php
===================================================================
--- wp-admin/profile-update.php	(revision 3003)
+++ wp-admin/profile-update.php	(working copy)
@@ -1,24 +0,0 @@
-<?php
-
-require_once('admin.php');
-
-check_admin_referer();
-
-$errors = edit_user($user_ID);
-
-if (count($errors) != 0) {
-	foreach ($errors as $id => $error) {
-		echo $error . '<br/>';
-	}
-	exit;
-}
-
-if ( 'profile' == $_POST['from'] )
-	$to = 'profile.php?updated=true';
-else
-	$to = 'profile.php?updated=true';
-
-wp_redirect( $to );
-exit;
-
-?>
\ No newline at end of file
Index: wp-admin/options-personal.php
===================================================================
--- wp-admin/options-personal.php	(revision 3003)
+++ wp-admin/options-personal.php	(working copy)
@@ -1,36 +1,149 @@
-<?php
+<?php 
 require_once('admin.php');
 
-$title = __('Personal Options');
+$title = 'Personal Options';
+
 $parent_file = 'options-personal.php';
+include_once('admin-header.php');
+$profileuser = new WP_User($user_ID);
+$profiledata = &$profileuser->data;
 
-include('admin-header.php');
+$bookmarklet_height= 440;
 ?>
 
-<div class="wrap"> 
-<h2><?php _e('Personal Options') ?></h2> 
-<form id="personal-options" method="post" action="options-personal-update.php"> 
+<div class="wrap">
+<h2><?php _e('Personal Options'); ?></h2>
+<form name="profile" id="your-profile" action="options-personal-update.php" method="post">
+<p>
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
+</p>
+
 <fieldset>
-<p><?php _e('Personal options are just for you, they don&#8217;t affect other users on blog.'); ?><input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="'rich_editing'<?php do_action('personal_option_list'); ?>" /></p>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Editing:') ?></th> 
-<td><label for="rich_editing">
-<input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
-<?php _e('Use the visual rich editor when writing') ?></label></td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('More:') ?></th> 
-<td>We should really figure out what else to put here.</td> 
-</tr> 
-<?php do_action('personal_options_table'); ?>
-</table>
+<legend><?php _e('Name'); ?></legend>
+<p><label><?php _e('Username: (no editing)'); ?><br />
+<input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
+</label></p>
+<p><label><?php _e('First name:') ?><br />
+<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
 
-</fieldset> 
+<p><label><?php _e('Middle name:') ?><br />
+<input type="text" name="middle_name" value="<?php echo $profiledata->middle_name ?>" /></label></p>
+
+<p><label><?php _e('Last name:') ?><br />
+<input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
+
+<p><label><?php _e('Nickname:') ?><br />
+<input type="text" name="nickname" value="<?php echo $profiledata->nickname ?>" /></label></p>
+
+</p><label><?php _e('Display name publicly as:') ?> <br />
+<select name="display_name">
+<option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option>
+<option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option>
+<option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option>
+<?php if ( !empty( $profiledata->first_name ) ) : ?>
+<option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option>
+<?php endif; ?>
+<?php if ( !empty( $profiledata->last_name ) ) : ?>
+<option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option>
+<?php endif; ?>
+<?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?>
+<option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option>
+<option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option>
+<?php if ( !empty( $profiledata->middle_name ) ) : ?>
+<option value="<?php echo $n = $profiledata->first_name." ".$profiledata->middle_name." ".$profiledata->last_name ?>"><?php echo $n ?></option>
+<?php endif; ?>
+<?php endif; ?>
+</select></label></p>
+</fieldset>
+
+<fieldset>
+<legend><?php _e('Contact Info'); ?></legend>
+
+<p><label><?php _e('E-mail: (required)') ?><br />
+<input type="text" name="email" value="<?php echo $profiledata->user_email ?>" /></label></p>
+
+<p><label><?php _e('Website:') ?><br />
+<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
+</label></p>
+
+<p><label><?php _e('Flickr Username:') ?><br />
+<input type="text" name="flickr_username" value="<?php echo $profiledata->flickr_username ?>" />
+</label></p>
+
+<p><label><?php _e('AIM:') ?><br />
+<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
+</label></p>
+
+<p><label><?php _e('Yahoo IM:') ?><br />
+<input type="text" name="yim" value="<?php echo $profiledata->yim ?>" />
+</label></p>
+
+<p><label><?php _e('Jabber / Google Talk:') ?>
+<input type="text" name="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
+</p>
+</fieldset>
+<br clear="all" />
+<fieldset>
+<legend><?php _e('About yourself'); ?></legend>
+<p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
+<p><textarea name="description" rows="5" cols="30"><?php echo $profiledata->description ?></textarea></p>
+</fieldset>
+
+<?php
+$show_password_fields = apply_filters('show_password_fields', true);
+if ( $show_password_fields ) :
+?>
+<fieldset>
+<legend><?php _e('Update Your Password'); ?></legend>
+<p class="desc"><?php _e('If you would like to change your password type a new one twice below. Otherwise leave this blank.'); ?></p>
+<p><label><?php _e('New Password:'); ?><br />
+<input type="password" name="pass1" size="16" value="" />
+</label></p>
+<p><label><?php _e('Type it one more time:'); ?><br />
+<input type="password" name="pass2" size="16" value="" />
+</label></p>
+</fieldset>
+<?php endif; ?>
+
+<?php do_action('show_user_profile'); ?>
+
+<br clear="all" />
+<fieldset>
+<legend><?php _e('Preferences'); ?></legend>
+<p class="desc"><?php _e('These options will only effect you, not everybody on your blog.'); ?></p>
+<p><label>
+<?php _e('Use the visual rich editor when wriitng: ') ?>
+<input name="rich_editing" type="checkbox" id="rich_editing" style="width: .75em;" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
+</p></label>
+</fieldset>
+<br clear="all" />
+	<table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
+    <?php
+    if(count($profileuser->caps) > count($profileuser->roles)):
+    ?>
+    <tr>
+      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
+      <td><?php 
+			$output = '';
+			foreach($profileuser->caps as $cap => $value) {
+				if(!$wp_roles->is_role($cap)) {
+					if($output != '') $output .= ', ';
+					$output .= $value ? $cap : "Denied: {$cap}";
+				}
+			}
+			echo $output;
+			?></td>
+    </tr>
+    <?php
+    endif;
+    ?>
+  </table>
 <p class="submit">
-<input type="submit" name="Submit" value="<?php _e('Update Personal Options') ?> &raquo;" />
+<input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
 </p>
-</form> 
-</div> 
-<?php include('admin-footer.php'); ?>
\ No newline at end of file
+</form>
+
+</div>
+
+<?php include('admin-footer.php'); ?>
Index: wp-admin/menu.php
===================================================================
--- wp-admin/menu.php	(revision 3003)
+++ wp-admin/menu.php	(working copy)
@@ -11,9 +11,7 @@
 $menu[25] = array(__('Presentation'), 'switch_themes', 'themes.php');
 $menu[30] = array(__('Plugins'), 'activate_plugins', 'plugins.php');
 if ( current_user_can('edit_users') )
-	$menu[35] = array(__('Users'), 'read', 'profile.php');
-else
-	$menu[35] = array(__('Profile'), 'read', 'profile.php');
+	$menu[35] = array(__('Users'), 'read', 'users.php');
 $menu[40] = array(__('Options'), 'read', 'options-personal.php');
 $menu[45] = array(__('Import'), 'import', 'import.php');
 
@@ -36,8 +34,7 @@
 $submenu['link-manager.php'][15] = array(__('Link Categories'), 'manage_links', 'link-categories.php');
 $submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
 
-$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
-$submenu['profile.php'][10] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
+$submenu['profile.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
 
 $submenu['options-personal.php'][5] = array(__('Personal'), 'read', 'options-personal.php');
 $submenu['options-personal.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
Index: wp-admin/options-personal-update.php
===================================================================
--- wp-admin/options-personal-update.php	(revision 3003)
+++ wp-admin/options-personal-update.php	(working copy)
@@ -5,8 +5,20 @@
 check_admin_referer();
 
 if ( isset( $_POST['action'] ) ) {
+	//Update User Info
+	$errors = edit_user($user_ID);
+
+	if (count($errors) != 0) {
+		foreach ($errors as $id => $error) {
+			echo $error . '<br/>';
+		}
+		exit;
+	}
+
+	//Update the personal options
 	if ( !isset( $_POST['rich_editing'] ) )
 		$_POST['rich_editing'] = 'false';
+
 	update_user_option( $current_user->id, 'rich_editing', $wpdb->escape($_POST['rich_editing']), true );
 	do_action('personal_options_update');
 
@@ -15,4 +27,4 @@
 	wp_redirect($goback);
 }
 
-?>
\ No newline at end of file
+?>
Index: wp-admin/profile.php
===================================================================
--- wp-admin/profile.php	(revision 3003)
+++ wp-admin/profile.php	(working copy)
@@ -1,140 +0,0 @@
-<?php 
-require_once('admin.php');
-
-$title = 'Profile';
-
-$parent_file = 'profile.php';
-include_once('admin-header.php');
-$profileuser = new WP_User($user_ID);
-$profiledata = &$profileuser->data;
-
-$bookmarklet_height= 440;
-?>
-
-<?php if ( isset($_GET['updated']) ) { ?>
-<div id="message" class="updated fade">
-<p><strong><?php _e('Profile updated.') ?></strong></p>
-</div>
-<?php } ?>
-
-<div class="wrap">
-<h2><?php _e('Your Profile'); ?></h2>
-<form name="profile" id="your-profile" action="profile-update.php" method="post">
-<p>
-<input type="hidden" name="from" value="profile" />
-<input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />
-</p>
-
-<fieldset>
-<legend><?php _e('Name'); ?></legend>
-<p><label><?php _e('Username: (no editing)'); ?><br />
-<input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
-</label></p>
-
-<p><label><?php _e('Role: (no editing)') ?><br />
-<input type="text" name="role" value="<?php echo $wp_roles->role_names[$profileuser->roles[0]] ?>" disabled="disabled" /></label></p>
-
-<p><label><?php _e('First name:') ?><br />
-<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
-
-<p><label><?php _e('Last name:') ?><br />
-<input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
-
-<p><label><?php _e('Nickname:') ?><br />
-<input type="text" name="nickname" value="<?php echo $profiledata->nickname ?>" /></label></p>
-
-</p><label><?php _e('Display name publicly as:') ?> <br />
-<select name="display_name">
-<option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option>
-<option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option>
-<option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option>
-<?php if ( !empty( $profiledata->first_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option>
-<?php endif; ?>
-<?php if ( !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option>
-<?php endif; ?>
-<?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option>
-<option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option>
-<?php endif; ?>
-</select></label></p>
-</fieldset>
-
-<fieldset>
-<legend><?php _e('Contact Info'); ?></legend>
-
-<p><label><?php _e('E-mail: (required)') ?><br />
-<input type="text" name="email" value="<?php echo $profiledata->user_email ?>" /></label></p>
-
-<p><label><?php _e('Website:') ?><br />
-<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
-</label></p>
-
-<p><label><?php _e('AIM:') ?><br />
-<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
-</label></p>
-
-<p><label><?php _e('Yahoo IM:') ?><br />
-<input type="text" name="yim" value="<?php echo $profiledata->yim ?>" />
-</label></p>
-
-<p><label><?php _e('Jabber / Google Talk:') ?>
-<input type="text" name="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
-</p>
-</fieldset>
-<br clear="all" />
-<fieldset>
-<legend><?php _e('About yourself'); ?></legend>
-<p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
-<p><textarea name="description" rows="5" cols="30"><?php echo $profiledata->description ?></textarea></p>
-</fieldset>
-
-<?php
-$show_password_fields = apply_filters('show_password_fields', true);
-if ( $show_password_fields ) :
-?>
-<fieldset>
-<legend><?php _e('Update Your Password'); ?></legend>
-<p class="desc"><?php _e('If you would like to change your password type a new one twice below. Otherwise leave this blank.'); ?></p>
-<p><label><?php _e('New Password:'); ?><br />
-<input type="password" name="pass1" size="16" value="" />
-</label></p>
-<p><label><?php _e('Type it one more time:'); ?><br />
-<input type="password" name="pass2" size="16" value="" />
-</label></p>
-</fieldset>
-<?php endif; ?>
-
-<?php do_action('show_user_profile'); ?>
-
-<br clear="all" />
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
-    <?php
-    if(count($profileuser->caps) > count($profileuser->roles)):
-    ?>
-    <tr>
-      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
-      <td><?php 
-			$output = '';
-			foreach($profileuser->caps as $cap => $value) {
-				if(!$wp_roles->is_role($cap)) {
-					if($output != '') $output .= ', ';
-					$output .= $value ? $cap : "Denied: {$cap}";
-				}
-			}
-			echo $output;
-			?></td>
-    </tr>
-    <?php
-    endif;
-    ?>
-  </table>
-<p class="submit">
-<input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
-</p>
-</form>
-
-</div>
-
-<?php include('admin-footer.php'); ?>