[evolution] Switch back to an older version with my changes.



commit 5c105c137f166922678cd7b48e9875ab7d56c9e0
Author: Michael Meeks <michael meeks novell com>
Date:   Thu Mar 25 20:03:05 2010 +0000

    Switch back to an older version with my changes.

 addressbook/gui/contact-editor/contact-editor.ui | 1962 ++++++++++++++++------
 1 files changed, 1491 insertions(+), 471 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index 94a919c..fe53b70 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0"?>
+<!--*- mode: xml -*-->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-requires evolution 0.0 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="model1">
     <columns>
-      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="model2">
     <columns>
-      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -25,7 +21,6 @@
   </object>
   <object class="GtkListStore" id="model3">
     <columns>
-      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -39,7 +34,6 @@
   </object>
   <object class="GtkListStore" id="model4">
     <columns>
-      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -53,7 +47,6 @@
   </object>
   <object class="GtkListStore" id="model5">
     <columns>
-      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -67,13 +60,22 @@
   </object>
   <object class="GtkDialog" id="contact editor">
     <property name="title" translatable="yes">Contact Editor</property>
-    <property name="window_position">center</property>
-    <property name="type_hint">dialog</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="decorated">True</property>
+    <property name="skip_taskbar_hint">False</property>
+    <property name="skip_pager_hint">False</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+    <property name="focus_on_map">True</property>
+    <property name="urgency_hint">False</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="homogeneous">False</property>
         <property name="spacing">0</property>
 	<property name="orientation">vertical</property>
@@ -125,39 +127,47 @@
         </child>
         <child>
           <object class="GtkNotebook" id="notebook11">
+            <property name="border_width">12</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="border_width">12</property>
+            <property name="show_tabs">True</property>
+            <property name="show_border">True</property>
+            <property name="tab_pos">GTK_POS_TOP</property>
+            <property name="scrollable">False</property>
+            <property name="enable_popup">False</property>
             <child>
               <object class="GtkVBox" id="vbox33">
-                <property name="visible">True</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
                 <property name="spacing">1</property>
 		<property name="orientation">vertical</property>
                 <child>
                   <object class="GtkHBox" id="hbox55">
                     <property name="visible">True</property>
+                    <property name="homogeneous">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkButton" id="button-image">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="button-image-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Image</property>
-                          </object>
-                        </child>
+                        <property name="relief">GTK_RELIEF_NORMAL</property>
+                        <property name="focus_on_click">True</property>
                         <child>
                           <object class="EImageChooser" type-func="e_image_chooser_get_type" id="image-chooser">
                             <property name="visible">True</property>
                           </object>
                         </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="a11y-button-image1">
+                            <property name="AtkObject::accessible_name" translatable="yes">Image</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
+                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="position">0</property>
+                        <property name="fill">True</property>
                       </packing>
                     </child>
                     <child>
@@ -165,89 +175,144 @@
                         <property name="visible">True</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">4</property>
-                        <property name="column_spacing">6</property>
+                        <property name="homogeneous">False</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label-nickname">
                             <property name="visible">True</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Nic_kname:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-nickname</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-fullname">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="button-fullname"/>
+                              <relation target="button-fullname" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="accellabel-fileas">
                             <property name="visible">True</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">_File under:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">combo-file-as</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="where-label">
                             <property name="visible">True</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">_Where:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="button-categories">
-                            <property name="label" translatable="yes">Ca_tegories...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
+                            <property name="label" translatable="yes">Ca_tegories...</property>
                             <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-categories">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="button-categories"/>
+                              <relation target="button-categories" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -255,18 +320,26 @@
                             <property name="right_attach">4</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-nickname">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="right_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
@@ -278,26 +351,34 @@
                             <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="button-fullname">
-                            <property name="label" translatable="yes">Full _Name...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
+                            <property name="label" translatable="yes">Full _Name...</property>
                             <property name="use_underline">True</property>
