diff --git a/src/EditPerson.glade b/src/EditPerson.glade
index 7e58e4d2a..0d549ad0c 100644
--- a/src/EditPerson.glade
+++ b/src/EditPerson.glade
@@ -124,7 +124,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label25</name>
-		<label>Date :</label>
+		<label>Date</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -150,7 +150,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label123</name>
-		<label>Place :</label>
+		<label>Place</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -257,7 +257,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label28</name>
-		<label>Date :</label>
+		<label>Date</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -283,7 +283,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label30</name>
-		<label>Place :</label>
+		<label>Place</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -450,7 +450,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label21</name>
-		<label>Given Name :</label>
+		<label>Given Name</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -473,36 +473,10 @@
 		</child>
 	      </widget>
 
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label22</name>
-		<label>Surname :</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
-		  <xpad>5</xpad>
-		  <ypad>5</ypad>
-		  <xexpand>False</xexpand>
-		  <yexpand>False</yexpand>
-		  <xshrink>False</xshrink>
-		  <yshrink>False</yshrink>
-		  <xfill>True</xfill>
-		  <yfill>False</yfill>
-		</child>
-	      </widget>
-
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label23</name>
-		<label>Suffix :</label>
+		<label>Suffix</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -528,7 +502,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label47</name>
-		<label>Title :</label>
+		<label>Title</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -554,7 +528,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label116</name>
-		<label>Nick Name :</label>
+		<label>Nick Name</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -708,6 +682,32 @@
 		  <yfill>False</yfill>
 		</child>
 	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label22</name>
+		<label>Surname</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>5</xpad>
+		  <ypad>5</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
 	    </widget>
 	  </widget>
 
@@ -823,12 +823,12 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label152</name>
-		<label>gramps ID : </label>
+		<label>gramps ID</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <left_attach>0</left_attach>
@@ -854,7 +854,7 @@
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <left_attach>0</left_attach>
@@ -912,12 +912,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label121</name>
-	    <label>Surname :</label>
+	    <label>Surname</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -938,12 +938,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label120</name>
-	    <label>Given Name :</label>
+	    <label>Given Name</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -1036,12 +1036,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label129</name>
-	    <label>Suffix :</label>
+	    <label>Suffix</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -1212,7 +1212,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label103</name>
-	      <label>Event Type :</label>
+	      <label>Event Type</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1238,7 +1238,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label104</name>
-	      <label>Date :</label>
+	      <label>Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1264,7 +1264,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label105</name>
-	      <label>Description :</label>
+	      <label>Description</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1290,7 +1290,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label106</name>
-	      <label>Place :</label>
+	      <label>Place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1684,7 +1684,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label132</name>
-	      <label>Attribute :</label>
+	      <label>Attribute</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -1710,7 +1710,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label133</name>
-	      <label>Value :</label>
+	      <label>Value</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2026,7 +2026,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label140</name>
-	      <label>Date : </label>
+	      <label>Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2052,7 +2052,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label141</name>
-	      <label>Address : </label>
+	      <label>Address</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2078,7 +2078,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label142</name>
-	      <label>Country :</label>
+	      <label>Country</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2104,7 +2104,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label143</name>
-	      <label>City/County : </label>
+	      <label>City/County</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -2221,7 +2221,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label148</name>
-		<label>State/Province : </label>
+		<label>State/Province</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -2289,7 +2289,7 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label149</name>
-		<label>Zip/Postal Code : </label>
+		<label>ZIP/Postal Code</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>0.5</xalign>
@@ -2683,7 +2683,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label127</name>
-	    <label>Web Address : </label>
+	    <label>Web Address</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
@@ -2757,7 +2757,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label128</name>
-	    <label>Description : </label>
+	    <label>Description</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
diff --git a/src/EditPerson.py b/src/EditPerson.py
index 048e99482..8158ff3cc 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -177,7 +177,7 @@ class EditPerson:
 
         self.get_widget("gid").set_text(str(person.getId()))
         if Config.display_attr:
