diff --git a/editor/ui/dialogs/content/EdDialogTemplate.xul b/editor/ui/dialogs/content/EdDialogTemplate.xul
index b0495876c25..11748d2923e 100644
--- a/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorHLineProperties.dtd">
 <!-- dialog containing a control requiring initial setup -->
 <!-- WE SHOULD NOT USE ABSOLUTE WITH AND HEIGHT - USE BOXES INSTEAD? -->
@@ -15,12 +42,13 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/Ed?????.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <xul:broadcaster id="args" value=""/>
+  <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvanced()" value="&AdvancedEditButton.label;"/>
   <div><hr width="100%"/></div>
   <xul:spring flex="100%"/>
   <xul:box>
-    <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvanced()" value="&AdvancedEditButton.label;"/>
     <xul:spring flex="100%"/>    
     <xul:titledbutton class="spaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>  
     <xul:titledbutton class="spaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
diff --git a/editor/ui/dialogs/content/EdHLineProps.xul b/editor/ui/dialogs/content/EdHLineProps.xul
index d8b41b7a65a..8aaabc02ef9 100644
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -1,6 +1,32 @@
 <?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorHLineProperties.dtd">
 
 <!-- dialog containing a control requiring initial setup -->
@@ -16,6 +42,7 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/EdHLineProps.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <table width="100%">
     <tr>
@@ -66,17 +93,17 @@
         <xul:titledbutton class="spaced" id="SaveDefault" onclick="onSaveDefault()" value="&saveSettings.label;"/>
       </td>
     </tr>
+    <tr>
+      <td>
+        <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
+      </td>
+    </tr>
   </table>
   <div><hr width="100%"/></div>
 
   <xul:spring flex="100%"/>    
 
-  <xul:box>
-    <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
-    <xul:spring flex="100%"/>    
-    <xul:titledbutton class="spaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>  
-    <xul:titledbutton class="spaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
-  </xul:box>
+	<xul:box id="okCancelButtons"/> 
 
 <xul:popup id="PixelOrPercentMenu">
   <xul:menu>
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index 6b4379fcd09..75e831c72df 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -1,7 +1,34 @@
 <?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+   -   Pete Collins
+   -   Brian King
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorImageProperties.dtd">
 
 
@@ -19,6 +46,7 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/EdImageProps.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <xul:broadcaster id="args" value=""/>
 
@@ -462,38 +490,15 @@
 </table>
 </div>
 
-<!-- ////////////////////////// OK CANCEL Table /////////////////////////////// -->
-
-<div align="right">
-<table>
-    <tr align="right">
-      <td align="right">
-
-  <button 
-                id              = "OK" 
-                class           = "disabled"
-                onclick         = "onOK()"> 
-
-          &OKButton.label;
-        </button>  
-
-  <button 
-                id              = "Cancel" 
-                onclick         = "onCancel()">
-
-          &CancelButton.label;
-        </button>
-
-      </td>
-    </tr>
-  </table>
-</div>
-
 <!-- ///////////////////// End Parent Table //////////////////////////////////// -->
    </td>
   </tr>
 </table>
 
+<!-- ////////////////////////// OK CANCEL Box /////////////////////////////// -->
+
+	<xul:box id="okCancelButtons"/> 
+
 
 <!-- ///////////////////// Image Percent 1 PopUp Window //////////////////////// -->
 
diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/editor/ui/dialogs/content/EdInsertTable.xul
index 017cfd1340a..0778f2d425c 100644
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
+
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInsertTable.dtd">
 
 <xul:window class="dialog" title="&windowTitle.label;"
@@ -14,6 +41,7 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/EdInsertTable.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <xul:broadcaster id="args" value=""/>
   <table>
@@ -62,17 +90,17 @@
         <label for="border"> &pixelsPopup.value; </label>
       </td>
     </tr>
+    <tr>
+      <td cellspan="3">
+        <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
+      </td>
+    </tr>
   </table>
   <div><hr width="100%"/></div>
 
   <xul:spring flex="100%"/>
 