+                            <property name="relief">GTK_RELIEF_NORMAL</property>
+                            <property name="focus_on_click">True</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBoxEntry" id="combo-file-as">
                             <property name="visible">True</property>
+                            <property name="add_tearoffs">False</property>
+                            <property name="has_frame">True</property>
+                            <property name="focus_on_click">True</property>
                             <property name="model">model1</property>
                           </object>
                           <packing>
@@ -305,20 +386,22 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">1</property>
+                        <property name="padding">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="padding">0</property>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -326,99 +409,134 @@
                     <property name="visible">True</property>
                   </object>
                   <packing>
+                    <property name="padding">6</property>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="padding">6</property>
-                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox34">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="homogeneous">False</property>
                     <property name="spacing">10</property>
 		    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkFrame" id="frame65">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
                           <object class="GtkTable" id="email-table">
-                            <property name="visible">True</property>
                             <property name="border_width">12</property>
+                            <property name="visible">True</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">4</property>
-                            <property name="column_spacing">6</property>
+                            <property name="homogeneous">False</property>
                             <property name="row_spacing">6</property>
+                            <property name="column_spacing">6</property>
                             <child>
                               <object class="GtkEntry" id="entry-email-2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-email-1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-email-3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="y_options"></property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-email-4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton-htmlmail">
-                                <property name="label" translatable="yes">_Wants to receive HTML mail</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
+                                <property name="label" translatable="yes">_Wants to receive HTML mail</property>
                                 <property name="use_underline">True</property>
+                                <property name="relief">GTK_RELIEF_NORMAL</property>
+                                <property name="focus_on_click">True</property>
+                                <property name="active">False</property>
+                                <property name="inconsistent">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
+                                <property name="left_attach">0</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-email-1">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                                 <property name="model">model2</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer2"/>
@@ -428,13 +546,19 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-email-2">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                                 <property name="model">model3</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer3"/>
@@ -444,15 +568,19 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-email-3">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                                 <property name="model">model4</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer4"/>
@@ -464,13 +592,17 @@
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-email-4">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                                 <property name="model">model5</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer5"/>
@@ -484,23 +616,13 @@
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="label400">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Email</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
                               <object class="GtkHBox" id="hbox561">
                                 <property name="visible">True</property>
                                 <property name="homogeneous">False</property>
@@ -569,13 +691,11 @@
                          <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox38">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <property name="homogeneous">False</property>
                         <property name="spacing">0</property>
 			<property name="orientation">vertical</property>
@@ -583,12 +703,13 @@
                           <object class="GtkFrame" id="frame64">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
+                            <property name="label_yalign">0.5</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <object class="GtkVBox" id="vbox37">
-                                <property name="visible">True</property>
                                 <property name="border_width">12</property>
-                                <property name="orientation">vertical</property>
+                                <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
                                 <property name="spacing">6</property>
 				<property name="orientation">vertical</property>
                                 <child>
@@ -596,208 +717,300 @@
                                     <property name="visible">True</property>
                                     <property name="n_rows">2</property>
                                     <property name="n_columns">4</property>
-                                    <property name="column_spacing">6</property>
+                                    <property name="homogeneous">False</property>
                                     <property name="row_spacing">6</property>
+                                    <property name="column_spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-2">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-4">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">3</property>
                                         <property name="right_attach">4</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-3">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">3</property>
                                         <property name="right_attach">4</property>
-                                        <property name="y_options"></property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-1">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-2">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-3">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>
                                         <property name="right_attach">3</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-4">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
-                                    <property name="position">0</property>
+                                    <property name="fill">True</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkTable" id="table-phone-extended">
                                     <property name="n_rows">2</property>
                                     <property name="n_columns">4</property>
-                                    <property name="column_spacing">6</property>
+                                    <property name="homogeneous">False</property>
                                     <property name="row_spacing">6</property>
+                                    <property name="column_spacing">6</property>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-5">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-6">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-7">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">3</property>
                                         <property name="right_attach">4</property>