-            self.get_widget("user_label").set_text("%s : " % Config.attr_name)
+            self.get_widget("user_label").set_text(Config.attr_name)
             val = ""
             for attr in self.person.getAttributeList():
                 if attr.getType() == Config.attr_name:
diff --git a/src/config.glade b/src/config.glade
index ed61208ef..3df8133e3 100644
--- a/src/config.glade
+++ b/src/config.glade
@@ -1163,7 +1163,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label148</name>
-	<label>Zip/Postal Code</label>
+	<label>ZIP/Postal Code</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
@@ -1340,6 +1340,7 @@ A4
       <widget>
 	<class>GtkOptionMenu</class>
 	<name>output_format</name>
+	<sensitive>False</sensitive>
 	<can_focus>True</can_focus>
 	<items>OpenOffice
 HTML
@@ -1502,12 +1503,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label133</name>
-	      <label>Name :</label>
+	      <label>Name</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1528,12 +1529,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label134</name>
-	      <label>Address :</label>
+	      <label>Address</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1554,12 +1555,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label135</name>
-	      <label>City :</label>
+	      <label>City</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1580,12 +1581,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label136</name>
-	      <label>State/Province :</label>
+	      <label>State/Province</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1606,12 +1607,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label137</name>
-	      <label>Country :</label>
+	      <label>Country</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1632,12 +1633,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label138</name>
-	      <label>email :</label>
+	      <label>email</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1658,12 +1659,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label139</name>
-	      <label>ZIP/Postal Code :</label>
+	      <label>ZIP/Postal Code</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1684,12 +1685,12 @@ anytime in the program's preference settings</label>
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label140</name>
-	      <label>Phone :</label>
+	      <label>Phone</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
diff --git a/src/gramps.glade b/src/gramps.glade
index 0a7b465a3..dc4abb3f1 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -565,12 +565,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label184</name>
-	      <label>Filter :</label>
+	      <label>Filter</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>3</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>4</padding>
@@ -608,12 +608,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label185</name>
-	      <label>Qualifier : </label>
+	      <label>Qualifier</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>3</padding>
@@ -801,7 +801,7 @@
 		  <class>GtkLabel</class>
 		  <child_name>CList:title</child_name>
 		  <name>label6</name>
-		  <label>Birth Date </label>
+		  <label>Birth Date</label>
 		  <justify>GTK_JUSTIFY_CENTER</justify>
 		  <wrap>False</wrap>
 		  <xalign>0.5</xalign>
@@ -858,7 +858,7 @@
 		  <class>GtkLabel</class>
 		  <child_name>CList:title</child_name>
 		  <name>label193</name>
-		  <label>Death Date </label>
+		  <label>Death Date</label>
 		  <justify>GTK_JUSTIFY_CENTER</justify>
 		  <wrap>False</wrap>
 		  <xalign>0.5</xalign>
@@ -1204,7 +1204,7 @@
 	      <handler>on_edit_mother_clicked</handler>
 	      <last_modification_time>Thu, 21 Dec 2000 22:51:56 GMT</last_modification_time>
 	    </signal>
-	    <label>Mother : </label>
+	    <label>Mother</label>
 	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <left_attach>3</left_attach>
@@ -1231,7 +1231,7 @@
 	      <handler>on_edit_father_clicked</handler>
 	      <last_modification_time>Thu, 21 Dec 2000 22:51:49 GMT</last_modification_time>
 	    </signal>
-	    <label>Father : </label>
+	    <label>Father</label>
 	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <left_attach>3</left_attach>
@@ -1249,60 +1249,6 @@
 	    </child>
 	  </widget>
 
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>editSpouse</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>clicked</name>
-	      <handler>on_edit_spouse_clicked</handler>
-	      <last_modification_time>Thu, 21 Dec 2000 22:51:41 GMT</last_modification_time>
-	    </signal>
-	    <label>Spouse : </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>editMainPerson</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>clicked</name>
-	      <handler>on_edit_active_person</handler>
-	      <last_modification_time>Thu, 21 Dec 2000 22:51:33 GMT</last_modification_time>
-	    </signal>
-	    <label>Person : </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
 	  <widget>
 	    <class>GtkNotebook</class>
 	    <name>lab_or_list</name>
