diff -rN -u old-nautilus-2.15.91/src/nautilus-navigation-window.c new-nautilus-2.15.91/src/nautilus-navigation-window.c
--- old-nautilus-2.15.91/src/nautilus-navigation-window.c	2006-08-31 16:41:15.011807250 +1200
+++ new-nautilus-2.15.91/src/nautilus-navigation-window.c	2006-08-31 16:41:15.103813000 +1200
@@ -234,6 +234,26 @@
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,
 			  0,                                  0);
 	gtk_widget_show (toolbar);
+	
+	/* Allocate the zoom control.  It will be put on the toolbar
+	 * by nautilus_navigation_window_intialize_toolbars.
+	 */
+	window->zoom_control = nautilus_zoom_control_new ();
+	g_signal_connect_object (window->zoom_control, "zoom_in",
+				 G_CALLBACK (nautilus_window_zoom_in),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_out",
+				 G_CALLBACK (nautilus_window_zoom_out),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_to_level",
+				 G_CALLBACK (nautilus_window_zoom_to_level),
+				 window, G_CONNECT_SWAPPED);
+	g_signal_connect_object (window->zoom_control, "zoom_to_default",
+				 G_CALLBACK (nautilus_window_zoom_to_default),
+				 window, G_CONNECT_SWAPPED);
+	
+	window->view_as_combo_box = gtk_combo_box_new_text ();	
+	gtk_widget_show (window->view_as_combo_box);
 
 	nautilus_navigation_window_initialize_toolbars (window);
 
@@ -281,50 +301,7 @@
 	gtk_box_pack_start (GTK_BOX (hbox),
 			    window->navigation_bar,
 			    TRUE, TRUE, 0);
-
-	/* Option menu for content view types; it's empty here, filled in when a uri is set.
-	 * Pack it into vbox so it doesn't grow vertically when location bar does. 
-	 */
-	view_as_menu_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_widget_show (view_as_menu_vbox);
-
-	item = gtk_tool_item_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
-	gtk_widget_show (GTK_WIDGET (item));
-	gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
-	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
-			    item, -1);
-	
-	window->view_as_combo_box = gtk_combo_box_new_text ();
-	gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, TRUE, FALSE, 0);
-	gtk_widget_show (window->view_as_combo_box);
-
-	/* Allocate the zoom control and place on the right next to the menu.
-	 * It gets shown later, if the view-frame contains something zoomable.
-	 */
-	window->zoom_control = nautilus_zoom_control_new ();
-	g_signal_connect_object (window->zoom_control, "zoom_in",
-				 G_CALLBACK (nautilus_window_zoom_in),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_out",
-				 G_CALLBACK (nautilus_window_zoom_out),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_to_level",
-				 G_CALLBACK (nautilus_window_zoom_to_level),
-				 window, G_CONNECT_SWAPPED);
-	g_signal_connect_object (window->zoom_control, "zoom_to_default",
-				 G_CALLBACK (nautilus_window_zoom_to_default),
-				 window, G_CONNECT_SWAPPED);
-	
-	item = gtk_tool_item_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
-	gtk_widget_show (GTK_WIDGET (item));
-	gtk_container_add (GTK_CONTAINER (item),  window->zoom_control);
-	gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
-			    item, 1);
-
-	gtk_widget_show (location_bar);
-
+			    
 	gtk_table_attach (GTK_TABLE (NAUTILUS_WINDOW (window)->details->table),
 			  location_bar,
 			  /* X direction */                    /* Y direction */
@@ -335,6 +312,8 @@
 	eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY,
 						  always_use_location_entry_changed,
 						  window, G_OBJECT (window));
+	
+	gtk_widget_show (location_bar);
 }
 
 static void
diff -rN -u old-nautilus-2.15.91/src/nautilus-window-toolbars.c new-nautilus-2.15.91/src/nautilus-window-toolbars.c
--- old-nautilus-2.15.91/src/nautilus-window-toolbars.c	2006-08-31 16:41:15.007807000 +1200
+++ new-nautilus-2.15.91/src/nautilus-window-toolbars.c	2006-08-31 16:41:15.083811750 +1200
@@ -42,6 +42,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
+#include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
@@ -78,25 +79,63 @@
 nautilus_navigation_window_activate_throbber (NautilusNavigationWindow *window)
 {
 	GtkToolItem *item;
+	GtkWidget *view_as_menu_vbox;
 	GtkWidget *throbber;
+	
+	/*Preconditions*/
+	g_return_if_fail (window->zoom_control != NULL);
+	g_return_if_fail (window->view_as_combo_box != NULL);
 
 	if (window->details->throbber != NULL) {
 		return;
 	}
+	
+	/*Seperator*/
+	item = gtk_separator_tool_item_new ();
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+	
+	/*Zoom control*/
+	item = gtk_tool_item_new ();
+	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_container_add (GTK_CONTAINER (item), window->zoom_control);
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+	
+	/*Seperator*/
+	item = gtk_separator_tool_item_new ();
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+			    
+	/*View as combo*/
+	view_as_menu_vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+	gtk_widget_show (view_as_menu_vbox);
 
 	item = gtk_tool_item_new ();
+	gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
+	gtk_widget_show (GTK_WIDGET (item));
+	gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox);
+	gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, FALSE, FALSE, 0);
+	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
+			    item, -1);
+	
+	/*Spacing*/
+	item = gtk_tool_item_new ();
 	gtk_widget_show (GTK_WIDGET (item));
 	gtk_tool_item_set_expand (item, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
 			    item, -1);
 	
+	/*Throbber*/
 	throbber = nautilus_throbber_new ();
 	gtk_widget_show (GTK_WIDGET (throbber));
 	
 	item = gtk_tool_item_new ();
 	gtk_container_add (GTK_CONTAINER (item), throbber);
 	gtk_widget_show (GTK_WIDGET (item));
-	
 	gtk_toolbar_insert (GTK_TOOLBAR (window->details->toolbar),
 			    item, -1);
 	