-                                        <property name="y_options"></property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="entry-phone-8">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="max_length">0</property>
+                                        <property name="text" translatable="yes"/>
+                                        <property name="has_frame">True</property>
+                                        <property name="activates_default">False</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">3</property>
                                         <property name="right_attach">4</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"></property>
+                                        <property name="y_options"/>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-5">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-6">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
+                                        <property name="left_attach">0</property>
+                                        <property name="right_attach">1</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-7">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>
                                         <property name="right_attach">3</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="top_attach">0</property>
+                                        <property name="bottom_attach">1</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="combobox-phone-8">
                                         <property name="visible">True</property>
+                                        <property name="add_tearoffs">False</property>
+                                        <property name="focus_on_click">True</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">2</property>
                                         <property name="right_attach">3</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options">GTK_FILL</property>
+                                        <property name="x_options">fill</property>
+                                        <property name="y_options">fill</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
-                                    <property name="position">1</property>
+                                    <property name="fill">True</property>
                                   </packing>
                                 </child>
                               </object>
@@ -805,19 +1018,32 @@
                             <child type="label">
                               <object class="GtkHBox" id="hbox56">
                                 <property name="visible">True</property>
+                                <property name="homogeneous">False</property>
                                 <property name="spacing">4</property>
                                 <child>
                                   <object class="GtkLabel" id="label399">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Telephone</property>
+                                    <property name="use_underline">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
                                     </attributes>
                                   </object>
                                   <packing>
+                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -826,141 +1052,196 @@
                                     <property name="height_request">20</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="relief">none</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="button-phone-expand-atkobject">
-                                        <property name="AtkObject::accessible-name" translatable="yes">Telephone</property>
-                                      </object>
-                                    </child>
+                                    <property name="relief">GTK_RELIEF_NONE</property>
+                                    <property name="focus_on_click">True</property>
                                     <child>
                                       <object class="GtkArrow" id="arrow-phone-expand">
                                         <property name="visible">True</property>
-                                        <property name="shadow_type">none</property>
+                                        <property name="arrow_type">GTK_ARROW_RIGHT</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <property name="xalign">0.5</property>
+                                        <property name="yalign">0.5</property>
+                                        <property name="xpad">0</property>
+                                        <property name="ypad">0</property>
+                                      </object>
+                                    </child>
+                                    <child internal-child="accessible">
+                                      <object class="AtkObject" id="a11y-button-phone-expand1">
+                                        <property name="AtkObject::accessible_name" translatable="yes">Telephone</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="position">1</property>
+                                    <property name="padding">0</property>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                   </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
                           <packing>
+                            <property name="padding">0</property>
                             <property name="expand">False</property>
-                            <property name="position">0</property>
+                            <property name="fill">True</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="position">1</property>
+                        <property name="fill">True</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame66">
                         <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="label_yalign">0.5</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
                           <object class="GtkTable" id="table86">
-                            <property name="visible">True</property>
                             <property name="border_width">12</property>
+                            <property name="visible">True</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">4</property>
-                            <property name="column_spacing">6</property>
+                            <property name="homogeneous">False</property>
                             <property name="row_spacing">6</property>
+                            <property name="column_spacing">6</property>
                             <child>
                               <object class="GtkEntry" id="entry-im-name-1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-im-name-3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-im-name-2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="y_options"></property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="entry-im-name-4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="editable">True</property>
+                                <property name="visibility">True</property>
+                                <property name="max_length">0</property>
+                                <property name="text" translatable="yes"/>
+                                <property name="has_frame">True</property>
+                                <property name="activates_default">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-im-service-1">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                               </object>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-im-service-3">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                               </object>
                               <packing>
+                                <property name="left_attach">0</property>
+                                <property name="right_attach">1</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-im-service-2">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="top_attach">0</property>
+                                <property name="bottom_attach">1</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox" id="combobox-im-service-4">
                                 <property name="visible">True</property>