-  <xul:box>
-    <xul:titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
-    <xul:spring flex="100%"/>    
-    <xul:titledbutton class="spaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>  
-    <xul:titledbutton class="spaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
-  </xul:box>
+	<xul:box id="okCancelButtons"/> 
 
 <xul:popup id="PixelOrPercentMenu">
   <xul:menu>
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index c597dada3e4..28232ae0dcc 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
+
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorLinkProperties.dtd">
 
 <xul:window title="&windowTitle.label;"
@@ -14,6 +41,8 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/EdLinkProps.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+
   <xul:broadcaster id="args" value=""/>
 
   <xul:box align="vertical" style="min-width: 20em">
@@ -37,12 +66,8 @@
       </xul:box>
     </xul:box>
     </fieldset>
+    <xul:titledbutton class="hspaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
   </xul:box>
   <xul:spring class="bigspacer"/>
-  <xul:box>
-    <xul:titledbutton class="hspaced" id="AdvancedEdit" onclick="onAdvancedEdit()" value="&AdvancedEditButton.label;"/>
-    <xul:spring flex="100%"/>    
-    <xul:titledbutton class="hspaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>  
-    <xul:titledbutton class="hspaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
-  </xul:box>
+	<xul:box id="okCancelButtons"/> 
 </xul:window>
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 1a58dc21e5c..26c7cef1d93 100644
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
+
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EdNamedAnchorProperties.dtd">
 
 <xul:window class="dialog" title="&windowTitle.label;"
@@ -14,6 +41,7 @@
   </script>
   <script language="JavaScript" src="chrome://editor/content/EdNamedAnchorProps.js">
   </script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <xul:broadcaster id="args" value=""/>
   <table>
@@ -23,14 +51,14 @@
         <input type="text" id="nameInput" size="30" maxlength="255" />
       </td>
     </tr>
+    <tr>
+      <td>
+          <xul:titledbutton class="spaced" id="MoreAttributes" onclick="onMoreAttributes()" value="&moreButton.label;"/>
+      </td>
+    </tr>
   </table>
   <div><hr width="100%"/></div>
   <xul:spring flex="100%"/>
-  <xul:box>
-    <xul:titledbutton class="spaced" id="MoreAttributes" onclick="onMoreAttributes()" value="&moreButton.label;"/>
-    <xul:spring flex="100%"/>    
-    <xul:titledbutton class="spaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>
-    <xul:titledbutton class="spaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
-  </xul:box>
+	<xul:box id="okCancelButtons"/> 
 
 </xul:window>
diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/editor/ui/dialogs/content/EdTableProps.xul
index 721d6227eaf..6c509d00d29 100644
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -1,6 +1,33 @@
 <?xml version="1.0"?>
+
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+
+
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorTableProperties.dtd">
 
 <window class="dialog" title="&tableWindow.title;"
@@ -14,6 +41,7 @@
   </html:script>
   <html:script language="JavaScript" src="chrome://editor/content/EdTableProps.js">
   </html:script>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
 
   <broadcaster id="args" value=""/>
 <tabcontrol align="vertical" >
@@ -27,6 +55,7 @@
 		<box align="vertical">
      <titledbutton value="TABLE PANEL"/> 
       <html:div> WORK IN PROGRESS:  This is the TABLE Tab </html:div>
+      <titledbutton class="spaced" id="AdvancedEditTable" onclick="onAdvanced()" value="&AdvancedEditButton.label;"/>
     </box>
 <!-- end of table tab -->
 
@@ -34,16 +63,13 @@
 		<box align="vertical">
       <titledbutton value="CELL PANEL"/> 
       <html:div> WORK IN PROGRESS:  This is the CELL Tab </html:div>
+      <titledbutton class="spaced" id="AdvancedEditCell" onclick="onAdvanced()" value="&AdvancedEditButton.label;"/>
     </box>
 <!-- end of cell tab -->
 	 </tabpanel> 
 </tabcontrol>
 
   <spring flex="100%"/>
-  <box>
-    <titledbutton class="spaced" id="AdvancedEdit" onclick="onAdvanced()" value="&AdvancedEditButton.label;"/>
-    <spring flex="100%"/>    
-    <titledbutton class="spaced" id="OK" onclick="onOK()" value="&OKButton.label;"/>  
-    <titledbutton class="spaced" id="Cancel" onclick="onCancel()" value="&CancelButton.label;"/>
-  </box>
+
+	<box id="okCancelButtons"/> 
 </window>