diff --git a/ui/gm-preferences.glade b/ui/gm-preferences.glade
index ce4e54b..f65c147 100644
--- a/ui/gm-preferences.glade
+++ b/ui/gm-preferences.glade
@@ -21,7 +21,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
   <signal name="delete_event" handler="on_gm_preferences_dialog_delete" last_modification_time="Thu, 02 Jun 2005 09:54:40 GMT"/>
 
   <child internal-child="vbox">
diff --git a/ui/gm-scripts.glade b/ui/gm-scripts.glade
index be19e2e..7ec7021 100644
--- a/ui/gm-scripts.glade
+++ b/ui/gm-scripts.glade
@@ -158,7 +158,7 @@
 	      <property name="border_width">3</property>
 	      <property name="visible">True</property>
 	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
 	      <property name="tooltips">True</property>
 	      <property name="show_arrow">True</property>
 
diff --git a/ui/gm-triggers.glade b/ui/gm-triggers.glade
index a5373af..6218994 100644
--- a/ui/gm-triggers.glade
+++ b/ui/gm-triggers.glade
@@ -20,7 +20,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox6">
diff --git a/ui/gm-world-info.glade b/ui/gm-world-info.glade
index b331b7b..3eaf6a8 100644
--- a/ui/gm-world-info.glade
+++ b/ui/gm-world-info.glade
@@ -21,7 +21,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
   <signal name="delete_event" handler="on_gm_world_info_dialog_delete" last_modification_time="Sun, 13 Nov 2005 10:11:31 GMT"/>
 
   <child internal-child="vbox">
diff --git a/ui/gm-world-logs.glade b/ui/gm-world-logs.glade
index bcc30fa..089a145 100644
--- a/ui/gm-world-logs.glade
+++ b/ui/gm-world-logs.glade
@@ -20,7 +20,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="vbox1">
diff --git a/ui/gm-worlds-list.glade b/ui/gm-worlds-list.glade
index cf0eb98..627f7b7 100644
--- a/ui/gm-worlds-list.glade
+++ b/ui/gm-worlds-list.glade
@@ -6,8 +6,7 @@
 <widget class="GtkDialog" id="gm_worlds_list_dialog">
   <property name="width_request">400</property>
   <property name="height_request">300</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Worlds listing</property>
+  <property name="title" translatable="yes">Edit Worlds</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
@@ -22,7 +21,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
@@ -72,17 +71,19 @@
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTreeView" id="tree_view_worlds">
+		<widget class="GtkViewport" id="viewport1">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">False</property>
-		  <property name="rules_hint">True</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		  <property name="fixed_height_mode">False</property>
-		  <property name="hover_selection">False</property>
-		  <property name="hover_expand">False</property>
-		  <signal name="key_press_event" handler="on_tvWorlds_key_press" last_modification_time="Mon, 31 May 2004 12:57:05 GMT"/>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+
+		  <child>
+		    <widget class="Custom" id="tree_view_worlds">
+		      <property name="visible">True</property>
+		      <property name="creation_function">gm_worlds_list_dialog_create_tree_view</property>
+		      <property name="int1">0</property>
+		      <property name="int2">0</property>
+		      <property name="last_modification_time">Tue, 28 Mar 2006 22:00:23 GMT</property>
+		    </widget>
+		  </child>
 		</widget>
 	      </child>
 	    </widget>
@@ -94,11 +95,10 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVButtonBox" id="vbuttonbox1">
-	      <property name="border_width">6</property>
+	    <widget class="GtkVButtonBox" id="vbutton_box_buttons">
 	      <property name="visible">True</property>
 	      <property name="layout_style">GTK_BUTTONBOX_START</property>
-	      <property name="spacing">6</property>
+	      <property name="spacing">0</property>
 
 	      <child>
 		<widget class="GtkButton" id="button_new">
@@ -115,7 +115,6 @@
 
 	      <child>
 		<widget class="GtkButton" id="button_duplicate">
-		  <property name="border_width">2</property>
 		  <property name="visible">True</property>
 		  <property name="can_default">True</property>
 		  <property name="can_focus">True</property>
@@ -193,6 +192,7 @@
 		<widget class="GtkButton" id="button_modify">
 		  <property name="visible">True</property>
 		  <property name="can_default">True</property>
+		  <property name="has_default">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="label">gtk-edit</property>
 		  <property name="use_stock">True</property>