diff --git a/browser/base/resources/content/navigatorOverlay.xul b/browser/base/resources/content/navigatorOverlay.xul
index 23734d90d9cb..7bdfc210e388 100644
--- a/browser/base/resources/content/navigatorOverlay.xul
+++ b/browser/base/resources/content/navigatorOverlay.xul
@@ -151,7 +151,6 @@
     <broadcaster id="cmd_viewnavbar" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
     <broadcaster id="cmd_viewpersonaltoolbar" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
     <broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('status-bar','cmd_viewtaskbar');" checked="true"/>
-    <broadcaster id="cmd_viewcomponentbar" oncommand="goToggleToolbar('component-bar', 'cmd_viewcomponentbar');" checked="true"/>
     <broadcaster id="cmd_viewlocationbar" oncommand="goToggleToolbar('LocationToolbar','cmd_viewlocationbar');" checked="true"/>
     <broadcaster id="isImage"/>
   </broadcasterset>
@@ -199,15 +198,14 @@
       </menupopup>
     </menu>
 
-    <menu id="menu_View" accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
-      <menupopup id="menu_View_Popup">
+    <menu accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
+      <menupopup>
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;">
           <menupopup id="view_toolbars_popup" onpopupshowing="updateToolbarStates(this);"> 
             <menuitem label="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewnavbar"  />
             <menuitem label="&locationbarCmd.label;" accesskey="&locationbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewlocationbar"/>
             <menuitem label="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewpersonaltoolbar" />
             <menuitem label="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewtaskbar" />
-            <menuitem label="&componentbarCmd.label;" accesskey="&componentbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewcomponentbar"/>
           </menupopup>
         </menu>   
         <menuitem id="menuitem_fullScreen" accesskey="&fullScreenCmd.accesskey;"
@@ -288,7 +286,6 @@
         <!-- for some reason these don't work as command="" -->
         <menuitem key="addBookmarkKb"   observes="Browser:AddBookmark"/>
         <menuitem key="addBookmarkAsKb" observes="Browser:AddBookmarkAs"/>
-        <menuseparator/>
         <menuitem key="manBookmarkKb"   observes="Browser:ManageBookmark"/>
         <menuseparator/>
       </menupopup>