diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in
index 17c084b13..9c2824bd3 100644
--- a/gramps2/Makefile.in
+++ b/gramps2/Makefile.in
@@ -130,8 +130,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 	Makefile.in NEWS TODO aclocal.m4 configure configure.in \
-	gramps.sh.in gramps.spec.in install-sh missing mkinstalldirs \
-	py-compile
+	gramps.sh.in gramps.spec.in install-sh py-compile
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py
index ae7c11dd3..70bcc7ee1 100644
--- a/gramps2/src/EditSource.py
+++ b/gramps2/src/EditSource.py
@@ -178,7 +178,8 @@ class EditSource:
         title = self.title.get_text()
         author = self.author.get_text()
         pubinfo = self.pubinfo.get_text()
-        note = self.notes_buffer.get_text()
+        note = self.notes_buffer.get_text(self.notes_buffer.get_start_iter(),
+                                          self.notes_buffer.get_end_iter(),gtk.FALSE)
     
         if author != self.source.getAuthor():
             self.source.setAuthor(author)
diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in
index 2ea043f3a..b81c98ed0 100644
--- a/gramps2/src/Makefile.in
+++ b/gramps2/src/Makefile.in
@@ -144,7 +144,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(dist_pkgdata_DATA) $(pkgpython_PYTHON) AUTHORS \
-	ChangeLog Makefile.am Makefile.in NEWS configure.in const.py.in
+	ChangeLog Makefile.am Makefile.in NEWS const.py.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index 59867e8a9..201a50077 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -1444,32 +1444,6 @@
 				<placeholder/>
 			      </child>
 
-			      <child>
-				<widget class="GtkButton" id="add_parents">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Adds a new set of parents to the active person</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image91">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-add</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
 			      <child>
 				<widget class="GtkButton" id="ap_parents_btn">
 				  <property name="visible">True</property>
@@ -1489,6 +1463,36 @@
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="padding">10</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<placeholder/>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="add_parents">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Adds a new set of parents to the active person</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+
+				  <child>
+				    <widget class="GtkImage" id="image91">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-add</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
 				<packing>
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>
@@ -1521,10 +1525,6 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">3</property>
@@ -1605,32 +1605,6 @@
 				<placeholder/>
 			      </child>
 
-			      <child>
-				<widget class="GtkButton" id="add_spparents">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Adds a new set of parents to the selected spouse</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image89">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-add</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
 			      <child>
 				<widget class="GtkButton" id="sp_parents_btn">
 				  <property name="visible">True</property>
@@ -1650,6 +1624,36 @@
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="padding">10</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<placeholder/>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="add_spparents">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Adds a new set of parents to the selected spouse</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+
+				  <child>
+				    <widget class="GtkImage" id="image89">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-add</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
 				<packing>
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>
@@ -1682,10 +1686,6 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">3</property>
diff --git a/gramps2/src/gramps.gladep b/gramps2/src/gramps.gladep
index 7012234d5..6c802a87f 100644
--- a/gramps2/src/gramps.gladep
+++ b/gramps2/src/gramps.gladep
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
 
 <glade-project>
-  <name></name>
-  <program_name></program_name>
+  <name>Src</name>
+  <program_name>src</program_name>
+  <pixmaps_directory>.</pixmaps_directory>
 </glade-project>