diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 37265d65f1..30fcf2fc84 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  class="edit_profile_panel"
   follows="all"
- height="585"
+ height="535"
  label="Profile Edit"
  layout="topleft"
  left="0"
@@ -60,7 +60,7 @@
  <scroll_container
      color="DkGray2"
      follows="all"
-     height="537"
+     height="494"
      min_height="300"
      layout="topleft"
      left="8"
@@ -74,7 +74,7 @@
          follows="left|top|right"
          layout="topleft"
          top="0"
-     height="537"
+     height="494"
      min_height="300"
          left="0"
          width="292">
@@ -83,110 +83,16 @@
      follows="left|top|right"
          layout="topleft"
          top="0"
-     height="537"
+     height="494"
      min_height="300"
          left="0"
          width="292">
-      <text
-     top="5"
-     follows="top|left"
-     height="13"
-     layout="topleft"
-     left="10"
-     name="display_name_label"
-     text_color="LtGray"
-     value="Display Name:"
-     width="80" />
-      <text
-     top="5"
-     follows="top|left"
-     height="13"
-     layout="topleft"
-     left="10"
-     name="solo_username_label"
-     text_color="LtGray"
-     value="Username:"
-     visible="false" 
-     width="80" />
-      <button
-         name="set_name"
-         layout="topleft"
-         follows="top|left"
-         image_overlay="Edit_Wrench"
-         top="21"
-         left="10"
-         height="23"
-         width="23"
-         tool_tip="Set Display Name"/>
-      <text
-       follows="top|left"
-       font="SansSerifBigBold"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="solo_user_name"
-       text_color="white"
-       top_delta="3"
-       value="Hamilton Hitchings"
-       use_ellipses="true"
-       visible="false"
-       width="275" />
-      <text
-       follows="top|left"
-       font="SansSerifBigBold"
-       height="20"
-       layout="topleft"
-       left="43"
-       name="user_name"
-       text_color="white"
-       top_delta="0"
-       value="Hamilton Hitchings"
-       use_ellipses="true"
-       visible="true"
-       width="250" />
-      <text
-       follows="top|left"
-       font="SansSerifBold"
-       height="20"
-       layout="topleft"
-       left_delta="0"
-       name="user_name_small"
-       text_color="white"
-       top_delta="-4"
-       value="Hamilton Hitchings"
-       use_ellipses="true"
-       visible="false"
-       wrap="true"
-       width="245" />
-      <text
-    follows="top|left"
-    height="13"
-    layout="topleft"
-    left="10"
-    name="user_label"
-    text_color="LtGray"
-    top_pad="8"
-    value="Username:"
-    width="70" />
-      <text
-       follows="top|left"
-       height="20"
-       layout="topleft"
-       left_pad="0"
-       name="user_slid"
-       text_color="EmphasisColor"
-        font="SansSerifBold"
-       top_delta="-2"
-       use_ellipses="true" 
-       value="hamilton.linden"
-       wrap="true" 
-       width="205" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
          height="244"
          layout="topleft"
-         top="65"
+         top="0"
          left="0"
          width="292">
 	 <panel
@@ -240,8 +146,8 @@
        height="102"
        layout="topleft"
        left="123"
-       top="90"
-       max_length="512"
+       top="25"
+       max_length="511"
        name="sl_description_edit"
        width="157"
        word_wrap="true">
@@ -296,8 +202,8 @@
        height="102"
        layout="topleft"
        left="123"
-       max_length="512"
-       top="223"
+       max_length="254"
+       top="157"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
@@ -384,22 +290,22 @@
          left="10"
          name="partner_data_panel"
          width="200">
-          <text
-           follows="left|top|right"
-           height="12"
-           initial_value="(retrieving)"
-           layout="topleft"
-           left="0"
-           name="partner_text"
-           top="0"
-           use_ellipses="true"
-           width="280"/>
+            <name_box
+             follows="left|top|right"
+             height="30"
+             initial_value="(retrieving)"
+             layout="topleft"
+             left="0"
+             link="true"
+             name="partner_text"
+             top="0"
+             width="200"
+             word_wrap="true" />
          </panel>
         <text
          follows="left|top"
          height="15"
          layout="topleft"
-           link="true"
          left="10"
          name="partner_edit_link"
          value="[[URL] Edit]"