+                                <property name="add_tearoffs">False</property>
+                                <property name="focus_on_click">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_options">fill</property>
+                                <property name="y_options">fill</property>
                               </packing>
                             </child>
                           </object>
@@ -969,6 +1250,18 @@
                           <object class="GtkLabel" id="label404">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Instant Messaging</property>
+                            <property name="use_underline">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0.5</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
                             </attributes>
@@ -976,125 +1269,200 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="position">2</property>
+                        <property name="fill">True</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
+              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label405">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Contact</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
               </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox35">
-                <property name="visible">True</property>
                 <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
                 <property name="spacing">12</property>
 		<property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="frame67">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkTable" id="table87">
-                        <property name="visible">True</property>
                         <property name="border_width">12</property>
+                        <property name="visible">True</property>
                         <property name="n_rows">5</property>
                         <property name="n_columns">2</property>
-                        <property name="column_spacing">6</property>
+                        <property name="homogeneous">False</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="accellabel-homepage">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Home Page:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-homepage</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-caluri">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Calendar:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-caluri</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-fburl">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Free/Busy:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-fburl</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-videourl">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Video Chat:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-videourl</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="EUrlEntry" type-func="e_url_entry_get_type" id="entry-homepage">
                             <property name="visible">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="entry-homepage-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Home Page:</property>
+                              <object class="AtkObject" id="a11y-entry-homepage">
+                                <property name="AtkObject::accessible_name" translatable="yes">Home Page:</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="EUrlEntry" type-func="e_url_entry_get_type" id="entry-caluri">
                             <property name="visible">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="entry-caluri-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Calendar:</property>
+                              <object class="AtkObject" id="a11y-entry-caluri">
+                                <property name="AtkObject::accessible_name" translatable="yes">Calendar:</property>
                               </object>
                             </child>
                           </object>
@@ -1103,15 +1471,15 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="EUrlEntry" type-func="e_url_entry_get_type" id="entry-fburl">
                             <property name="visible">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="entry-fburl-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Free/Busy:</property>
+                              <object class="AtkObject" id="a11y-entry-fburl">
+                                <property name="AtkObject::accessible_name" translatable="yes">Free/Busy:</property>
                               </object>
                             </child>
                           </object>
@@ -1120,15 +1488,15 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="EUrlEntry" type-func="e_url_entry_get_type" id="entry-videourl">
                             <property name="visible">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="entry-videourl-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Video Chat:</property>
+                              <object class="AtkObject" id="a11y-entry-videourl">
+                                <property name="AtkObject::accessible_name" translatable="yes">Video Chat:</property>
                               </object>
                             </child>
                           </object>
@@ -1137,30 +1505,43 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-weblog">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Web Log:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-weblog</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="EUrlEntry" type-func="e_url_entry_get_type" id="entry-weblog">
                             <property name="visible">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="entry-weblog-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Web Log:</property>
+                              <object class="AtkObject" id="a11y-entry-weblog">
+                                <property name="AtkObject::accessible_name" translatable="yes">Web Log:</property>
                               </object>
                             </child>
                           </object>
@@ -1169,8 +1550,8 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                       </object>
@@ -1179,6 +1560,18 @@
                       <object class="GtkLabel" id="label410">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Web Addresses</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1186,100 +1579,166 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="position">0</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame68">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkTable" id="table88">
-                        <property name="visible">True</property>
                         <property name="border_width">12</property>
+                        <property name="visible">True</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">4</property>
-                        <property name="column_spacing">6</property>
+                        <property name="homogeneous">False</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label-profession">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Profession:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-profession</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-profession">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-profession"/>
+                              <relation target="label-profession" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-jobtitle">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Title:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-jobtitle</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-jobtitle">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-jobtitle"/>
+                              <relation target="label-jobtitle" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="right_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-company">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Company:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-company</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-company">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-company"/>
+                              <relation target="label-company" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -1287,32 +1746,49 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-department">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Department:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-department</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-department">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-department"/>
+                              <relation target="label-department" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -1320,30 +1796,49 @@
                             <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-manager">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Manager:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-manager</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-manager">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-manager"/>