@@ -1466,6 +1412,60 @@
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>editMainPerson</name>
+	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>clicked</name>
+	      <handler>on_edit_active_person</handler>
+	      <last_modification_time>Thu, 21 Dec 2000 22:51:33 GMT</last_modification_time>
+	    </signal>
+	    <label>Person</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkButton</class>
+	    <name>editSpouse</name>
+	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>clicked</name>
+	      <handler>on_edit_spouse_clicked</handler>
+	      <last_modification_time>Thu, 21 Dec 2000 22:51:41 GMT</last_modification_time>
+	    </signal>
+	    <label>Spouse</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
 
 	<widget>
@@ -2605,6 +2605,8 @@
       <widget>
 	<class>GtkCList</class>
 	<name>spouseList</name>
+	<width>350</width>
+	<height>200</height>
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>select_row</name>
@@ -2817,12 +2819,12 @@
 	  <class>GtkLabel</class>
 	  <name>label80</name>
 	  <width>100</width>
-	  <label>Mother :</label>
+	  <label>Mother</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>5</padding>
@@ -2919,12 +2921,12 @@
 	  <class>GtkLabel</class>
 	  <name>label83</name>
 	  <width>100</width>
-	  <label>Father :</label>
+	  <label>Father</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>5</padding>
@@ -3021,12 +3023,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label186</name>
-	  <label>Relationship Type : </label>
+	  <label>Relationship Type </label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>5</padding>
@@ -3557,12 +3559,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label165</name>
-	    <label>Title : </label>
+	    <label>Title</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -3583,12 +3585,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label166</name>
-	    <label>Author : </label>
+	    <label>Author</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -3609,12 +3611,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label167</name>
-	    <label>Publication Info : </label>
+	    <label>Publication Info</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -3993,12 +3995,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label173</name>
-	    <label>Publication Information :</label>
+	    <label>Publication Information</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -4019,12 +4021,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label174</name>
-	    <label>Author :</label>
+	    <label>Author</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -4045,12 +4047,12 @@ Other
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label175</name>
-	    <label>Title :</label>
+	    <label>Title</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -4177,58 +4179,6 @@ Other
 	    <fill>True</fill>
 	  </child>
 
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label180</name>
-	    <label>Volume/Film/Page :</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label181</name>
-	    <label>Date :</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>1</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
 	  <widget>
 	    <class>GtkScrolledWindow</class>
 	    <name>scrolledwindow20</name>
@@ -4343,22 +4293,74 @@ Other
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label183</name>
-	    <label>Comments :</label>
+	    <name>label180</name>
+	    <label>Volume/Film/Page</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>0</top_attach>
+	      <bottom_attach>1</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>False</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label181</name>
+	    <label>Date</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label182</name>
+	    <label>Text</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0</yalign>
-	    <xpad>0</xpad>
-	    <ypad>10</ypad>
+	    <xpad>5</xpad>
+	    <ypad>5</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -4369,22 +4371,22 @@ Other
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label182</name>
-	    <label>Text :</label>
+	    <name>label183</name>
+	    <label>Comments</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0</yalign>
-	    <xpad>0</xpad>
-	    <ypad>5</ypad>
+	    <xpad>5</xpad>
+	    <ypad>10</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
@@ -4532,13 +4534,13 @@ Other
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label189</name>
-	  <label>Given Name : </label>
+	  <label>Given Name</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -4558,13 +4560,13 @@ Other
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label190</name>
-	  <label>Surname : </label>
+	  <label>Surname</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -4584,13 +4586,13 @@ Other
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label191</name>
-	  <label>Gender : </label>
+	  <label>Gender</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -4610,13 +4612,13 @@ Other
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label192</name>
-	  <label>Status : </label>
+	  <label>Status</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
@@ -4636,6 +4638,7 @@ Other
 	<widget>
 	  <class>GtkEntry</class>
 	  <name>childGiven</name>
