diff --git a/ChangeLog b/ChangeLog
index 2ca4fd1..adb4e14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr  9 15:40:17 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
+	* src/gmdb2/gladefiles/gmdb-debug.glade:
+	* src/gmdb2/gladefiles/gmdb-schema.glade:
+	* src/gmdb2/gladefiles/gmdb-sql.glade:
+	* src/gmdb2/gladefiles/gmdb.glade: Gladefile fixes (Edward Catmur)
+
 Fri Apr  8 20:36:51 CDT 2005	Jeff Smith <whydoubt@yahoo.com>
 	* src/gmdb2/gladefiles/Makefile.am:
 	* src/gmdb2/Makefile.am: Clean up minor gmdb makefile issues
diff --git a/src/gmdb2/gladefiles/gmdb-debug.glade b/src/gmdb2/gladefiles/gmdb-debug.glade
index 7cbe005..951db63 100644
--- a/src/gmdb2/gladefiles/gmdb-debug.glade
+++ b/src/gmdb2/gladefiles/gmdb-debug.glade
@@ -177,20 +177,19 @@
 	      <property name="tooltips">True</property>
 
 	      <child>
-		<widget class="button" id="button4">
+		<widget class="GtkToolButton" id="button4">
 		  <property name="visible">True</property>
-		  <property name="label">gtk-new</property>
-		  <property name="use_stock">True</property>
+		  <property name="tooltip" translatable="yes">Open a new window</property>
+		  <property name="stock-id">gtk-new</property>
 		  <signal name="clicked" handler="gmdb_debug_new_cb" last_modification_time="Fri, 03 Jan 2003 13:12:52 GMT"/>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="back_button">
+		<widget class="GtkToolButton" id="back_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Back</property>
-		  <property name="label">gtk-go-back</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-go-back</property>
 		  <signal name="clicked" handler="gmdb_debug_back_cb" object="debug_window"/>
 		  <property name="new_group">True</property>
 		</widget>
@@ -200,30 +199,28 @@
 	      </child>
 
 	      <child>
-		<widget class="button" id="forward_button">
+		<widget class="GtkToolButton" id="forward_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Forward</property>
-		  <property name="label">gtk-go-forward</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-go-forward</property>
 		  <signal name="clicked" handler="gmdb_debug_forward_cb" object="debug_window"/>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="jump_button">
+		<widget class="GtkToolButton" id="jump_button">
 		  <property name="visible">True</property>
-		  <property name="label">gtk-jump-to</property>
-		  <property name="use_stock">True</property>
+		  <property name="tooltip" translatable="yes">Jump to</property>
+		  <property name="stock-id">gtk-jump-to</property>
 		  <signal name="clicked" handler="gmdb_debug_jump_cb" object="debug_window"/>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="close_button">
+		<widget class="GtkToolButton" id="close_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Save File</property>
-		  <property name="label">gtk-close</property>
-		  <property name="use_stock">True</property>
+		  <property name="tooltip" translatable="yes">Close window</property>
+		  <property name="stock-id">gtk-close</property>
 		  <signal name="clicked" handler="gmdb_debug_close_cb" object="debug_window"/>
 		  <property name="new_group">True</property>
 		</widget>
diff --git a/src/gmdb2/gladefiles/gmdb-schema.glade b/src/gmdb2/gladefiles/gmdb-schema.glade
index 0b07f8c..72b40cb 100644
--- a/src/gmdb2/gladefiles/gmdb-schema.glade
+++ b/src/gmdb2/gladefiles/gmdb-schema.glade
@@ -297,6 +297,7 @@
 		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">MySQL</property>
 		    </widget>
+                  </child>
 		</widget>
 	      </child>
 	    </widget>
diff --git a/src/gmdb2/gladefiles/gmdb-sql.glade b/src/gmdb2/gladefiles/gmdb-sql.glade
index 3ae1199..c13e6a5 100644
--- a/src/gmdb2/gladefiles/gmdb-sql.glade
+++ b/src/gmdb2/gladefiles/gmdb-sql.glade
@@ -99,7 +99,6 @@
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">_Execute</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_execute1_activate" last_modification_time="Sat, 21 Dec 2002 15:31:44 GMT"/>
 			  <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
@@ -126,7 +125,6 @@
 			<widget class="GtkImageMenuItem" id="close_menu">
 			  <property name="visible">True</property>
 			  <property name="stock_item">GNOMEUIINFO_MENU_CLOSE_ITEM</property>
-			  <signal name="activate" handler="on_close1_activate" last_modification_time="Sat, 21 Dec 2002 15:25:07 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -212,40 +210,37 @@
 	      <property name="tooltips">True</property>
 
 	      <child>
-		<widget class="button" id="new_button">
+		<widget class="GtkToolButton" id="new_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Start new query</property>
-		  <property name="label">gtk-new</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-new</property>
 		  <signal name="clicked" handler="gmdb_sql_new_cb" last_modification_time="Mon, 13 Jan 2003 13:35:04 GMT"/>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="open_button">
+		<widget class="GtkToolButton" id="open_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Load query from file</property>
-		  <property name="label">gtk-open</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-open</property>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="save_button">
+		<widget class="GtkToolButton" id="save_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Save query to file</property>
 		  <property name="label" translatable="yes">Save Results</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_pixmap">gtk-save</property>
+		  <property name="stock-id">gtk-save</property>
 		</widget>
 	      </child>
 
 	      <child>
-		<widget class="button" id="execute_button">
+		<widget class="GtkToolButton" id="execute_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Execute query</property>
-		  <property name="label">gtk-execute</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-execute</property>
 		</widget>
 		<packing>
 		  <property name="new_group">True</property>
@@ -253,7 +248,7 @@
 	      </child>
 
 	      <child>
-		<widget class="button" id="results_button">
+		<widget class="GtkToolButton" id="results_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Save results to a file</property>
 		  <property name="label" translatable="yes">Save Results</property>
@@ -263,11 +258,10 @@
 	      </child>
 
 	      <child>
-		<widget class="button" id="close_button">
+		<widget class="GtkToolButton" id="close_button">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Close this window</property>
-		  <property name="label">gtk-close</property>
-		  <property name="use_stock">True</property>
+		  <property name="stock-id">gtk-close</property>
 		</widget>
 		<packing>
 		  <property name="new_group">True</property>
@@ -393,7 +387,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label1">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Recent Querys:</property>
+			  <property name="label" translatable="yes">Recent Queries:</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -424,7 +418,7 @@
 			    <widget class="GtkEntry" id="combo_entry">
 			      <property name="height_request">24</property>
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Recently Executed Querys</property>
+			      <property name="tooltip" translatable="yes">Recently Executed Queries</property>
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
 			      <property name="visibility">True</property>
diff --git a/src/gmdb2/gladefiles/gmdb.glade b/src/gmdb2/gladefiles/gmdb.glade
index afb6e29..124d917 100644
--- a/src/gmdb2/gladefiles/gmdb.glade
+++ b/src/gmdb2/gladefiles/gmdb.glade
@@ -654,7 +654,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="querys_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Querys</property>
+		      <property name="label" translatable="yes">Queries</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>