+                              <relation target="label-manager" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -1351,32 +1846,49 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-assistant">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Assistant:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-assistant</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-assistant">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-assistant"/>
+                              <relation target="label-assistant" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -1384,7 +1896,7 @@
                             <property name="right_attach">4</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                       </object>
@@ -1393,6 +1905,18 @@
                       <object class="GtkLabel" id="label417">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Job</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1400,71 +1924,116 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="position">1</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame69">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkTable" id="table89">
-                        <property name="visible">True</property>
                         <property name="border_width">12</property>
+                        <property name="visible">True</property>
                         <property name="n_rows">2</property>
                         <property name="n_columns">4</property>
-                        <property name="column_spacing">6</property>
+                        <property name="homogeneous">False</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label-office">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Office:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-office</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-spouse">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Spouse:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">entry-spouse</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="left_attach">0</property>
+                            <property name="right_attach">1</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-office">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-office"/>
+                              <relation target="label-office" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry-spouse">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="editable">True</property>
+                            <property name="visibility">True</property>
+                            <property name="max_length">0</property>
+                            <property name="text" translatable="yes"/>
+                            <property name="has_frame">True</property>
+                            <property name="activates_default">False</property>
                             <accessibility>
-                              <relation type="labelled-by" target="label-spouse"/>
+                              <relation target="label-spouse" type="labelled-by"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -1472,51 +2041,75 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-birthday">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Birthday:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">dateedit-birthday</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label-anniversary">
                             <property name="visible">True</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">_Anniversary:</property>
                             <property name="use_underline">True</property>
+                            <property name="use_markup">False</property>
+                            <property name="justify">GTK_JUSTIFY_LEFT</property>
+                            <property name="wrap">False</property>
+                            <property name="selectable">False</property>
+                            <property name="xalign">1</property>
+                            <property name="yalign">0.5</property>
+                            <property name="xpad">0</property>
+                            <property name="ypad">0</property>
                             <property name="mnemonic_widget">dateedit-anniversary</property>
+                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                            <property name="width_chars">-1</property>
+                            <property name="single_line_mode">False</property>
+                            <property name="angle">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
                           <object class="EDateEdit" type-func="e_date_edit_get_type" id="dateedit-anniversary">
                             <property name="visible">True</property>
-                            <property name="allow_no_date_set">True</property>
-                            <property name="show_time">False</property>
-                            <property name="twodigit_year_can_future">False</property>
-                            <property name="set_none">True</property>
+                            <property name="allow-no-date-set">True</property>
+                            <property name="show-time">False</property>
+                            <property name="set-none">True</property>
+			    <property name="twodigit-year-can-future">False</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="dateedit-anniversary-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Anniversary</property>
+                              <object class="AtkObject" id="a11y-dateedit-anniversary">
+                                <property name="AtkObject::accessible_name" translatable="yes">Anniversary</property>
                               </object>
                             </child>
                           </object>
@@ -1525,28 +2118,30 @@
                             <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                         <child>
                           <object class="EDateEdit" type-func="e_date_edit_get_type" id="dateedit-birthday">
                             <property name="visible">True</property>
-                            <property name="allow_no_date_set">True</property>
-                            <property name="show_time">False</property>
-                            <property name="twodigit_year_can_future">False</property>
-                            <property name="set_none">True</property>
+                            <property name="allow-no-date-set">True</property>
+                            <property name="show-time">False</property>
+                            <property name="set-none">True</property>
+			    <property name="twodigit-year-can-future">False</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="dateedit-birthday-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Birthday</property>
+                              <object class="AtkObject" id="a11y-dateedit-birthday">
+                                <property name="AtkObject::accessible_name" translatable="yes">Birthday</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="right_attach">4</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top_attach">0</property>
+                            <property name="bottom_attach">1</property>
+                            <property name="x_options">fill</property>
+                            <property name="y_options">fill</property>
                           </packing>
                         </child>
                       </object>
