diff --git a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
index e036451bc3e..902a522ee61 100644
--- a/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -15,8 +15,8 @@
 
 <!ENTITY browserCmd.label	"New Navigator Window">
 <!ENTITY browserCmd.accesskey	"n">
-<!ENTITY openCmd.label "Open Web Location...">
-<!ENTITY openCmd.accesskey "l">
+<!ENTITY openCmd.label "Open Address...">
+<!ENTITY openCmd.accesskey "r">
 <!ENTITY openCmd.commandkey "l">
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY openFileCmd.accesskey "o">
diff --git a/mozilla/xpfe/communicator/resources/content/openLocation.xul b/mozilla/xpfe/communicator/resources/content/openLocation.xul
index b19badefa0f..7e871f22438 100644
--- a/mozilla/xpfe/communicator/resources/content/openLocation.xul
+++ b/mozilla/xpfe/communicator/resources/content/openLocation.xul
@@ -40,7 +40,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
-        style="width: 40em;"
+        style="width: 30em;"
         class="dialog"
         orient="vertical"
         persist="screenX screenY"
@@ -55,39 +55,39 @@
   <keyset id="dialogKeys"/>
 
   <hbox>
-    <separator orient="vertical" class="thin"/>
     <vbox flex="1">
       <html>&enter.label;</html>
+
       <separator class="thin"/>
 
       <hbox align="center">
+        <text class="label" for="dialog.input" 
+              value="&address.label;" accesskey="&address.accesskey;"/>
         <textbox id="dialog.input" flex="1" type="autocomplete"
-                    searchSessions="history" timeout="50" maxrows="6"
-                    oninput="doEnabling();">
+                 searchSessions="history" timeout="50" maxrows="6" oninput="doEnabling();">
           <menupopup id="ubhist-popup" class="autocomplete-history-popup"
                      popupalign="topleft" popupanchor="bottomleft"
                      onpopupshowing="createUBHistoryMenu(event.target);"
                      oncommand="useUBHistoryItem(event.target)"/>
         </textbox>
-        <button label="&chooseFile.label;" oncommand="onChooseFile();"/>
       </hbox>
-      <hbox align="center">
-        <text class="label" value="&openWhere.label;"/>
-        <menulist id="openAppList">
-          <menupopup>
-            <menuitem value="0" id="currentWindow" label="&topWindow.label;"/>
-            <menuitem value="1" label="&newWindow.label;"/>
-            <menuseparator/>
-            <menuitem value="2" id="editWindow" label="&editNewWindow.label;"/>
-          </menupopup>
-        </menulist>
-        <spring flex="1"/>
+      <separator class="thin"/>
+      <hbox flex="1" autostretch="never">
+        <text class="label" accesskey="&openWhere.accesskey;" 
+              for="openAppList" value="&openWhere.label;"/>
+        <radiogroup orient="vertical" id="openAppList">
+            <radio value="0" group="openAppList" id="currentWindow" label="&topWindow.label;"/>
+            <radio value="1" group="openAppList" label="&newWindow.label;"/>
+            <radio value="2" group="openAppList" id="editWindow" label="&editNewWindow.label;"/>
+        </radiogroup>
       </hbox>
     </vbox>
   </hbox> 
-
-  <separator/>
-
-  <hbox id="okCancelButtonsRight"/>
+  <separator class="thin"/>
+  <box valign="bottom" flex="1" autostretch="never">
+    <button label="&chooseFile.label;" accesskey="&chooseFile.accesskey;" 
+            oncommand="onChooseFile();"/>
+    <hbox flex="1" id="okCancelButtonsRight"/>
+  </box>
            
  </window>
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/openLocation.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/openLocation.dtd
index f7a25697701..6d74c3032f6 100644
--- a/mozilla/xpfe/communicator/resources/locale/en-US/openLocation.dtd
+++ b/mozilla/xpfe/communicator/resources/locale/en-US/openLocation.dtd
@@ -1,11 +1,15 @@
 <!-- extracted from content/openLocation.xul -->
 
-<!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">  
-<!ENTITY chooseFile.label "Choose File...">
+<!ENTITY enter.label "Enter the address (URL) of the Web page, file, or resource that you want to open."> 
+<!ENTITY chooseFile.label "Open File...">
+<!ENTITY chooseFile.accesskey "O">
+<!ENTITY address.label "Address:">
+<!ENTITY address.accesskey "A">
 <!ENTITY newWindow.label "New Navigator window">
 <!ENTITY topWindow.label "Current Navigator window">
-<!ENTITY editNewWindow.label "New Composer window">
+<!ENTITY editNewWindow.label "New Composer window for editing">
 <!ENTITY cancel.label "Cancel">
-<!ENTITY caption.label "Open Web Location">
+<!ENTITY caption.label "Open Address">
 <!ENTITY openWhere.label "Open in:">
+<!ENTITY openWhere.accesskey "i">
 <!ENTITY example.label "Example: &vendorURL;">
