diff --git a/suite/browser/mac/platformNavigationBindings.xul b/suite/browser/mac/platformNavigationBindings.xul
new file mode 100644
index 00000000000..9e25cc37604
--- /dev/null
+++ b/suite/browser/mac/platformNavigationBindings.xul
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<overlay id="platformNavigationBindings"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <keyset id="keyset">
+    <!-- proper arrow key navigation, 4.xP -->
+    <key id="goBackKb" xulkey="true" keycode="VK_LEFT" observes="Browser:Back"/>
+    <key id="goForwardKb" xulkey="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
+
+  </keyset>  
+
+</overlay>
\ No newline at end of file
diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 087cbfbfc03..cc794d61edc 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -96,7 +96,6 @@ function savePage( url )
  **/
 function getContentAreaFrameCount()
 {
-  dump("*** check number of frames in content area \n");
   var saveFrameItem = document.getElementById("savepage");
   if (!window._content.frames.length ||
       !isDocumentFrame(document.commandDispatcher.focusedWindow))
@@ -924,7 +923,7 @@ function RevealSearchPanel()
       fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText | 
 			nsIFilePicker.filterAll | nsIFilePicker.filterImages | nsIFilePicker.filterXML);
       if (fp.show() == nsIFilePicker.returnOK) {
-        openNewWindowWith(fp.fileURL.spec);
+        openTopWin(fp.fileURL.spec);
       }
     } catch (ex) { }
   }
@@ -1153,10 +1152,10 @@ function BrowserEditBookmarks()
 
     try {
       appCore.loadUrl(gURLBar.value);
+      window._content.focus();
     }
     catch(e) {
     }
-    window._content.focus();
   }
 
   function readFromClipboard()
diff --git a/suite/browser/navigatorDD.js b/suite/browser/navigatorDD.js
index 0b075f595e8..db5bd224fe7 100644
--- a/suite/browser/navigatorDD.js
+++ b/suite/browser/navigatorDD.js
@@ -42,8 +42,6 @@ var RDFUtils = {
   
   getTarget: function(aDS, aSourceID, aPropertyID)
     {
-      dump("*** aSourceID = " + aSourceID + "\n");
-      dump("*** aPropertyID = " + aPropertyID + "\n");
       var source = this.getResource(aSourceID);
       var property = this.getResource(aPropertyID);
       return aDS.GetTarget(source, property, true);
@@ -249,6 +247,7 @@ var contentAreaDNDObserver = {
 
   getSupportedFlavours: function ()
     {
+      dump("*** get supported flavours\n");
       var flavourList = { };
       //flavourList["moz/toolbaritem"] = { width: 2 };
       flavourList["text/unicode"] = { width: 2, iid: "nsISupportsWString" };
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 09d351fb7c5..c79a26f6244 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -22,6 +22,7 @@ Contributor(s): ______________________________________. -->
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
+<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@@ -71,10 +72,13 @@ Contributor(s): ______________________________________. -->
 
 	<key id="key_savePage"        xulkey="true"  key="&savePageCmd.commandkey;" observes="Browser:SavePage"/>
 		
-	<key id="goForwardKb"         xulkey="true" key="&goForwardCmd.commandkey;" observes="Browser:Forward" />
-	<key id="goBackKb"            xulkey="true" key="&goBackCmd.commandkey;" observes="Browser:Back" />
-	<key id="goHomeKb"            xulkey="true" key="&goHomeCmd.commandkey;" observes="Browser:Home" />
-    
+  <key id="goHomeKb"            alt="true" keycode="VK_HOME" observes="Browser:Home" />
+  <key id="key_gotoHistory"     xulkey="true" shift="false" key="&history.commandKey;" onkeypress="toHistory();"/>
+ 
+  
+  <key id="stop"                keycode="VK_ESCAPE" onkeypress="BrowserStop();"/>
+  
+  
 	<key id="addBookmarkKb"       xulkey="true" key="&addCurPageCmd.commandkey;" observes="Browser:AddBookmark" />
 	<key id="manBookmarkKb"       xulkey="true" key="&manBookmarksCmd.commandkey;" observes="Browser:ManageBookmark" />
 
diff --git a/suite/browser/unix/platformNavigationBindings.xul b/suite/browser/unix/platformNavigationBindings.xul
new file mode 100644
index 00000000000..c4e9073547e
--- /dev/null
+++ b/suite/browser/unix/platformNavigationBindings.xul
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://navigator/locale/platformNavigationBindings.dtd">
+
+<overlay id="platformNavigationBindings"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <keyset id="keyset">
+    <!-- proper arrow key navigation, 4.xP -->
+    <key id="goBackKb" xulkey="true" keycode="VK_LEFT" observes="Browser:Back"/>
+    <key id="goForwardKb" xulkey="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
+
+    <!-- Some people apparently use this combination too on Unix...
+         we live and learn.  -->
+    <key id="goBackKbWacko" xulkey="true" key="&goForwardCmd.commandKey;" observes="Browser:Back"/>
+    <key id="goForwardKbWacko" xulkey="true" key="&goBackCmd.commandKey;" observes="Browser:Forward"/>
+  </keyset>  
+
+</overlay>
\ No newline at end of file
diff --git a/suite/browser/win/platformNavigationBindings.xul b/suite/browser/win/platformNavigationBindings.xul
new file mode 100644
index 00000000000..180fb540cd7
--- /dev/null
+++ b/suite/browser/win/platformNavigationBindings.xul
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<overlay id="platformNavigationBindings"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <keyset id="keyset">
+    <!-- back and forward accelerators on Windows, strangely enough, are
+         Alt+Left arrow and Alt+Right arrow. -->
+    <key id="goBackKb" alt="true" keycode="VK_LEFT" observes="Browser:Back"/>
+    <key id="goForwardKb" alt="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
+
+    <!-- Supporting IE forward and back accelerators out of courtesy
+         to transitioning IE users -->
+    <key id="goBackKbIE" shift="false" keycode="VK_BACK" observes="Browser:Back"/>
+    <key id="goForwardKbIE" shift="true" keycode="VK_BACK" observes="Browser:Forward"/>
+
+  </keyset>  
+
+</overlay>
\ No newline at end of file
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 5c5c1d83c49..08606efad22 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -157,13 +157,11 @@
 <!ENTITY goMenu.accesskey "g">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "b">
-<!ENTITY goBackCmd.commandkey "[">
 <!ENTITY goForwardCmd.label "Forward">
 <!ENTITY goForwardCmd.accesskey "f">
-<!ENTITY goForwardCmd.commandkey "]">
 <!ENTITY goHomeCmd.label "Home">
 <!ENTITY goHomeCmd.accesskey "h">
-<!ENTITY goHomeCmd.commandkey "h">
+<!ENTITY history.commandKey "h">
 
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
diff --git a/suite/locales/en-US/chrome/browser/unix/platformNavigationBindings.dtd b/suite/locales/en-US/chrome/browser/unix/platformNavigationBindings.dtd
new file mode 100644
index 00000000000..0a0fedcc7cd
--- /dev/null
+++ b/suite/locales/en-US/chrome/browser/unix/platformNavigationBindings.dtd
@@ -0,0 +1,4 @@
+<!ENTITY goBackCmd.commandkey "[">
+<!ENTITY goForwardCmd.commandkey "]">
+
+