@@ -1555,6 +2150,18 @@
                       <object class="GtkLabel" id="label421">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Miscellaneous</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1562,137 +2169,206 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label422">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Personal Information</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
               </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox39">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="homogeneous">False</property>
                 <property name="spacing">0</property>
 		<property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="frame72">
-                    <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
                         <property name="border_width">6</property>
-                        <property name="yalign">0.15000000596046448</property>
-                        <property name="yscale">0.69999998807907104</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.15000000596</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">0.699999988079</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
                         <property name="left_padding">19</property>
                         <property name="right_padding">10</property>
                         <child>
                           <object class="GtkHBox" id="hbox59">
                             <property name="height_request">50</property>
                             <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkTable" id="table-home-address">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
-                                <property name="column_spacing">6</property>
+                                <property name="homogeneous">False</property>
                                 <property name="row_spacing">6</property>
+                                <property name="column_spacing">6</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow-home-address">
                                     <property name="width_request">193</property>
                                     <property name="height_request">69</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
                                     <child>
                                       <object class="GtkTextView" id="textview-home-address">
                                         <property name="height_request">25</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="overwrite">False</property>
                                         <property name="accepts_tab">False</property>
+                                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                        <property name="cursor_visible">True</property>
+                                        <property name="pixels_above_lines">0</property>
+                                        <property name="pixels_below_lines">0</property>
+                                        <property name="pixels_inside_wrap">0</property>
+                                        <property name="left_margin">0</property>
+                                        <property name="right_margin">0</property>
+                                        <property name="indent">0</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="top_attach">0</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options">fill</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="entry-home-city">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-city">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_City:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-home-city</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
                                     <property name="single_line_mode">True</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="entry-home-zip">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-zip">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Zip/Postal Code:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-home-zip</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -1700,30 +2376,47 @@
                                     <property name="width_request">256</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-state">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_State/Province:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-home-state</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -1731,31 +2424,47 @@
                                     <property name="width_request">163</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-country">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="ypad">4</property>
                                     <property name="label" translatable="yes">_Country:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">4</property>
                                     <property name="mnemonic_widget">entry-home-country</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -1763,52 +2472,82 @@
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-pobox">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_PO Box:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-home-pobox</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-home-address">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Address:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">textview-home-address</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                               </packing>
                             </child>
                           </object>
@@ -1818,8 +2557,19 @@
                     <child type="label">
                       <object class="GtkLabel" id="frame73">
                         <property name="visible">True</property>
-                        <property name="xalign">0.41999998688697815</property>
                         <property name="label" translatable="yes">Home</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.419999986887</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -1827,128 +2577,203 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame77">
-                    <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkAlignment" id="alignment6">
-                        <property name="visible">True</property>
                         <property name="border_width">6</property>
-                        <property name="yalign">0.15000000596046448</property>
-                        <property name="yscale">0.69999998807907104</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.15000000596</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">0.699999988079</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
                         <property name="left_padding">19</property>
                         <property name="right_padding">10</property>
                         <child>
                           <object class="GtkHBox" id="hbox98">
                             <property name="height_request">50</property>
                             <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkTable" id="table-work-address">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
-                                <property name="column_spacing">6</property>
+                                <property name="homogeneous">False</property>
                                 <property name="row_spacing">6</property>
+                                <property name="column_spacing">6</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow-work-address">
                                     <property name="width_request">193</property>
                                     <property name="height_request">69</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
                                     <child>
                                       <object class="GtkTextView" id="textview-work-address">
                                         <property name="height_request">25</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="overwrite">False</property>
                                         <property name="accepts_tab">False</property>
