diff --git a/browser/base/resources/content/browser.xul b/browser/base/resources/content/browser.xul
index 63e60c6030f..a266d7f938b 100644
--- a/browser/base/resources/content/browser.xul
+++ b/browser/base/resources/content/browser.xul
@@ -24,11 +24,10 @@ Contributor(s): ______________________________________. -->
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <?xul-overlay href="chrome://browser/content/navigatorOverlay.xul"?>
-<?xul-overlay href="chrome://browser/content/navExtraOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 
 
 <!DOCTYPE window [
@@ -75,7 +74,6 @@ Contributor(s): ______________________________________. -->
   <!-- Navigator -->
   <script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/browser-2.js"/>
-  <script type="application/x-javascript" src="chrome://browser/content/navigator.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/navigatorDD.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/sessionHistoryUI.js"/>
 
@@ -93,22 +91,17 @@ Contributor(s): ______________________________________. -->
     <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
     <commandset id="clipboardEditMenuItems"/>
-    <!-- <command id="cmd_pageSetup"/> -->
-    <command id="toggleSidebar"/>
   </commandset>
     
   <!-- broadcasters are appended from the overlay -->
   <broadcasterset id="navBroadcasters"/>
    
   <!-- keys are appended from the overlay -->
-  <keyset id="navKeys">
-    <key id="showHideSidebar"/>
-  </keyset>
+  <keyset id="navKeys"/>
   
   <popup id="backMenu" position="after_start" onpopupshowing="return BrowserBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
   <popup id="forwardMenu" position="after_start" onpopupshowing="return BrowserForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
   <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
-  <popup id="sidebarPopup"/>
 
   <popupset id="bookmarksPopupset"/>
  
@@ -399,25 +392,20 @@ Contributor(s): ______________________________________. -->
     </toolbar>
 
   </toolbox>
-    
-  <hbox flex="1">
-    <vbox id="sidebar-box" class="chromeclass-extrachrome"/>
-    <splitter id="sidebar-splitter" class="chromeclass-extrachrome" />
-  
-    <!-- we only need to handle |ondragdrop| because everything else is
-          taken care of by the builtin behavior inside the tabbrowser -->
-    <vbox id="appcontent" flex="1"
-         ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
+     
+  <!-- we only need to handle |ondragdrop| because everything else is
+        taken care of by the builtin behavior inside the tabbrowser -->
+  <vbox id="appcontent" flex="1"
+       ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
 
-      <!-- this box is temporary, pending XBLified <browser> -->
-      <hbox id="browser" flex="1">
-        <tabbrowser id="content"
-                 flex="1" contenttooltip="aHTMLTooltip"
-                 contentcontextmenu="contentAreaContextMenu"
-                 onclick="return contentAreaClick(event);"/>
-      </hbox>
-    </vbox>  
-  </hbox>
+    <!-- this box is temporary, pending XBLified <browser> -->
+    <hbox id="browser" flex="1">
+      <tabbrowser id="content"
+               flex="1" contenttooltip="aHTMLTooltip"
+               contentcontextmenu="contentAreaContextMenu"
+               onclick="return contentAreaClick(event);"/>
+    </hbox>
+  </vbox>  
 
   <statusbar id="status-bar" class="chromeclass-status"
              ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
diff --git a/browser/base/resources/content/navigatorOverlay.xul b/browser/base/resources/content/navigatorOverlay.xul
index a37d32dd27a..048f6bfbf86 100644
--- a/browser/base/resources/content/navigatorOverlay.xul
+++ b/browser/base/resources/content/navigatorOverlay.xul
@@ -50,13 +50,11 @@
     <!-- File Menu -->
     <key id="key_newNavigator"/>
     <key id="key_newNavigatorTab" key="&tabCmd.commandkey;" modifiers="accel" command="cmd_newNavigatorTab"/>
-    <key id="key_newBlankPage"/>
     <key id="focusURLBar"      key="&openCmd.commandkey;" oncommand="ShowAndSelectContentsOfURLBar();"
          modifiers="accel"/>
     <key id="openLocationKb"   key="&openCmd.commandkey;" command="Browser:Open" modifiers="accel,shift"/>
     <key id="openFileKb"         key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage"       key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
-    <key id="key_editPage"       key="&editPageCmd.commandkey;" command="Browser:EditPage" modifiers="accel"/>
     <key id="printKb"            key="&printCmd.commandkey;" command="Browser:Print"  modifiers="accel"/>
     <key id="key_close"/>
     <key id="key_closeWindow"/>
@@ -76,8 +74,6 @@
     <key key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
     <key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
     <key id="key_viewInfo"   key="&pageInfoCmd.commandkey;"   command="View:PageInfo"   modifiers="accel"/>
-    <key id="key_viewNextSidebarPanel" keycode="VK_PAGE_DOWN"  oncommand="SidebarGetRelativePanel(1);"  modifiers="alt" />
-    <key id="key_viewPrevSidebarPanel" keycode="VK_PAGE_UP"  oncommand="SidebarGetRelativePanel(-1);"  modifiers="alt" />
 
     <!-- Search Menu -->  
     <key id="key_find"              key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
@@ -92,8 +88,6 @@
 
     <!-- Misc -->
     <key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
-          <!-- the amazing fishcam dept. -->
-    <key key="f" modifiers="control,alt" oncommand="loadURI('http://home.netscape.com/fishcam/fishcam.html');"/>
     <keyset id="viewZoomKeys"/>
     <keyset id="navigationKeys"/>  
     <keyset id="tasksKeys"/>
@@ -103,13 +97,8 @@
     <command id="cmd_newNavigator"/>
     <command id="cmd_newNavigatorTab" oncommand="BrowserOpenTab();"/>
 
-    <command id="cmd_newEditor"/>
-    <!-- NOT IMPLEMENTED
-    <command id="cmd_newEditorTemplate"/>
-    <command id="cmd_newEditorDraft"/> -->
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
     <command id="Browser:SavePage" oncommand="saveDocument(window._content.document);"/>
-    <command id="Browser:EditPage" oncommand="editPageOrFrame();" observes="isImage"/>
     <command id="Browser:Open" oncommand="BrowserOpenWindow();"/>
     <command id="Browser:PrintSetup" oncommand="BrowserPrintSetup();"/>
     <command id="Browser:Print" oncommand="BrowserPrint();"/>
@@ -173,26 +162,17 @@
     <menu id="menu_File">
       <menupopup id="menu_FilePopup" onpopupshowing="getContentAreaFrameCount();">
         <menuitem label="&browserCmd.label;" accesskey="&browserCmd.accesskey;" key="key_newNavigator" command="cmd_newNavigator"/>
-        <menu id="menu_New">
-          <menupopup id="menu_NewPopup">
-            <!-- From globalOverlay.xul -->
-            <menuitem id="menu_newNavigator" command="cmd_newNavigator"/>
-            <menuitem id="menu_newNavigatorTab" command="cmd_newNavigatorTab" key="key_newNavigatorTab"
-                      label="&tabCmd.label;" accesskey="&tabCmd.accesskey;"/>
-            <menuitem id="menu_newEditor"    command="cmd_newEditor"/>
-          </menupopup>
-        </menu>
+        <menuitem id="menu_newNavigatorTab" command="cmd_newNavigatorTab" key="key_newNavigatorTab"
+                  label="&tabCmd.label;" accesskey="&tabCmd.accesskey;"/>
         <menuitem label="&openCmd.label;" accesskey="&openCmd.accesskey;" key="openLocationKb" command="Browser:Open"/>
         <menuitem label="&openFileCmd.label;" accesskey="&openFileCmd.accesskey;" key="openFileKb" command="Browser:OpenFile"/>
-        <menuseparator/>
         <menuitem id="menu_close"/>
         <menuitem id="menu_closeWindow" hidden="true" command="cmd_closeWindow" key="key_closeWindow" label="&closeWindow.label;"/>
         <menuseparator id="menu_closeSeparator" hidden="true"/>
+        <menuseparator/>
         <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"/>
         <menuitem id="savepage" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="saveFrameDocument();" hidden="true"/>
         <menuseparator/>
-        <menuitem label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;" key="key_editPage" command="Browser:EditPage" />
-        <menuseparator/>
         <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="Browser:PrintSetup"/>
         <menuitem id="printPreviewMenuItem" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="Browser:PrintPreview"/>
         <menuitem id="printMenuItem" label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="Browser:Print"/>
@@ -212,6 +192,9 @@
         <menuitem id="menu_delete"/>
         <menuseparator/>
         <menuitem id="menu_selectAll"/>
+        <menuseparator/>
+        <menuitem id="menu_find" label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="Browser:Find"/>
+        <menuitem id="menu_findAgain" label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="Browser:FindAgain"/>
         <menuseparator id="menu_PrefsSeparator"/> 
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')"/>
       </menupopup>
@@ -219,7 +202,7 @@
 
     <menu id="menu_View" accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
       <menupopup id="menu_View_Popup">
-        <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="view_toolbars">
+        <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="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewpersonaltoolbar" />
@@ -231,7 +214,10 @@
                   label="&fullScreenCmd.label;" key="key_fullScreen"
                   command="View:FullScreen" hidden="true"/>
         <menuseparator />
-  
+        <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
+        <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" disabled="true" oncommand="BrowserStop();" key="key_stop"/>
+        <menuseparator/>
+ 
         <!-- overlayed from viewZoomOverlay.xul -->
         <menu id="menu_textZoom" observes="isImage"/>
 
@@ -242,27 +228,16 @@
           </menupopup>
         </menu>
         <menuseparator />
-        <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
-        <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" disabled="true" oncommand="BrowserStop();" key="key_stop"/>
-        <menuseparator />
         <menuitem accesskey="&pageSourceCmd.accesskey;" label="&pageSourceCmd.label;" key="key_viewSource" command="View:PageSource"/>
         <menuitem accesskey="&pageInfoCmd.accesskey;"   label="&pageInfoCmd.label;"   key="key_viewInfo"   command="View:PageInfo"/>
         <menuseparator />
         
-        <menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" observes="isImage" oncommand="Translate();"/>
-
-        <menuitem label="&webContentMenu.label;" accesskey="&webContentMenu.accesskey;" oncommand="goPreferences('pref-contentpacks.xul','chrome://content-packs/content/pref-contentpacks.xul');">
-        </menuitem>
-        
+        <menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" observes="isImage" oncommand="Translate();"/>      
         <menu id="charsetMenu" observes="isImage"/>
 
         <menuseparator/>
         <menu label="&applyTheme.label;" accesskey="&applyTheme.accesskey;">
           <menupopup datasources="rdf:chrome" ref="urn:mozilla:skin:root" oncommand="applyTheme(event.target)">
-            <menuitem label="&themePreferencesCmd.label;" accesskey="&themePreferencesCmd.accesskey;"
-                      oncommand="goPreferences('pref-themes.xul','chrome://communicator/content/pref/pref-themes.xul')"/>
-            <menuitem label="&getNewThemesCmd.label;" accesskey="&getNewThemesCmd.accesskey;" oncommand="getNewThemes();"/>
-            <menuseparator/>
             <template>
             <menuitem uri="..."
                       label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
@@ -274,15 +249,6 @@
       </menupopup>
     </menu>
 
-    <menu accesskey="&searchMenu.accesskey;" label="&searchMenu.label;">
-      <menupopup id="searchMenu">
-        <menuitem id="menu_find" label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="Browser:Find"/>
-        <menuitem id="menu_findAgain" label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="Browser:FindAgain"/>
-        <menuseparator />
-        <menuitem label="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="loadXURL('urn:clienturl:srchmenu:srchinternet');"/>        
-      </menupopup>
-    </menu>
-
     <menu accesskey="&goMenu.accesskey;" label="&goMenu.label;" oncommand="gotoHistoryIndex(event);">
       <menupopup onpopupshowing="updateGoMenu(event);">
         <menuitem label="&goBackCmd.label;"    accesskey="&goBackCmd.accesskey;"    key="goBackKb"    command="Browser:Back"/>
@@ -351,136 +317,10 @@
     </menu>
       
   <menu id="tasksMenu"/>
+  <menu id="windowMenu"/>
   
   <menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
 
-  <!-- Menu for testing. -->
-  <menu id="debugMenu" accesskey="D" label="Debug">
-    <menupopup>
-      <menu label="Verification">
-        <menupopup>
-          <menuitem label="Tables" oncommand="loadURI('resource:/res/samples/test6.html');"/>
-          <menuitem label="JavaScript" oncommand="loadURI('http://mozilla.org/quality/browser/standards/javascript/tcmatrix/index.html');"/>
-          <menuitem label="GIF Images" oncommand="loadURI('http://www.mozilla.org/quality/browser/debugtc/bft_browser_imagemap.html');"/>
-          <menuitem label="JPEG Images" oncommand="loadURI('resource:/res/samples/test2.html');"/>
-          <menuitem label="PNG Images" oncommand="loadURI('http://www.libpng.org/pub/png/png-MagnoliaAlpha.html');"/>
-          <menuitem label="Transparency" oncommand="loadURI('resource:/res/samples/test13.html');"/>
-          <menuitem label="Animation" oncommand="loadURI('resource:/res/samples/test2.html');"/>
-          <menuitem label="Larger page" oncommand="loadURI('http://www.mozilla.org/quality/browser/debugtc/bft_browser_html_mix3.html');"/>
-          <menuitem label="Smaller page" oncommand="loadURI('http://www.mozilla.org/quality/browser/debugtc/bft_browser_link.html');"/>
-          <menuseparator />
-          <menuitem label="Mozilla" oncommand="loadURI('http://www.mozilla.org');"/>
-          <menuitem label="Yahoo" oncommand="loadURI('http://www.yahoo.com');"/>
-          <menuitem label="Netscape" oncommand="loadURI('http://www.netscape.com');"/>
-          <menuitem label="Excite" oncommand="loadURI('http://www.excite.com');"/>
-          <menuitem label="Microsoft" oncommand="loadURI('http://www.microsoft.com');"/>
-          <menuitem label="city.net" oncommand="loadURI('http://www.city.net');"/>
-          <menuitem label="Mirabilis" oncommand="loadURI('http://www.mirabilis.com');"/>
-          <menuitem label="Time" oncommand="loadURI('http://www.time.com');"/>
-          <menuitem label="Warner Bros." oncommand="loadURI('http://www.warnerbros.com');"/>
-          <menuitem label="CNN" oncommand="loadURI('http://www.cnn.com');"/>
-          <menuitem label="USA Today" oncommand="loadURI('http://www.usatoday.com');"/>
-          <menuitem label="Disney" oncommand="loadURI('http://www.disney.go.com');"/>
-          <menuitem label="Hotwired" oncommand="loadURI('http://www.hotwired.com');"/>
-          <menuitem label="Hotbot" oncommand="loadURI('http://www.hotbot.com');"/>
-        </menupopup>
-      </menu>
-
-      <menu label="Viewer Demos">
-       <menupopup>
-        <menuitem label="#0 Basic Styles"  oncommand="loadURI('resource:/res/samples/test0.html');"/>
-        <menuitem label="#1 CSS Styles"  oncommand="loadURI('resource:/res/samples/test1.html');"/>
-        <menuitem label="#2 Images"  oncommand="loadURI('resource:/res/samples/test2.html');"/>
-        <menuitem label="#3 Basic Tables"  oncommand="loadURI('resource:/res/samples/test3.html');"/>
-        <menuitem label="#4 Simple Tables"  oncommand="loadURI('resource:/res/samples/test4.html');"/>
-        <menuitem label="#5 More Styles"  oncommand="loadURI('resource:/res/samples/test5.html');"/>
-        <menuitem label="#6 Deeply Nested Tables"  oncommand="loadURI('resource:/res/samples/test6.html');"/>
-        <menuitem label="#7 Scaled Anim Image"  oncommand="loadURI('resource:/res/samples/test7.html');"/>
-        <menuitem label="#8 Form"  oncommand="loadURI('resource:/res/samples/test8.html');"/>
-        <menuitem label="#9 Frames"  oncommand="loadURI('resource:/res/samples/test9.html');"/>
-        <menuitem label="#10 Anim Images" oncommand="loadURI('resource:/res/samples/test10.html');"/>
-        <menuitem label="#11 Fixed Positioning" oncommand="loadURI('resource:/res/samples/test11.html');"/>
-        <menuitem label="#12 More Fixed Pos" oncommand="loadURI('resource:/res/samples/test12.html');"/>
-        <menuitem label="#13 DHTML" oncommand="loadURI('resource:/res/samples/test13.html');"/>
-        <menuitem label="#14 XML Sorting" oncommand="loadURI('resource:/res/samples/test14.html');"/>
-        <menuitem label="#15 XML IRS" oncommand="loadURI('resource:/res/samples/test15.html');"/>
-        <menuitem label="#16 Gfx Widgets" oncommand="loadURI('resource:/res/samples/test16.html');"/>
-       </menupopup>
-      </menu>
-
-      <menu label="XBL Test Suite">
-       <menupopup>
-        <menuitem label="#0 Remote XBL"  oncommand="loadURI('http://www.mozilla.org/projects/xbl/test0/test.xul');"/>
-        <menuitem label="#1 Technicolor DIV" oncommand="loadURI('http://www.mozilla.org/projects/xbl/test1/test.html');"/>
-        <menuitem label="#2 Rollover Madness" oncommand="loadURI('http://www.mozilla.org/projects/xbl/test2/test.html');"/>
-        <menuitem label="#3 Popups in HTML" oncommand="loadURI('http://www.mozilla.org/projects/xbl/test3/test.html');"/>
-        <menuitem label="#4 Partition Magic" oncommand="loadURI('http://www.mozilla.org/projects/xbl/test4/test.html');"/>        
-        <menuitem label="#5 Sticky Notes" oncommand="loadURI('http://www.mozilla.org/projects/xbl/test5/test.html');"/>
-       </menupopup>
-      </menu>
-
-      <menu label="XUL Test Suite">
-       <menupopup>
-         <menuitem label="#1 Stacks" oncommand="loadURI('http://www.mozilla.org/projects/xul/tests/stacks.xul');"/>
-         <menuitem label="#2 Popups" oncommand="loadURI('http://www.mozilla.org/projects/xul/tests/popups.xul');"/>
-         <menuitem label="#3 Descriptions and Labels" oncommand="loadURI('http://www.mozilla.org/projects/xul/tests/label.xul');"/>
-         <menuitem label="#4 Dialog Buttons" oncommand="loadURI('http://www.mozilla.org/projects/xul/tests/buttons.xul');"/>
-         <menuitem label="#5 Tabindex" oncommand="loadURI('http://www.mozilla.org/projects/xul/tests/tabindex.xul');"/>
-        </menupopup>
-      </menu>
-
-      <menuitem label="Form Manager Samples" oncommand="loadURI('chrome://communicator/locale/wallet/index.html');"/>
-
-      <menuitem label="chofmann's Browser Buster" oncommand="loadURI('http://komodo.mozilla.org/buster/');"/>
-      <menuitem label="Composer (with test page)" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
-      <menuitem label="Flush Memory" oncommand="Components.classes['@mozilla.org/xpcom/memory-service;1'].getService(Components.interfaces.nsIMemory).heapMinimize(true);" />
-
-      <menuseparator />
-
-      <menuitem label="StringBundle Test" oncommand="loadURI('resource:/res/strres-test.xul');"/>
-      <menuitem label="Bloat: Dump New Stats" oncommand="loadURI('about:bloat?new');"/>
-      <menuitem label="Bloat: Dump All Stats" oncommand="loadURI('about:bloat');"/>
-      <menuitem label="Bloat: Clear Stats" oncommand="loadURI('about:bloat?clear');"/>
-
-      <menuseparator />
-
-      <menu label="Leak Detector">
-       <menupopup>
-        <menuitem label="Dump Memory Leaks"   oncommand="dumpMemoryLeaks();"/>
-        <menuitem label="Trace Chrome" oncommand="traceChrome();"/>
-        <menuitem label="Trace Document" oncommand="traceDocument();"/>
-        <menuitem label="Verbose" oncommand="traceVerbose(this.getAttribute('checked'))" type="checkbox" checked="false"/>
-       </menupopup>
-      </menu>
-    </menupopup>
-  </menu>
-
-  <menu id="qaMenu" accesskey="Q" label="QA">
-    <menupopup>
-      <menuitem label="Getting Involved" oncommand="loadURI('http://www.mozilla.org/start/');"/>
-      <menuitem label="Mozilla QA Overview" oncommand="loadURI('http://www.mozilla.org/quality/');"/>
-
-      <menuseparator />
-
-      <menuitem label="Frequently Reported Bugs" oncommand="loadURI('http://bugzilla.mozilla.org/duplicates.cgi');"/>
-      <menuitem label="Bug Writing Guidelines" oncommand="loadURI('http://www.mozilla.org/quality/bug-writing-guidelines.html');"/>
-      <menuitem label="File a Bug" oncommand="loadURI('http://www.mozilla.org/quality/help/bug-form.html');"/>
-
-      <menuseparator />
-
-      <menuitem label="Bugs Filed Today" oncommand="loadURI('http://bugzilla.mozilla.org/buglist.cgi?changedin=1&amp;chfield=%5BBug+creation%5D&amp;amp;chfieldto=Now&amp;product=Browser&amp;product=MailNews');"/>
-      <menuitem label="CVS Checkins Today" oncommand="loadURI('http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&amp;module=SeaMonkeyAll&amp;branch=HEAD&amp;branchtype=match&amp;sortby=Date&amp;date=day&amp;cvsroot=%2Fcvsroot');"/>
-
-      <menuseparator />
-
-      <menuitem label="Smoke Tests" oncommand="loadURI('http://www.mozilla.org/quality/smoketests/');"/>
-      <menuitem label="Pre-Checkin Tests" oncommand="loadURI('http://www.mozilla.org/quality/precheckin-tests.html');"/>
-
-      <menuseparator />
-
-      <menuitem label="Latest Builds" oncommand="loadURI('ftp://ftp.mozilla.org/pub/mozilla/nightly/latest/');"/>
-    </menupopup>
-  </menu>
 </menubar>
 
 </overlay>
diff --git a/browser/base/resources/locale/navigator.dtd b/browser/base/resources/locale/navigator.dtd
index 2e0c1e283e4..7296c035ca5 100644
--- a/browser/base/resources/locale/navigator.dtd
+++ b/browser/base/resources/locale/navigator.dtd
@@ -15,7 +15,7 @@
 
 <!ENTITY browserCmd.label	"New Navigator Window">
 <!ENTITY browserCmd.accesskey	"N">
-<!ENTITY tabCmd.label "Navigator Tab">
+<!ENTITY tabCmd.label "New Navigator Tab">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
 <!ENTITY openCmd.label "Open Web Location...">
@@ -24,13 +24,6 @@
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY openFileCmd.accesskey "o">
 <!ENTITY openFileCmd.commandkey "o">
-<!ENTITY editPageCmd.label "Edit Page">
-<!ENTITY editPageCmd.accesskey "d">
-<!ENTITY editPageCmd.commandkey "e">
-<!ENTITY editFrameCmd.label "Edit Frame">
-<!ENTITY editFrameCmd.accesskey "m">
-<!ENTITY editFrameSetCmd.label "Edit Frameset">
-<!ENTITY editFrameSetCmd.accesskey "t">
 
 <!ENTITY printSetupCmd.label "Page Setup...">
 <!ENTITY printSetupCmd.accesskey "u">
@@ -98,48 +91,18 @@
 <!ENTITY doccharactersetBidiCmd.label "Use the document specified character set">
 <!ENTITY defaultcharactersetBidiCmd.label "Use my default character set, overriding the document-specified character set">
 
-<!ENTITY webContentMenu.label "Languages and Web Content">
-<!ENTITY webContentMenu.accesskey "l">
-<!ENTITY downloadMore.label "Download More">
-<!ENTITY downloadMore.accesskey "D">
 <!ENTITY applyTheme.label	"Apply Theme"> 
 <!ENTITY applyTheme.accesskey	"A"> 
 <!ENTITY themePreferencesCmd.label "Theme Preferences..."> 
 <!ENTITY themePreferencesCmd.accesskey "T"> 
 <!ENTITY getNewThemesCmd.label "Get New Themes">
 <!ENTITY getNewThemesCmd.accesskey "G">
-<!ENTITY searchMenu.label "Search">
-<!ENTITY searchMenu.accesskey "s">
 <!ENTITY findOnCmd.label "Find in This Page...">
 <!ENTITY findOnCmd.accesskey "f">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.commandkey "g">
-<!-- XXX - boy there's a lot of crap here. -->
-<!ENTITY searchInternetCmd.label "Search the Web">
-<!ENTITY searchInternetCmd.accesskey "w">
-<!ENTITY searchAllMailCmd.label "Search Mail">
-<!ENTITY searchAllMailCmd.accesskey "m">
-<!ENTITY searchAddressbookCmd.label "Search Addressbook">
-<!ENTITY searchAddressbookCmd.accesskey "a">
-<!ENTITY searchComputerCmd.label "Search on this Computer...">
-<!ENTITY searchBusinessMenu.label "Business">
-<!ENTITY searchBusinessMenu.accesskey "u">
-<!ENTITY searchYellowPages.label "Yellow Pages">
-<!ENTITY searchYellowPages.accesskey "y">
-<!ENTITY searchStockQuote.label "Stock Quote Lookup">
-<!ENTITY searchStockQuote.accesskey "s">
-<!ENTITY searchMaps.label "Maps and Directions">
-<!ENTITY searchMaps.accesskey "d">
-<!ENTITY searchPeople.label "People Finder">
-<!ENTITY searchPeople.accesskey "p">
-<!ENTITY searchReferenceDesk.label "Reference Desk">
-<!ENTITY searchReferenceDesk.accesskey "r">
-<!ENTITY searchShopping.label "Shopping Search">
-<!ENTITY searchShopping.accesskey "s">
-<!ENTITY searchInternetKeywords.label "Internet Keywords">
-<!ENTITY searchInternetKeywords.accesskey "k">
 <!ENTITY goMenu.label "Go">
 <!ENTITY goMenu.accesskey "g">
 <!ENTITY goHomeCmd.label "Home">