+	  <width>250</width>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 49f674ff1..dc9857b5c 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -198,7 +198,8 @@ def on_about_activate(obj):
 #
 #-------------------------------------------------------------------------
 def on_contents_activate(obj):
-    gnome.help.display("gramps",const.helpMenu)
+    
+    GnomeOkDialog(_("Sorry.  Online help for gramps is currently under development.\nUnfortunately, it is not yet ready."))
     
 #-------------------------------------------------------------------------
 #
diff --git a/src/imagesel.glade b/src/imagesel.glade
index 5b75d08fb..33a5cc076 100644
--- a/src/imagesel.glade
+++ b/src/imagesel.glade
@@ -206,12 +206,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label120</name>
-	  <label>File : </label>
+	  <label>File</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
@@ -232,12 +232,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label118</name>
-	  <label>Description : </label>
+	  <label>Description</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
diff --git a/src/marriage.glade b/src/marriage.glade
index 54c6b69a5..993d5be76 100644
--- a/src/marriage.glade
+++ b/src/marriage.glade
@@ -216,7 +216,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label99</name>
-	      <label>Date : </label>
+	      <label>Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -266,7 +266,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label100</name>
-	      <label>Description : </label>
+	      <label>Description</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -292,7 +292,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label101</name>
-	      <label>Place : </label>
+	      <label>Place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
@@ -434,7 +434,7 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label98</name>
-	      <label>Event Type : </label>
+	      <label>Event Type</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py
index 228b4cc19..34518b77b 100644
--- a/src/plugins/FamilyGroup.py
+++ b/src/plugins/FamilyGroup.py
@@ -166,7 +166,7 @@ class FamilyGroup:
     def setup(self):
         self.doc.open(self.output)
         self.doc.start_paragraph('Title')
-        self.doc.write_text(_("Family Group Record"))
+        self.doc.write_text(_("Family Group Report"))
         self.doc.end_paragraph()
     
     def end(self):
@@ -406,7 +406,7 @@ def report(database,person):
     if no_pdf == 1:
         topDialog.get_widget("pdf").set_sensitive(0)
     
