diff --git a/gramps/src/SelectChild.py b/gramps/src/SelectChild.py
index 88483d1c8..aa5c7cfd1 100644
--- a/gramps/src/SelectChild.py
+++ b/gramps/src/SelectChild.py
@@ -62,7 +62,6 @@ class SelectChild:
         self.xml = libglade.GladeXML(const.gladeFile,"selectChild")
     
         self.xml.signal_autoconnect({
-            "on_combo_insert_text"     : utils.combo_insert_text,
             "on_save_child_clicked"    : self.on_save_child_clicked,
             "on_show_toggled"          : self.on_show_toggled,
             "destroy_passed_object"    : utils.destroy_passed_object
@@ -222,7 +221,7 @@ class NewChild:
         self.xml = libglade.GladeXML(const.gladeFile,"addChild")
         self.xml.signal_autoconnect({
             "on_addchild_ok_clicked" : self.on_addchild_ok_clicked,
-            "on_combo_insert_text"   : self.combo_insert_text,
+            "on_edit_new_child"      : self.on_edit_new_child,
             "on_male_toggled"        : self.on_male_toggled,
             "on_female_toggled"      : self.on_female_toggled,
             "on_gender_toggled"      : self.on_gender_toggled,
@@ -386,4 +385,12 @@ class NewChild:
         self.update(self.family,person)
         utils.modified()
         utils.destroy_passed_object(obj)
+        self.new_child = person
+
+    def on_edit_new_child(self,obj):
+        import EditPerson
+        
+        self.on_addchild_ok_clicked(obj)
+        EditPerson.EditPerson(self.new_child,self.db)
+        
 
diff --git a/gramps/src/const.py b/gramps/src/const.py
index 4d2a04f26..b56c6281c 100644
--- a/gramps/src/const.py
+++ b/gramps/src/const.py
@@ -91,7 +91,7 @@ gtkrcFile      = "%s/gtkrc" % rootDir
 #
 #-------------------------------------------------------------------------
 progName     = "gramps"
-version      = "0.7.1pre-snap20020106"
+version      = "0.7.1pre-snap20020115"
 copyright    = "© 2001 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton"]
 comments     = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program.")
diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade
index d3cc4adce..e16302e5b 100644
--- a/gramps/src/gramps.glade
+++ b/gramps/src/gramps.glade
@@ -6367,10 +6367,19 @@ Unknown
 	<can_focus>True</can_focus>
 	<signal>
 	  <name>clicked</name>
-	  <handler>destroy_passed_object</handler>
+	  <handler>on_edit_new_child</handler>
 	  <object>addChild</object>
-	  <last_modification_time>Wed, 14 Feb 2001 02:53:18 GMT</last_modification_time>
+	  <last_modification_time>Tue, 15 Jan 2002 14:31:28 GMT</last_modification_time>
 	</signal>
+	<label>Edit</label>
+	<stock_pixmap>GNOME_STOCK_PIXMAP_PROPERTIES</stock_pixmap>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button147</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
       </widget>
     </widget>
@@ -6389,6 +6398,7 @@ Unknown
       <widget>
 	<class>GtkLabel</class>
 	<name>newTitle</name>
+	<width>450</width>
 	<label>Add New Child</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
@@ -6427,58 +6437,6 @@ Unknown
 	  <fill>True</fill>
 	</child>
 
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label190</name>
-	  <label>Surname</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>5</xpad>
-	  <ypad>5</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>label191</name>
-	  <label>Gender</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>5</xpad>
-	  <ypad>5</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</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>flabel</name>
@@ -6496,7 +6454,7 @@ Unknown
 	    <bottom_attach>4</bottom_attach>
 	    <xpad>5</xpad>
 	    <ypad>5</ypad>
-	    <xexpand>False</xexpand>
+	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
@@ -6522,7 +6480,7 @@ Unknown
 	    <bottom_attach>1</bottom_attach>
 	    <xpad>5</xpad>
 	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
+	    <xexpand>False</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
@@ -6531,6 +6489,124 @@ Unknown
 	  </child>
 	</widget>
 
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>surname</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>5</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>GtkCombo</class>
+	  <name>mcombo</name>
+	  <value_in_list>True</value_in_list>
+	  <ok_if_empty>False</ok_if_empty>
+	  <case_sensitive>True</case_sensitive>
+	  <use_arrows>True</use_arrows>
+	  <use_arrows_always>False</use_arrows_always>
+	  <items>Birth
+Adopted
+Stepchild
+None
+Unknown
+</items>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>4</top_attach>
+	    <bottom_attach>5</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>
+	    <class>GtkEntry</class>
+	    <child_name>GtkCombo:entry</child_name>
+	    <name>frel</name>
+	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>insert_text</name>
+	      <handler>on_combo_insert_text</handler>
+	      <object>fcombo</object>
+	      <last_modification_time>Thu, 18 Oct 2001 01:59:26 GMT</last_modification_time>
+	    </signal>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text>Birth</text>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkCombo</class>
+	  <name>fcombo</name>
+	  <value_in_list>True</value_in_list>
+	  <ok_if_empty>False</ok_if_empty>
+	  <case_sensitive>True</case_sensitive>
+	  <use_arrows>True</use_arrows>
+	  <use_arrows_always>False</use_arrows_always>
+	  <items>Birth
+Adopted
+Stepchild
+None
+Unknown
+</items>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</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>
+	    <class>GtkEntry</class>
+	    <child_name>GtkCombo:entry</child_name>
+	    <name>mrel</name>
+	    <can_focus>True</can_focus>
+	    <signal>
+	      <name>insert_text</name>
+	      <handler>on_combo_insert_text</handler>
+	      <object>mcombo</object>
+	      <last_modification_time>Thu, 18 Oct 2001 01:59:11 GMT</last_modification_time>
+	    </signal>
+	    <editable>False</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text>Birth</text>
+	  </widget>
+	</widget>
+
 	<widget>
 	  <class>GtkHBox</class>
 	  <name>hbox18</name>
@@ -6548,7 +6624,7 @@ Unknown
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
 	    <xfill>True</xfill>
-	    <yfill>True</yfill>
+	    <yfill>False</yfill>
 	  </child>
 
 	  <widget>
@@ -6612,65 +6688,6 @@ Unknown
 	  </widget>
 	</widget>
 
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox19</name>
-	  <homogeneous>True</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCombo</class>
-	    <name>fcombo</name>
-	    <value_in_list>True</value_in_list>
-	    <ok_if_empty>False</ok_if_empty>
-	    <case_sensitive>True</case_sensitive>
-	    <use_arrows>True</use_arrows>
-	    <use_arrows_always>False</use_arrows_always>
-	    <items>Birth
-Adopted
-Stepchild
-None
-Unknown
-</items>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GtkCombo:entry</child_name>
-	      <name>mrel</name>
-	      <can_focus>True</can_focus>
-	      <signal>
-		<name>insert_text</name>
-		<handler>on_combo_insert_text</handler>
-		<object>mcombo</object>
-		<last_modification_time>Thu, 18 Oct 2001 01:59:11 GMT</last_modification_time>
-	      </signal>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text>Birth</text>
-	    </widget>
-	  </widget>
-	</widget>
-
 	<widget>
 	  <class>GtkLabel</class>
 	  <name>label189</name>
@@ -6688,7 +6705,59 @@ Unknown
 	    <bottom_attach>1</bottom_attach>
 	    <xpad>5</xpad>
 	    <ypad>5</ypad>
-	    <xexpand>False</xexpand>
+	    <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>label190</name>
+	  <label>Surname</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>1</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>5</xpad>
+	  <ypad>5</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>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label191</name>
+	  <label>Gender</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>1</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>5</xpad>
+	  <ypad>5</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>5</xpad>
+	    <ypad>5</ypad>
+	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>
 	    <yshrink>False</yshrink>
@@ -6714,77 +6783,6 @@ Unknown
 	    <bottom_attach>5</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>GtkCombo</class>
-	  <name>mcombo</name>
-	  <value_in_list>True</value_in_list>
-	  <ok_if_empty>False</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items>Birth
-Adopted
-Stepchild
-None
-Unknown
-</items>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>5</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>frel</name>
-	    <can_focus>True</can_focus>
-	    <signal>
-	      <name>insert_text</name>
-	      <handler>on_combo_insert_text</handler>
-	      <object>fcombo</object>
-	      <last_modification_time>Thu, 18 Oct 2001 01:59:26 GMT</last_modification_time>
-	    </signal>
-	    <editable>False</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text>Birth</text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>surname</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>False</yexpand>
 	    <xshrink>False</xshrink>