+                                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                        <property name="cursor_visible">True</property>
+                                        <property name="pixels_above_lines">0</property>
+                                        <property name="pixels_below_lines">0</property>
+                                        <property name="pixels_inside_wrap">0</property>
+                                        <property name="left_margin">0</property>
+                                        <property name="right_margin">0</property>
+                                        <property name="indent">0</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="top_attach">0</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options">fill</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="entry-work-city">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-city">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_City:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-work-city</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
                                     <property name="single_line_mode">True</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-address">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Address:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">textview-work-address</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="entry-work-zip">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-zip">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Zip/Postal Code:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-work-zip</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -1956,30 +2781,47 @@
                                     <property name="width_request">256</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-state">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_State/Province:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-work-state</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -1987,31 +2829,47 @@
                                     <property name="width_request">163</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-country">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="ypad">4</property>
                                     <property name="label" translatable="yes">_Country:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">4</property>
                                     <property name="mnemonic_widget">entry-home-country</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -2019,39 +2877,54 @@
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-work-pobox">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_PO Box:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-work-pobox</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                               </packing>
                             </child>
                           </object>
@@ -2061,8 +2934,19 @@
                     <child type="label">
                       <object class="GtkLabel" id="label460">
                         <property name="visible">True</property>
-                        <property name="xalign">0.41999998688697815</property>
                         <property name="label" translatable="yes">Work</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.419999986887</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2070,102 +2954,164 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">1</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame78">
-                    <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkAlignment" id="alignment7">
-                        <property name="visible">True</property>
                         <property name="border_width">6</property>
-                        <property name="yalign">0.15000000596046448</property>
-                        <property name="yscale">0.69999998807907104</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.15000000596</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">0.699999988079</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
                         <property name="left_padding">19</property>
                         <property name="right_padding">10</property>
                         <child>
                           <object class="GtkHBox" id="hbox103">
                             <property name="height_request">50</property>
                             <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkTable" id="table-other-address">
                                 <property name="visible">True</property>
                                 <property name="n_rows">4</property>
                                 <property name="n_columns">4</property>
-                                <property name="column_spacing">6</property>
+                                <property name="homogeneous">False</property>
                                 <property name="row_spacing">6</property>
+                                <property name="column_spacing">6</property>
                                 <child>
                                   <object class="GtkEntry" id="entry-other-city">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-city">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_City:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-other-city</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
                                     <property name="single_line_mode">True</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-address">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Address:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">textview-other-address</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                    <property name="bottom_attach">1</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="entry-other-zip">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-zip">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_Zip/Postal Code:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-other-zip</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -2173,30 +3119,47 @@
                                     <property name="width_request">256</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-state">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_State/Province:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-other-state</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -2204,31 +3167,47 @@
                                     <property name="width_request">163</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-country">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
-                                    <property name="ypad">4</property>
                                     <property name="label" translatable="yes">_Country:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">4</property>
                                     <property name="mnemonic_widget">entry-other-country</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -2236,28 +3215,47 @@
                                     <property name="width_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="visibility">True</property>
+                                    <property name="max_length">0</property>
+                                    <property name="text" translatable="yes"/>
+                                    <property name="has_frame">True</property>
+                                    <property name="activates_default">False</property>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label-other-pobox">
                                     <property name="visible">True</property>
-                                    <property name="xalign">1</property>
                                     <property name="label" translatable="yes">_PO Box:</property>
                                     <property name="use_underline">True</property>
+                                    <property name="use_markup">False</property>
+                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap">False</property>
+                                    <property name="selectable">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="yalign">0.5</property>
+                                    <property name="xpad">0</property>
+                                    <property name="ypad">0</property>
                                     <property name="mnemonic_widget">entry-other-pobox</property>
+                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                    <property name="width_chars">-1</property>
+                                    <property name="single_line_mode">False</property>
+                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="right_attach">1</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -2266,35 +3264,44 @@
                                     <property name="height_request">69</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
                                     <child>
                                       <object class="GtkTextView" id="textview-other-address">
                                         <property name="height_request">25</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="editable">True</property>
+                                        <property name="overwrite">False</property>
                                         <property name="accepts_tab">False</property>