-    label.set_text(_("Family Group chart for %s") % name)
+    label.set_text(_("Family Group Report for %s") % name)
     topDialog.signal_autoconnect({
         "destroy_passed_object" : utils.destroy_passed_object,
         "on_save_clicked" : on_save_clicked,
diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py
index a5e0afc44..23a6f614f 100644
--- a/src/plugins/GraphViz.py
+++ b/src/plugins/GraphViz.py
@@ -241,7 +241,7 @@ def dump_index(person_list,file):
 #
 #------------------------------------------------------------------------
 def get_description():
-    return _("Generates relationship graphs, currently only in GraphVis format.") + \
+    return _("Generates relationship graphs, currently only in GraphViz format.") + \
            " " + \
            _("GraphViz (dot) will transform the graph into postscript, jpeg, png, vrml, svg, and many other formats.") + \
            " " + \
diff --git a/src/plugins/ancestorchart.glade b/src/plugins/ancestorchart.glade
index a3c01e754..d3b9989bb 100644
--- a/src/plugins/ancestorchart.glade
+++ b/src/plugins/ancestorchart.glade
@@ -135,12 +135,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
-	  <label>Save As : </label>
+	  <label>Save As</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -251,12 +251,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label13</name>
-	    <label>Generations : </label>
+	    <label>Generations</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -277,12 +277,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label14</name>
-	    <label>Paper : </label>
+	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -303,12 +303,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label15</name>
-	    <label>Orientation : </label>
+	    <label>Orientation</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
diff --git a/src/plugins/ancestorgraph.glade b/src/plugins/ancestorgraph.glade
index 08f0c8834..9938d9b1f 100644
--- a/src/plugins/ancestorgraph.glade
+++ b/src/plugins/ancestorgraph.glade
@@ -71,6 +71,7 @@
 	    <last_modification_time>Wed, 08 Nov 2000 02:29:39 GMT</last_modification_time>
 	  </signal>
 	  <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
@@ -85,6 +86,7 @@
 	    <last_modification_time>Wed, 08 Nov 2000 02:01:54 GMT</last_modification_time>
 	  </signal>
 	  <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
       </widget>
     </widget>
@@ -111,7 +113,7 @@
 	<xpad>0</xpad>
 	<ypad>0</ypad>
 	<child>
-	  <padding>0</padding>
+	  <padding>10</padding>
 	  <expand>False</expand>
 	  <fill>False</fill>
 	</child>
@@ -129,7 +131,7 @@
 	<tab_vborder>2</tab_vborder>
 	<popup_enable>False</popup_enable>
 	<child>
-	  <padding>0</padding>
+	  <padding>10</padding>
 	  <expand>True</expand>
 	  <fill>True</fill>
 	</child>
@@ -435,110 +437,6 @@
 	    </child>
 	  </widget>
 
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label11</name>
-	    <label>Border Color</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>10</xpad>
-	      <ypad>10</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label10</name>
-	    <label>Text Color </label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>10</xpad>
-	      <ypad>10</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label9</name>
-	    <label>Font</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>10</xpad>
-	      <ypad>10</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label12</name>
-	    <label>Background Color</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>10</xpad>
-	      <ypad>10</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
 	  <widget>
 	    <class>GnomeColorPicker</class>
 	    <name>backgroundcolor</name>
@@ -587,26 +485,130 @@
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label13</name>
-	    <label>Box Color</label>
+	    <name>label9</name>
+	    <label>Font</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>0</top_attach>
+	      <bottom_attach>1</bottom_attach>
+	      <xpad>10</xpad>
+	      <ypad>10</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label10</name>
+	    <label>Text Color</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
+	      <xpad>10</xpad>
+	      <ypad>10</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label11</name>
+	    <label>Border Color</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>4</top_attach>
-	      <bottom_attach>5</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>10</xpad>
+	      <ypad>10</ypad>
 	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label12</name>
+	    <label>Background Color</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
+	      <xpad>10</xpad>
+	      <ypad>10</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label13</name>
+	    <label>Box Color</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>4</top_attach>
+	      <bottom_attach>5</bottom_attach>
+	      <xpad>10</xpad>
+	      <ypad>10</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
diff --git a/src/plugins/ancestorreport.glade b/src/plugins/ancestorreport.glade
index db828c314..d9c2c8c5e 100644
--- a/src/plugins/ancestorreport.glade
+++ b/src/plugins/ancestorreport.glade
@@ -135,12 +135,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
-	  <label>Save As : </label>
+	  <label>Save As</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -286,12 +286,12 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label11</name>
-		<label>Template : </label>
+		<label>Template</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <padding>0</padding>
@@ -378,12 +378,12 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label14</name>
-		<label>Paper : </label>
+		<label>Paper</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <left_attach>0</left_attach>
@@ -404,12 +404,12 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label13</name>
-		<label>Generations : </label>
+		<label>Generations</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <left_attach>0</left_attach>
@@ -507,12 +507,12 @@
 	      <widget>
 		<class>GtkLabel</class>
 		<name>label15</name>
-		<label>Orientation : </label>
+		<label>Orientation</label>
 		<justify>GTK_JUSTIFY_CENTER</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
 		<yalign>0.5</yalign>
-		<xpad>0</xpad>
+		<xpad>5</xpad>
 		<ypad>0</ypad>
 		<child>
 		  <left_attach>0</left_attach>
diff --git a/src/plugins/changetype.glade b/src/plugins/changetype.glade
index bccbfb181..f0d22fc62 100644
--- a/src/plugins/changetype.glade
+++ b/src/plugins/changetype.glade
@@ -71,6 +71,7 @@
 	    <last_modification_time>Fri, 09 Mar 2001 17:49:10 GMT</last_modification_time>
 	  </signal>
 	  <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
@@ -85,6 +86,7 @@
 	    <last_modification_time>Fri, 09 Mar 2001 17:48:57 GMT</last_modification_time>
 	  </signal>
 	  <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
 
 	<widget>
@@ -93,6 +95,7 @@
 	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
 	  <stock_button>GNOME_STOCK_BUTTON_HELP</stock_button>
+	  <relief>GTK_RELIEF_NORMAL</relief>
 	</widget>
       </widget>
     </widget>
@@ -112,7 +115,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label1</name>
-	<label>Change Event Type of : </label>
+	<label>Change Event Type of</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
@@ -156,7 +159,7 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label2</name>
-	<label>to:</label>
+	<label>to</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
diff --git a/src/plugins/desreport.glade b/src/plugins/desreport.glade
index 46229b2f9..7eb5dfd86 100644
--- a/src/plugins/desreport.glade
+++ b/src/plugins/desreport.glade
@@ -134,12 +134,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
-	  <label>Save As : </label>
+	  <label>Save As</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -284,12 +284,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label11</name>
-	      <label>Template : </label>
+	      <label>Template</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
@@ -352,12 +352,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label13</name>
-	    <label>Paper : </label>
+	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -378,12 +378,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label14</name>
-	    <label>Orientation : </label>
+	    <label>Orientation</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
diff --git a/src/plugins/eventcmp.glade b/src/plugins/eventcmp.glade
index bd7beedcf..2bc91322f 100644
--- a/src/plugins/eventcmp.glade
+++ b/src/plugins/eventcmp.glade
@@ -128,12 +128,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label8</name>
-	  <label>Filter : </label>
+	  <label>Filter</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
@@ -155,7 +155,8 @@
 	  <class>GtkOptionMenu</class>
 	  <name>filter_list</name>
 	  <can_focus>True</can_focus>
-	  <items></items>
+	  <items>
+</items>
 	  <initial_choice>0</initial_choice>
 	  <child>
 	    <left_attach>1</left_attach>
@@ -202,12 +203,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label9</name>
-	  <label>Qualifier : </label>
+	  <label>Qualifier</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
@@ -741,12 +742,12 @@
 	      <class>GtkLabel</class>
 	      <name>label11</name>
 	      <visible>False</visible>
-	      <label>Template : </label>
+	      <label>Template</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
diff --git a/src/plugins/familygroup.glade b/src/plugins/familygroup.glade
index 448b332f7..489d9d255 100644
--- a/src/plugins/familygroup.glade
+++ b/src/plugins/familygroup.glade
@@ -134,12 +134,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
-	  <label>Save As : </label>
+	  <label>Save As</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -311,12 +311,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label11</name>
-	      <label>Template : </label>
+	      <label>Template</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
@@ -379,12 +379,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label14</name>
-	    <label>Orientation : </label>
+	    <label>Orientation</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -405,12 +405,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label13</name>
-	    <label>Paper : </label>
+	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
diff --git a/src/plugins/gedcomexport.glade b/src/plugins/gedcomexport.glade
index b56629255..9d6b5f05a 100644
--- a/src/plugins/gedcomexport.glade
+++ b/src/plugins/gedcomexport.glade
@@ -135,12 +135,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label1</name>
-	  <label>Filter : </label>
+	  <label>Filter</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>2</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -156,7 +156,7 @@
 	  <items></items>
 	  <initial_choice>0</initial_choice>
 	  <child>
-	    <padding>0</padding>
+	    <padding>5</padding>
 	    <expand>False</expand>
 	    <fill>False</fill>
 	  </child>
diff --git a/src/plugins/gedcomimport.glade b/src/plugins/gedcomimport.glade
index e77313ca4..6a0610a40 100644
--- a/src/plugins/gedcomimport.glade
+++ b/src/plugins/gedcomimport.glade
@@ -558,7 +558,7 @@
       <spacing>0</spacing>
       <child>
 	<padding>0</padding>
-	<expand>True</expand>
+	<expand>False</expand>
 	<fill>True</fill>
       </child>
 
@@ -589,35 +589,6 @@
 	</child>
       </widget>
 
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>NOTE: Image files will not be loaded unless 
-the database has been previous saved, and the
-Append to Current Database option is selected.</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHSeparator</class>
-	<name>hseparator3</name>
-	<child>
-	  <padding>10</padding>
-	  <expand>False</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-
       <widget>
 	<class>GtkHBox</class>
 	<name>hbox2</name>
@@ -640,7 +611,7 @@ Append to Current Database option is selected.</label>
 	  <group>import</group>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 	</widget>
@@ -656,7 +627,7 @@ Append to Current Database option is selected.</label>
 	  <group>import</group>
 	  <child>
 	    <padding>0</padding>
-	    <expand>True</expand>
+	    <expand>False</expand>
 	    <fill>True</fill>
 	  </child>
 	</widget>
@@ -674,7 +645,7 @@ Append to Current Database option is selected.</label>
 	<modal>True</modal>
 	<child>
 	  <padding>10</padding>
-	  <expand>False</expand>
+	  <expand>True</expand>
 	  <fill>True</fill>
 	</child>
 
diff --git a/src/plugins/graphviz.glade b/src/plugins/graphviz.glade
index 4bf61156d..4dd71bcc5 100644
--- a/src/plugins/graphviz.glade
+++ b/src/plugins/graphviz.glade
@@ -46,12 +46,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label3</name>
-	<label>Output File : </label>
+	<label>Output File</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -169,12 +169,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label6</name>
-	<label>Filter : </label>
+	<label>Filter</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -294,12 +294,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label8</name>
-	      <label>Pages : </label>
+	      <label>Pages</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
@@ -368,12 +368,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label7</name>
-	      <label>Paper Orientation : </label>
+	      <label>Paper Orientation</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
@@ -464,6 +464,7 @@
 	  <last_modification_time>Sun, 12 Nov 2000 00:45:16 GMT</last_modification_time>
 	</signal>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+	<relief>GTK_RELIEF_NORMAL</relief>
       </widget>
 
       <widget>
@@ -478,6 +479,7 @@
 	  <last_modification_time>Sun, 12 Nov 2000 00:45:38 GMT</last_modification_time>
 	</signal>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+	<relief>GTK_RELIEF_NORMAL</relief>
       </widget>
     </widget>
   </widget>
diff --git a/src/plugins/htmlreport.glade b/src/plugins/htmlreport.glade
index 1c0587d6d..02d393480 100644
--- a/src/plugins/htmlreport.glade
+++ b/src/plugins/htmlreport.glade
@@ -254,12 +254,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label3</name>
-	<label>Target Directory : </label>
+	<label>Target Directory</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -280,12 +280,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label4</name>
-	<label>HTML Template : </label>
+	<label>HTML Template</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -306,12 +306,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label6</name>
-	<label>Filter : </label>
+	<label>Filter</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -332,12 +332,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label7</name>
-	<label>File Prefix : </label>
+	<label>File Prefix</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -358,12 +358,12 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label5</name>
-	<label>Generations : </label>
+	<label>Generations</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>1</xalign>
 	<yalign>0.5</yalign>
-	<xpad>0</xpad>
+	<xpad>5</xpad>
 	<ypad>0</ypad>
 	<child>
 	  <left_attach>0</left_attach>
@@ -477,6 +477,7 @@
 	  <last_modification_time>Sun, 12 Nov 2000 00:45:16 GMT</last_modification_time>
 	</signal>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+	<relief>GTK_RELIEF_NORMAL</relief>
       </widget>
 
       <widget>
@@ -491,6 +492,7 @@
 	  <last_modification_time>Sun, 12 Nov 2000 00:45:38 GMT</last_modification_time>
 	</signal>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+	<relief>GTK_RELIEF_NORMAL</relief>
       </widget>
     </widget>
   </widget>
diff --git a/src/plugins/indsum.glade b/src/plugins/indsum.glade
index 850667463..7d3b26019 100644
--- a/src/plugins/indsum.glade
+++ b/src/plugins/indsum.glade
@@ -134,12 +134,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label12</name>
-	  <label>Save As : </label>
+	  <label>Save As</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <padding>0</padding>
@@ -267,12 +267,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label11</name>
-	      <label>Template : </label>
+	      <label>Template</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<padding>0</padding>
@@ -335,12 +335,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label13</name>
-	    <label>Paper : </label>
+	    <label>Paper</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
@@ -361,12 +361,12 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label14</name>
-	    <label>Orientation : </label>
+	    <label>Orientation</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>1</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <child>
 	      <left_attach>0</left_attach>
diff --git a/src/plugins/merge.glade b/src/plugins/merge.glade
index a83a14f15..991a4739e 100644
--- a/src/plugins/merge.glade
+++ b/src/plugins/merge.glade
@@ -204,12 +204,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label8</name>
-	      <label>Birth Date : </label>
+	      <label>Birth Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -230,12 +230,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label12</name>
-	      <label>Death Date : </label>
+	      <label>Death Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -256,12 +256,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label22</name>
-	      <label>Mother : </label>
+	      <label>Mother</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -282,12 +282,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label4</name>
-	      <label>Name : </label>
+	      <label>Name</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -308,12 +308,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label26</name>
-	      <label>Birth Place : </label>
+	      <label>Birth Place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -334,12 +334,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label30</name>
-	      <label>Death place : </label>
+	      <label>Death place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -648,12 +648,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label16</name>
-	      <label>Father : </label>
+	      <label>Father</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -759,12 +759,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label33</name>
-	      <label>Spouses : </label>
+	      <label>Spouses</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -856,12 +856,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label13</name>
-	      <label>Death Date : </label>
+	      <label>Death Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -882,12 +882,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label25</name>
-	      <label>Mother : </label>
+	      <label>Mother</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -908,12 +908,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label5</name>
-	      <label>Name : </label>
+	      <label>Name</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -934,12 +934,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label27</name>
-	      <label>Birth Place : </label>
+	      <label>Birth Place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -960,12 +960,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label9</name>
-	      <label>Birth Date : </label>
+	      <label>Birth Date</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1034,12 +1034,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label32</name>
-	      <label>Death place : </label>
+	      <label>Death place</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1276,12 +1276,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label34</name>
-	      <label>Spouses : </label>
+	      <label>Spouses</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0</yalign>
-	      <xpad>0</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1302,12 +1302,12 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <name>label19</name>
-	      <label>Father : </label>
+	      <label>Father</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>1</xalign>
 	      <yalign>0.5</yalign>
-	      <xpad>2</xpad>
+	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <child>
 		<left_attach>0</left_attach>
@@ -1766,7 +1766,7 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label46</name>
-	  <label>Match Threshold : </label>
+	  <label>Match Threshold</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
diff --git a/src/plugins/soundex.glade b/src/plugins/soundex.glade
index 5514072e8..781720f95 100644
--- a/src/plugins/soundex.glade
+++ b/src/plugins/soundex.glade
@@ -149,12 +149,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label2</name>
-	  <label>Name : </label>
+	  <label>Name</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
@@ -175,12 +175,12 @@
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label3</name>
-	  <label>SoundEx Code : </label>
+	  <label>SoundEx Code</label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>1</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
+	  <xpad>5</xpad>
 	  <ypad>0</ypad>
 	  <child>
 	    <left_attach>0</left_attach>
@@ -206,8 +206,8 @@
 	  <wrap>False</wrap>
 	  <xalign>0</xalign>
 	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
@@ -238,8 +238,8 @@
 	    <right_attach>2</right_attach>
 	    <top_attach>0</top_attach>
 	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
+	    <xpad>5</xpad>
+	    <ypad>5</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>