diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 58dab166ef62..03b552e2fe21 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -113,6 +113,9 @@ Contributor(s): ______________________________________. -->
     <popup id="backMenu" oncreate="BrowserBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
     <popup id="forwardMenu" oncreate="BrowserForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
     <popup id="sidebarPopup"/>
+
+    <!-- context menu for personal toolbar -->
+    <popupset id="popupset"/>
  
     <!-- context menu -->
     <popupset id="contentAreaContextSet"/>
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xul b/xpfe/components/bookmarks/resources/bookmarks.xul
index cec414af74a7..d182bdce264a 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -48,6 +48,7 @@
   <!-- The order of loading of these script files is IMPORTANT -->
 
   <!-- Shared Libraries -->
+  <script type="application/x-javascript" src="chrome://global/content/treePopups.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
@@ -102,7 +103,7 @@
     <key id="key_cut"/>
     <key id="key_copy"/>
     <key id="key_paste"/>
-    <key id="key_delete"/>
+    <key id="key_bm_delete" keycode="VK_DELETE" observes="cmd_bm_delete"/>
     <key id="key_selectAll"/>
     <key id="bm_key_find"  
          key="&edit.find.keybinding;"  
@@ -235,7 +236,7 @@
       <button class="button-toolbar" id="rename" label="&command.rename.label;"
               observes="cmd_rename"/>
       <button class="button-toolbar" id="delete" label="&command.delete.label;"
-              observes="cmd_delete"/>
+              observes="cmd_bm_delete"/>
     </toolbar>
   </toolbox>
   
diff --git a/xpfe/components/bookmarks/resources/bookmarksPanel.xul b/xpfe/components/bookmarks/resources/bookmarksPanel.xul
index e8ee75e36fab..03c225224f0e 100644
--- a/xpfe/components/bookmarks/resources/bookmarksPanel.xul
+++ b/xpfe/components/bookmarks/resources/bookmarksPanel.xul
@@ -61,7 +61,7 @@
   <popupset id="popupset"/>
   
   <!-- bookmarks string bundle -->
-  <stringbundleset id="bookmarksStringBundles"/>
+  <stringbundleset id="stringbundleset"/>
   
   <!-- bookmarks & edit commands -->
   <commandset id="bookmarksItems"/>
diff --git a/xpfe/components/bookmarks/resources/bookmarksTree.js b/xpfe/components/bookmarks/resources/bookmarksTree.js
index 971ed417170f..76479cbeca77 100644
--- a/xpfe/components/bookmarks/resources/bookmarksTree.js
+++ b/xpfe/components/bookmarks/resources/bookmarksTree.js
@@ -367,7 +367,9 @@ BookmarksTree.prototype = {
   {
     var selectedItem = this.getBestItem();
     if (!selectedItem) return "NC:BookmarksRoot";
-    while (selectedItem) {
+    // If we don't check for localName we walk the DOM tree up to the window node,
+    // which is Bad.
+    while (selectedItem.localName == "treeitem") {
       if (selectedItem.getAttribute("container") == "true")
         return NODE_ID(selectedItem);
       selectedItem = selectedItem.parentNode.parentNode;
diff --git a/xpfe/components/prefwindow/resources/content/pref-offline.xul b/xpfe/components/prefwindow/resources/content/pref-offline.xul
index a7be14b03e34..dbde690f3c7f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -54,8 +54,6 @@
     </radiogroup> 
 </titledbox>
 
-<separator/>
-
 <titledbox orient="vertical">
     <label value="&header2;"/>
     <radiogroup id="whengoingOnlinestate" orient="vertical" autostretch="never"
@@ -67,8 +65,6 @@
     </radiogroup>
 </titledbox>
 
-<separator/>
-
 <titledbox orient="vertical">
     <label value="&header3;"/>
 
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index bcd3b73001ae..44fe6a7a9f0d 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -139,12 +139,6 @@
       </treechildren>
     </treeitem>
 
-    <treeitem container="true" open="true" id="offlineItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/> 
-      </treerow>
-    </treeitem>
-
     <treeitem container="true" open="true" id="debugItem">
       <treerow>       
         <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/> 
@@ -165,6 +159,13 @@
         
       </treechildren>
     </treeitem>
+
+    <treeitem container="false" id="offlineItem">
+      <treerow>
+        <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/> 
+      </treerow>
+    </treeitem>
+
   </treechildren>
 
 </tree>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
index 10bcf9702fa5..ff2f1187f20d 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd
@@ -4,8 +4,8 @@
 <!ENTITY window.title  "Offline">
 <!ENTITY boxHeader  "Offline">
 <!ENTITY rHeader  "Startup Mode">
-<!ENTITY descipt1 "Mozilla can start in either online or offline modes. When online you have full 
-access to your network.  When offline you can only read messages that you have previously downloaded to your local computer">
+<!ENTITY descipt1 "Mozilla can start in either online or offline mode. When online you have full 
+access to your network.  When offline you can only read messages that you have previously downloaded to your local computer.">
 <!ENTITY prevRadio  "Remember my previous mode">
 <!ENTITY communRemember "Mozilla will remember the state it was in last and start in that mode.">
 <!ENTITY askOfflineRadio  "Ask me at startup">