diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 0a2a5fdc4b2d..86ec02237f7a 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -455,13 +455,11 @@ function Shutdown()
 	    return true;
 	 }
 	 else {
-	 /* NOT NEEDED NOW 
 	   var id = event.target.getAttribute("id");
 	   if (id == "menuitem-back")
 	      BrowserBack();
 	   else if (id == "menuitem-forward")
-	      BrowserForward();	  
-	 */
+	      BrowserForward();
      }
   }
 
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 180d30eea965..332e97f79702 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -223,18 +223,18 @@ Contributor(s): ______________________________________. -->
   
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" persist="collapsed">
       <box id="nav-bar-inner" autostretch="never" flex="1">
+	  <!--
         <button class="button-toolbar-1 top" id="back-button" crop="right" observes="canGoBack"/>  
     	  <button class="button-toolbar-1 top" id="forward-button" crop="right" observes="canGoForward"/>
-    <!--
-          <menubutton class="large-toolbar left" id="back-button" crop="right" orient="vertical" observes="canGoBack" oncommand="gotoHistoryIndex(event);">  
+       -->
+          <menubutton class="menubutton-dual" id="back-button" crop="right" orient="vertical" observes="canGoBack" oncommand="gotoHistoryIndex(event);">  
     	  <menupopup oncreate="BrowserBackMenu(event);">
     	  </menupopup>
     	  </menubutton>
-          <menubutton class="large-toolbar left" id="forward-button" crop="right" orient="vertical" observes="canGoForward" oncommand="gotoHistoryIndex(event);">
+          <menubutton class="menubutton-dual" id="forward-button" crop="right" orient="vertical" observes="canGoForward" oncommand="gotoHistoryIndex(event);">
     	  <menupopup oncreate="BrowserForwardMenu(event);">
     	  </menupopup>
     	  </menubutton>
-    -->	  
         <button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" />
         <button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" onclick="BrowserStop()"/>
     
@@ -256,6 +256,7 @@ Contributor(s): ______________________________________. -->
           <box autostretch="never" valign="middle" flex="1">
       			<image id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/> 
             <textfield class="plain chromeclass-location" id="urlbar" onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
+			<!--<autocomplete class="plain chromeclass-location" searchSessionType="urlbar" id="urlbar" onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/> -->
             <button class="button-toolbar-3" id="search-button" value="&searchButton.label;" oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);" /> 
             <button class="button-toolbar-3" id="go-button" value="&goButton.label;" oncommand="BrowserLoadURL();" /> 
           </box>
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 5cf3c9abb45c..06e15ca9df74 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -126,8 +126,8 @@ Contributor(s): ______________________________________. -->
 	<broadcaster id="Browser:PrintPreview"  value="&printPreviewCmd.label;" disabled="true"  oncommand="BrowserReload();"/>
 	<broadcaster id="Browser:Print"  value="&printCmd.label;"        						 oncommand="BrowserPrint();"/>
   
-	<broadcaster id="canGoBack"	disabled="true" oncommand="BrowserBack();"/>
-	<broadcaster id="canGoForward" disabled="true" oncommand="BrowserForward();"/>
+	<broadcaster id="canGoBack"	disabled="true" buttonaction="BrowserBack();"/>
+	<broadcaster id="canGoForward" disabled="true" buttonaction="BrowserForward();"/>
 	<broadcaster id="Browser:Home" value="&goHomeCmd.label;" oncommand="BrowserHome();" />
   
 	<broadcaster id="Browser:Find"      value="&findOnCmd.label;"            oncommand="BrowserFind();" />