+                                        <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                        <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                        <property name="cursor_visible">True</property>
+                                        <property name="pixels_above_lines">0</property>
+                                        <property name="pixels_below_lines">0</property>
+                                        <property name="pixels_inside_wrap">0</property>
+                                        <property name="left_margin">0</property>
+                                        <property name="right_margin">0</property>
+                                        <property name="indent">0</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="top_attach">0</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
+                                    <property name="x_options">fill</property>
+                                    <property name="y_options">fill</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                               </packing>
                             </child>
                           </object>
@@ -2304,8 +3311,19 @@
                     <child type="label">
                       <object class="GtkLabel" id="label467">
                         <property name="visible">True</property>
-                        <property name="xalign">0.41999998688697815</property>
                         <property name="label" translatable="yes">Other</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.419999986887</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2313,65 +3331,99 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">2</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label437">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Mailing Address</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
               </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox40">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="homogeneous">False</property>
                 <property name="spacing">0</property>
 		<property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="frame79">
-                    <property name="visible">True</property>
                     <property name="border_width">6</property>
+                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label_yalign">0.5</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <object class="GtkAlignment" id="alignment8">
-                        <property name="visible">True</property>
                         <property name="border_width">6</property>
-                        <property name="yalign">0.15000000596046448</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0.5</property>
+                        <property name="yalign">0.15000000596</property>
+                        <property name="xscale">1</property>
+                        <property name="yscale">1</property>
+                        <property name="top_padding">0</property>
+                        <property name="bottom_padding">0</property>
                         <property name="left_padding">19</property>
                         <property name="right_padding">10</property>
                         <child>
                           <object class="GtkHBox" id="hbox104">
                             <property name="height_request">50</property>
                             <property name="visible">True</property>
+                            <property name="homogeneous">False</property>
+                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow41">
                                 <property name="height_request">38</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">automatic</property>
-                                <property name="vscrollbar_policy">automatic</property>
-                                <property name="shadow_type">in</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
                                 <child>
                                   <object class="GtkTextView" id="text-comments">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="editable">True</property>
+                                    <property name="overwrite">False</property>
+                                    <property name="accepts_tab">True</property>
+                                    <property name="justification">GTK_JUSTIFY_LEFT</property>
+                                    <property name="wrap_mode">GTK_WRAP_NONE</property>
+                                    <property name="cursor_visible">True</property>
+                                    <property name="pixels_above_lines">0</property>
+                                    <property name="pixels_below_lines">0</property>
+                                    <property name="pixels_inside_wrap">0</property>
+                                    <property name="left_margin">0</property>
+                                    <property name="right_margin">0</property>
+                                    <property name="indent">0</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">0</property>
+                                <property name="padding">0</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                               </packing>
                             </child>
                           </object>
@@ -2381,8 +3433,19 @@
                     <child type="label">
                       <object class="GtkLabel" id="label475">
                         <property name="visible">True</property>
-                        <property name="xalign">0.41999998688697815</property>
                         <property name="label" translatable="yes">Notes</property>
+                        <property name="use_underline">False</property>
+                        <property name="justify">GTK_JUSTIFY_LEFT</property>
+                        <property name="wrap">False</property>
+                        <property name="selectable">False</property>
+                        <property name="xalign">0.419999986887</property>
+                        <property name="yalign">0.5</property>
+                        <property name="xpad">0</property>
+                        <property name="ypad">0</property>
+                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                        <property name="width_chars">-1</property>
+                        <property name="single_line_mode">False</property>
+                        <property name="angle">0</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
                         </attributes>
@@ -2390,84 +3453,41 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="position">0</property>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="tab_expand">False</property>
+                <property name="tab_fill">True</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label468">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Notes</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">False</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0.5</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                <property name="width_chars">-1</property>
+                <property name="single_line_mode">False</property>
+                <property name="angle">0</property>
               </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button-help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button-cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button-ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="padding">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
           </packing>
         </child>
       </object>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]