diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 27c9d8e6628..12b1f5cd6c9 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -200,9 +200,6 @@
         <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 />
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')"/>
       </menupopup>
     </menu>
@@ -218,19 +215,6 @@
         </menu>   
         <menuseparator />
   
-        <menu accesskey="&goMenu.accesskey;" label="&goMenu.label;" oncommand="gotoHistoryIndex(event);">
-          <menupopup oncreate="updateGoMenu(event);">
-            <menuitem label="&goBackCmd.label;"    accesskey="&goBackCmd.accesskey;"    key="goBackKb"    command="Browser:Back"/>
-            <menuitem label="&goForwardCmd.label;" accesskey="&goForwardCmd.accesskey;" key="goForwardKb" command="Browser:Forward"/>
-            <menuitem label="&goHomeCmd.label;"    accesskey="&goHomeCmd.accesskey;"    command="Browser:Home" key="goHome"/>
-            <menuseparator hidden="true"/>
-          </menupopup>
-        </menu>         
-        <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" oncommand="BrowserStop();" key="key_stop"/>
-        <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
-        <menuitem label="&showImagesCmd.label;" accesskey="&showImagesCmd.accesskey;" disabled="true" oncommand="BrowserReload();"/>
-        <menuseparator />
-
         <!-- overlayed from viewZoomOverlay.xul -->
         <menu id="menu_textZoom"/>
 
@@ -239,12 +223,32 @@
             <menuitem label="&useStyleSheetNone.label;" id="authssnoopt" type="radio" name="authorstyle" oncommand="stylesheetSwitch(window._content.document, '')"/>
           </menupopup>
         </menu>
-        <menu id="charsetMenu" />
-        <menuitem accesskey="&translateMenu.accesskey;" label="&translateMenu.label;" oncommand="Translate();"/>
+        <menuseparator />
+        <menuitem accesskey="&reloadCmd.accesskey;" key="key_reload" label="&reloadCmd.label;" oncommand="BrowserReload();"/>
+        <menuitem label="&showImagesCmd.label;" accesskey="&showImagesCmd.accesskey;" disabled="true" oncommand="BrowserReload();"/>
+        <menuitem label="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" 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;" oncommand="Translate();"/>
+        <menu label="&webContentMenu.label;" accesskey="&webContentMenu.accesskey;">
+          <menupopup datasources="rdf:chrome"  ref="urn:mozilla:locale:root" 
+                     sortResource="http://www.mozilla.org/rdf/chrome#name"
+                     sortDirection="ascending" oncommand="selectLocale(event)">
+            <menuitem label="&downloadMore.label;" accesskey="&downloadMore.accesskey;" 
+                      oncommand="loadXURL('urn:clienturl:viewmenu:intlwebcontent');"/>
+            <menuseparator/>
+            <template>
+              <menuitem class="standard" uri="rdf:*" 
+                        label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
+                        value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
+            </template>
+          </menupopup>
+        </menu>
+        <menu id="charsetMenu" />
+        
         <menuseparator/>
         <menu label="&applyTheme.label;" accesskey="&applyTheme.accesskey;">
           <menupopup datasources="rdf:chrome" ref="urn:mozilla:skin:root" oncommand="applyTheme(event.target)">
@@ -265,10 +269,22 @@
 
     <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 oncreate="updateGoMenu(event);">
+        <menuitem label="&goBackCmd.label;"    accesskey="&goBackCmd.accesskey;"    key="goBackKb"    command="Browser:Back"/>
+        <menuitem label="&goForwardCmd.label;" accesskey="&goForwardCmd.accesskey;" key="goForwardKb" command="Browser:Forward"/>
+        <menuitem label="&goHomeCmd.label;"    accesskey="&goHomeCmd.accesskey;"    command="Browser:Home" key="goHome"/>
+        <menuseparator hidden="true"/>
+      </menupopup>
+    </menu>         
+    
     <menu id="BookmarksMenu" label="&bookmarksMenu.label;" accesskey="&bookmarksMenu.accesskey;" 
           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" 
           ref="NC:BookmarksRoot" flags="dont-test-empty" template="bookmarksMenuTemplate"
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 1deea79a1d6..a2fc486b787 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -13,21 +13,21 @@
 
 <!ENTITY nothingAvailable.label "(Nothing Available)">
 
-<!ENTITY browserCmd.label					"New Navigator Window">
-<!ENTITY browserCmd.accesskey				"n">
+<!ENTITY browserCmd.label	"New Navigator Window">
+<!ENTITY browserCmd.accesskey	"n">
 <!ENTITY openCmd.label "Open Web Location...">
 <!ENTITY openCmd.accesskey "l">
 <!ENTITY openCmd.commandkey "l">
 <!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 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">
@@ -63,6 +63,8 @@
 <!ENTITY translateMenu.label "Translate">
 <!ENTITY translateMenu.accesskey "t">
 <!ENTITY translate.commandKey "t">
+
+<!-- I'd like all this to move to an overlay or something -->
 <!ENTITY bidiMenu.label "Bidi Options">
 <!ENTITY directionBidiMenu.label "Default Direction">
 <!ENTITY directionRTLBidiCmd.label "Right to Left">
@@ -87,15 +89,20 @@
 <!ENTITY charactersetBidiMenu.label "Character set">
 <!ENTITY doccharactersetBidiCmd.label "Use the document specified character set">
 <!ENTITY defaultcharactersetBidiCmd.label "Use my default character set, overriding the document-specified character set">
-<!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 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...">
+<!ENTITY findOnCmd.label "Find in This Page...">
 <!ENTITY findOnCmd.accesskey "f">
 <!ENTITY findOnCmd.commandkey "f">
 <!ENTITY findAgainCmd.label "Find Again">
@@ -272,7 +279,7 @@
 <!ENTITY goButton.label               "Go">
 <!ENTITY goButton.tooltip             "Type a location in the field to the left, then click Go">
 <!ENTITY printButton.label            "Print">
-<!ENTITY printButton.tooltip 		  "Print this page">
+<!ENTITY printButton.tooltip          "Print this page">
 
 <!ENTITY throbber.tooltip             "Go to the &vendorShortName; home page">