diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 35ad1250638..72f3509f60b 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -31,7 +31,7 @@ Contributor(s): ______________________________________. -->
 ]>
 
 <overlay id="navigatorOverlay"
-         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:html="http://www.w3.org/TR/REC-html40"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -329,31 +329,22 @@ END of Deprecated -->
   
   <menu accesskey="s" value="&searchMenu.label;">
     <menupopup id="searchMenu">
-      <menuitem accesskey="&findOnCmd.accesskey;"    key="key_find" observes="Browser:Find"/>
-      <menuitem accesskey="&findAgainCmd.accesskey;" key="key_findAgain" observes="Browser:FindAgain"/>
-      <menuseparator />
-      <menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://search.netscape.com/')"/>
-      	<menu value="&searchOptions.label;">
-      	  <menupopup>
-      	    <menuitem id="simpleSearch" value="&simpleMode.label;" oncommand="setBrowserSearchMode(0);" />
-      	    <menuitem id="advancedSearch" value="&advancedMode.label;" oncommand="setBrowserSearchMode(1);" />
-      	  </menupopup>
-      	</menu>
-      <menuseparator />
+       <menuitem accesskey="&findOnCmd.accesskey;"    key="key_find" observes="Browser:Find"/>
+       <menuitem accesskey="&findAgainCmd.accesskey;" key="key_findAgain" observes="Browser:FindAgain"/>
+       <menuseparator />
+      <menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://search.netscape.com/')"/>      	
       <menuitem value="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
       <menuitem value="&searchAllMailCmd.label;" accesskey="&searchAllMailCmd.accesskey;" disabled="true" oncommand=""/>
       <menuitem value="&searchAddressbookCmd.label;" accesskey="&searchAddressbookCmd.accesskey;" disabled="true" oncommand="OpenSearch('addressbook', true, null);"/>
-    </menupopup>
-  </menu>
-
-  <menu accesskey="&goMenu.accesskey;" id="gomenu" value="&goMenu.label;" oncommand="gotoHistoryIndex(event);">
-	  <menupopup oncreate="updateGoMenu(event);">
-		  <menuitem id="menuitem-back" value="&goBackCmd.label;" accesskey="&goBackCmd.accesskey;"  key="goBackKb" observes="canGoBack"/>
-		  <menuitem id="menuitem-forward" value="&goForwardCmd.label;" accesskey="&goForwardCmd.accesskey;"  key="goForwardKb" observes="canGoForward" />
-		  <menuitem id="menuitem-home" accesskey="&goHomeCmd.accesskey;" key="goHomeKb" observes="Browser:Home"/>
-		  <menuseparator />
-	  </menupopup>
-  </menu>
+      <menuseparator />
+       <menu value="&searchOptions.label;">
+       	  <menupopup>
+       	    <menuitem id="simpleSearch" value="&simpleMode.label;" oncommand="setBrowserSearchMode(0);" />
+       	    <menuitem id="advancedSearch" value="&advancedMode.label;" oncommand="setBrowserSearchMode(1);" />
+       	  </menupopup>
+       	</menu>
+     </menupopup>
+   </menu>
   
       <menu accesskey="&bookmarksMenu.accesskey;" value="&bookmarksMenu.label;"
                            datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">