diff --git a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
index 5c3e8b6ab02..ce25dcd8dfa 100644
--- a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
+++ b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
@@ -17,7 +17,8 @@ function BuildHTMLAttributeTable()
       }
       var name  = nodeMap[i].nodeName.toLowerCase();
       var value = element.getAttribute ( nodeMap[i].nodeName );
-      AddTreeItem ( name, value, "HTMLAList", HTMLAttrs );
+      if (name.indexOf("_moz") != 0)
+        AddTreeItem ( name, value, "HTMLAList", HTMLAttrs );
     }
   }
 }
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
index e487f8916c1..5d3580a9146 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.js
@@ -227,13 +227,13 @@ function doAddAttribute(which)
 
   switch(tree.id) {
     case "HTMLATree":
-      document.getElementById("AddHTMLAttributeNameInput").focus();
+      SetTextfieldFocus(document.getElementById("AddHTMLAttributeNameInput"));
       break;
     case "CSSATree":
-      document.getElementById("AddCSSAttributeNameInput").focus();
+      SetTextfieldFocus(document.getElementById("AddCSSAttributeNameInput"));
       break;
     case "JSEATree":
-      document.getElementById("AddJSEAttributeNameInput").focus();
+      SetTextfieldFocus(document.getElementById("AddJSEAttributeNameInput"));
       break;
     default:
       break;
@@ -258,7 +258,7 @@ function doSelect(e)
   
     cell.setAttribute("class","FocusSelected");
     input.setAttribute("class","FocusSelected");
-    input.focus();
+    SetTextfieldFocus(input);
   }
 }
 
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index e99745f608e..beb310425b0 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -71,8 +71,8 @@
   
   <separator class="thin"/>
   
-  <tabcontrol orient="vertical" flex="1">
-    <tabbox>
+  <tabcontrol align="vertical" orient="vertical" flex="1">
+	  <tabbox align="horizontal">
       <tab selected="true" value="&tabHTML.label;"/>
       <tab value="&tabCSS.label;"/>
       <tab value="&tabJSE.label;"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.js b/mozilla/editor/ui/dialogs/content/EdColorProps.js
index a16cd3e74ea..7006fec68b5 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.js
@@ -296,7 +296,7 @@ function chooseFile()
   }
   
   // Put focus into the input field
-  dialog.BackgroundImageInput.focus();
+  SetTextfieldFocus(dialog.BackgroundImageInput);
 }
 
 function ValidateImage()
@@ -312,7 +312,7 @@ function ValidateImage()
       dialog.BackgroundImage = null;
     }
   }
-  dialog.BackgroundImageInput.focus();
+  SetTextfieldFocus(dialog.BackgroundImageInput);
   ShowInputErrorMessage(GetString("MissingImageError"));
 
   // Don't allow checkbox if bad or no image
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
index dceb4e6dc0e..35f2493b8a2 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
@@ -43,6 +43,10 @@ var gOutputFormatFlowed  = 64;
 var gOutputAbsoluteLinks = 128;
 var gOutputEncodeEntities = 256;
 
+// Use for 'defaultIndex' param in InitPixelOrPercentMenulist
+var gPixel = 0;
+var gPercent = 1;
+
 var maxPixels  = 10000;
 // For dialogs that expand in size. Default is smaller size see "onMoreFewer()" below
 var SeeMore = false;
@@ -79,60 +83,6 @@ function StringExists(string)
   return false;
 }
 
-function ClearList(list)
-{
-  if (list) {
-    list.selectedIndex = -1;
-    for( i=list.length-1; i >= 0; i--)
-      list.remove(i);
-  }
-}
-//TODO: WE NEED EQUIVALENT OF THIS FOR "TREELIST"
-function ReplaceStringInList(list, index, string)
-{
-  if (index < list.options.length)
-  {
-    // Save and remove selection else we have trouble below!
-    //  (This must be a bug!)
-    selIndex = list.selectedIndex;
-    list.selectedIndex = -1;
-
-    optionNode = new Option(string, string);
-    // Remove existing option node
-    //list.remove(index);
-    list.options[index] = null;
-    // Insert the new node
-    list.options[index] = optionNode;
-    // NOTE: If we insert, then remove, we crash!
-    // Reset the selected item
-    list.selectedIndex = selIndex;
-  }
-}
-
-// THESE WILL BE REMOVE ONCE ALL DIALOGS ARE CONVERTED TO NEW WIDGETS
-function AppendStringToListById(list, stringID)
-{
-  AppendStringToList(list, editorShell.GetString(stringID));
-}
-
-function AppendStringToList(list, string)
-{
-  // THIS DOESN'T WORK! Result is a XULElement -- namespace problem
-  // optionNode1 = document.createElement("option");
-  // This works - Thanks to Vidur! Params = name, value
-  optionNode = new Option(string, string);
-
-  if (optionNode) {
-    list.add(optionNode, null);    
-  } else {
-    dump("Failed to create OPTION node. String content="+string+"\n");
-  }
-}
-
-/*
-  It would be better to add method to Select object, but what is its name?
-  SELECT and HTMLSELECT don't work!
-*/
 
 function ValidateNumberString(value, minValue, maxValue)
 {
@@ -158,16 +108,9 @@ function SetTextfieldFocus(textfield)
 {
   if (textfield)
   {
-dump("Selection Start="+textfield.selectionStart+"\n");
-dump("Selection End="+textfield.selectionEnd+"\n");
+    // Select entire contents
+    textfield.select(); //setSelectionRange(0, -1);
     textfield.focus();
-    //TODO: This is not working -- did Simon checkin? Do we need to change XBL?
-    //textfield.selectionStart = 0;
-    textfield.setAttribute("selectionStart",0);
-    //TODO: Simon should change this to support "-1" for "select to end"
-    //textfield.selectionEnd = textfield.value.length;
-    textfield.setAttrubute("selectionEnd",textfield.value.length);
-
   }
 }
 
@@ -309,8 +252,10 @@ function GetAppropriatePercentString(elementForAtt, elementInDoc)
     return GetString("PercentOfWindow");
 }
 
-function InitPixelOrPercentMenulist(elementForAtt, elementInDoc, attribute, menulistID)
+function InitPixelOrPercentMenulist(elementForAtt, elementInDoc, attribute, menulistID, defaultIndex)
 {
+  if (!defaultIndex) defaultIndex = gPixel;
+
   var size  = elementForAtt.getAttribute(attribute);
   var menulist = document.getElementById(menulistID);
   var pixelItem;
@@ -324,19 +269,25 @@ function InitPixelOrPercentMenulist(elementForAtt, elementInDoc, attribute, menu
 
   ClearMenulist(menulist);
   pixelItem = AppendStringToMenulist(menulist, GetString("Pixels"));
+  if (!pixelItem)
+    return;
   percentItem = AppendStringToMenulist(menulist, GetAppropriatePercentString(elementForAtt, elementInDoc));
-//dump("**** InitPixelOrPercentMenulist: pixelItem="+pixelItem+", percentItem="+percentItem+", menulistID="+menulistID+"\n");
-  // Search for a "%" character
-  percentIndex = size.search(/%/);
-  if (percentIndex > 0)
+  if (size && size.length > 0)
   {
-    // Strip out the %
-    size = size.substr(0, percentIndex);
-    if (percentItem)
-      menulist.selectedItem = percentItem;
-  } 
-  else if(pixelItem)
-    menulist.selectedItem = pixelItem;
+    // Search for a "%" character
+    percentIndex = size.search(/%/);
+    if (percentIndex > 0)
+    {
+      // Strip out the %
+      size = size.substr(0, percentIndex);
+      if (percentItem)
+        menulist.selectedItem = percentItem;
+    } 
+    else
+      menulist.selectedItem = pixelItem;
+  }
+  else
+    menulist.selectedIndex = defaultIndex;
 
   return size;
 }
@@ -432,7 +383,6 @@ function AppendStringToTreelistById(tree, stringID)
 
 function AppendStringToTreelist(tree, string)
 {
-dump("AppendStringToTreelist: string="+string+"\n");
   if (tree)
   {
     var treecols = tree.firstChild;
@@ -464,15 +414,42 @@ dump("AppendStringToTreelist: string="+string+"\n");
       treeitem.appendChild(treerow);
       treechildren.appendChild(treeitem)
       treecell.setAttribute("value", string);
-      var len = Number(tree.getAttribute("length"));
-      if (!len) len = -1;
-      tree.setAttribute("length",len+1);
+      //var len = Number(tree.getAttribute("length"));
+      //if (!len) len = -1;
+      tree.setAttribute("length", treechildren.childNodes.length);
       return treeitem;
     }
   }
   return null;
 }
 
+function ReplaceStringInTreeList(tree, index, string)
+{
+  if (tree)
+  {
+    var treecols = tree.firstChild;
+    if (!treecols)
+    {
+      dump("Bad XUL: Must have <treecolgroup> as first child\n");
+      return;
+    }
+    var treechildren = treecols.nextSibling;
+    if (!treechildren)
+      return;
+
+    // Each list item is a <treeitem><treerow><treecell> under <treechildren> node
+    var childNodes = treechildren.childNodes;
+    if (!childNodes || index >= childNodes.length)
+      return;
+
+    var row = childNodes.item(index).firstChild;
+    if (row && row.firstChild)
+    {
+      row.firstChild.setAttribute("value", string);
+    }
+  }
+}
+
 function ClearTreelist(tree)
 {
   if (tree)
@@ -496,21 +473,59 @@ function ClearTreelist(tree)
 
 function GetSelectedTreelistAttribute(tree, attr)
 {
-  if (tree && tree.selectedItems && 
-      tree.selectedItems[0] && 
-      tree.selectedItems[0].firstChild &&
-      tree.selectedItems[0].firstChild.firstChild)
+  if (tree)
   {
-    return tree.selectedItems[0].firstChild.firstChild.getAttribute(attr);
+    if (tree.selectedIndex >= 0 &&
+        tree.selectedItems.length > 0 && 
+        tree.selectedItems[0] && 
+        tree.selectedItems[0].firstChild &&
+        tree.selectedItems[0].firstChild.firstChild)
+    {
+      return tree.selectedItems[0].firstChild.firstChild.getAttribute(attr);
+    }
   }
-
   return "";
 }
+
 function GetSelectedTreelistValue(tree)
 {
   return GetSelectedTreelistAttribute(tree,"value")
 }
 
+function RemoveSelectedTreelistItem(tree)
+{
+  if (tree)
+  {
+    if (tree.selectedIndex >= 0 &&
+        tree.selectedItems.length > 0)
+    {
+      // Get the node to delete
+      var treeItem = tree.selectedItems[0];
+      if (treeItem)
+      {
+        tree.clearItemSelection();
+        var parent = treeItem.parentNode;
+        if (parent)
+        {
+          parent.removeChild(treeItem);
+          tree.setAttribute("length", parent.childNodes.length);
+        }
+      }
+    }
+  }
+}
+
+function GetTreelistValueAt(tree, index)
+{
+  if (tree)
+  {
+    var item = tree.getItemAtIndex(index);
+    if (item && item.firstChild && item.firstChild.firstChild)
+      return item.firstChild.firstChild.getAttribute("value");
+  }
+  return "";
+}
+
 
 // USE onkeyup!
 // forceInteger by petejc (pete@postpagan.com)
@@ -582,11 +597,7 @@ function getContainer ()
   selImage = editorShell.GetSelectedElement(tagName);
   if (selImage)  // existing image
   {
-    //dump("Is an image element\n");
     oneup = selImage.parentNode;
-    //dump("Parent = " + oneup.nodeName + "\n");
-    //twoup = oneup.parentNode;
-    //dump("Grand Parent is " + twoup.nodeName + "\n");
     return oneup;
   }
   else if (!selImage)  // new image insertion
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
index 3e0585425d1..2a7b486de87 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -46,13 +46,17 @@
   id        = "AdvancedEditButton"
   class     = "dialog"
   oncommand = "onAdvancedEdit()"
-  value     = "&AdvancedEditButton.label;"/>
+  value     = "&AdvancedEditButton.label;"
+  tooltip   = "aTooltip" 
+  tooltiptext="&AdvancedEditButton.tooltip;"/>
 
 <button 
   id        = "AdvancedEditButton2" 
   class     = "dialog" 
   oncommand = "onAdvancedEdit()" 
-  value     = "&AdvancedEditButton.label;"/>
+  value     = "&AdvancedEditButton.label;"
+  tooltip   = "aTooltip"
+  tooltiptext="&AdvancedEditButton.tooltip;"/>
 
 <button 
   id        = "ChooseFile" 
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js
index 6792f1d48f4..185d6ee682b 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.js
@@ -41,7 +41,7 @@ function Startup()
   initDialog();
   
   // SET FOCUS TO FIRST CONTROL
-  //dialog.editBox.focus();
+  //SetTextfieldFocus(dialog.editBox);
 }
 
 function InitDialog() {
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.js b/mozilla/editor/ui/dialogs/content/EdDictionary.js
index 6a0f594d3a8..3d254bb5337 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.js
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.js
@@ -33,7 +33,8 @@ function Startup()
 
   // Get the spellChecker shell
   spellChecker = editorShell.QueryInterface(Components.interfaces.nsIEditorSpellCheck);
-  if (!spellChecker) {
+  if (!spellChecker)
+  {
     dump("SpellChecker not found!!!\n");
     window.close();
   }
@@ -47,13 +48,14 @@ function Startup()
   FillDictionaryList();
   // Select the supplied word if it is already in the list
   SelectWordToAddInList();
-  WordInput.focus();
+  SetTextfieldFocus(WordInput);
 }
 
 function ValidateWordToAdd()
 {
   WordToAdd = TrimString(WordInput.value);
-  if (WordToAdd.length > 0) {
+  if (WordToAdd.length > 0)
+  {
     return true;
   } else {
     return false;
@@ -62,8 +64,10 @@ function ValidateWordToAdd()
 
 function SelectWordToAddInList()
 {
-  for (index = 0; index < DictionaryList.length; index++) {
-    if (WordToAdd.toLowerCase() == DictionaryList.options[index].text.toLowerCase()) {
+  for (var index = 0; index < DictionaryList.getAttribute("length"); index++)
+  {
+    if (WordToAdd == GetTreelistValueAt(DictionaryList,index))
+    {
       DictionaryList.selectedIndex = index;
       break;
     }
@@ -72,12 +76,13 @@ function SelectWordToAddInList()
 
 function AddWord()
 {
-  if (ValidateWordToAdd()) {
+  if (ValidateWordToAdd())
+  {
     try {
       spellChecker.AddWordToDictionary(WordToAdd);
     }
     catch (e) {
-      dump("Exception occured in spellChecker.AddWordToDictionary\nWord to add probably already existed");
+      dump("Exception occured in spellChecker.AddWordToDictionary\nWord to add probably already existed\n");
     }
 
     // Rebuild the dialog list
@@ -89,18 +94,21 @@ function AddWord()
 
 function ReplaceWord()
 {
-  if (ValidateWordToAdd()) {
+  if (ValidateWordToAdd())
+  {
     selIndex = DictionaryList.selectedIndex;
-    if (selIndex >= 0) {
-      WordToRemove = DictionaryList.options[selIndex].text;
-      dump("Word to remove: "+WordToRemove+"\n");
+    if (selIndex >= 0)
+    {
+
+      WordToRemove = GetSelectedTreelistValue(DictionaryList);
+dump("Word to remove: "+WordToRemove+"\n");
       spellChecker.RemoveWordFromDictionary(WordToRemove);
       try {
         // Add to the dictionary list
         spellChecker.AddWordToDictionary(WordToAdd);
         // Just change the text on the selected item
         //  instead of rebuilding the list
-        ReplaceStringInList(DictionaryList, selIndex, WordToAdd);
+        ReplaceStringInTreeList(DictionaryList, selIndex, WordToAdd);
       } catch (e) {
         // Rebuild list and select the word - it was probably already in the list
         dump("Exception occured adding word in ReplaceWord\n");
@@ -114,12 +122,23 @@ function ReplaceWord()
 function RemoveWord()
 {
   selIndex = DictionaryList.selectedIndex;
-  if (selIndex >= 0) {
-    word = TrimString(DictionaryList.options[selIndex].text);
+dump("RemoveWord/n");
+  if (selIndex >= 0)
+  {
+    word = GetSelectedTreelistValue(DictionaryList);
+
     // Remove word from list
-    DictionaryList.options[selIndex] = null;
+    RemoveSelectedTreelistItem(DictionaryList);
+
     // Remove from dictionary
-    spellChecker.RemoveWordFromDictionary(word);
+    try {
+      //Not working: BUG 43348
+      spellChecker.RemoveWordFromDictionary(word);
+    }
+    catch (e)
+    {
+      dump("Failed to remove word from dictionary\n");
+    }
 
     ResetSelectedItem(selIndex);
   }
@@ -130,16 +149,16 @@ function FillDictionaryList()
   selIndex = DictionaryList.selectedIndex;
 
   // Clear the current contents of the list
-  ClearList(DictionaryList);
+  ClearTreelist(DictionaryList);
   // Get the list from the spell checker
   spellChecker.GetPersonalDictionary()
 
   // Get words until an empty string is returned
   do {
     word = spellChecker.GetPersonalDictionaryWord();
-    if (word != "") {
+    if (word != "")
       AppendStringToTreelist(DictionaryList, word);
-    }
+
   } while (word != "");
 
   ResetSelectedItem(selIndex);
@@ -147,7 +166,7 @@ function FillDictionaryList()
 
 function ResetSelectedItem(index)
 {
-  lastIndex = DictionaryList.length - 1;
+  lastIndex = DictionaryList.getAttribute("length") - 1;
   if (index > lastIndex)
     index = lastIndex;
 
@@ -156,6 +175,15 @@ function ResetSelectedItem(index)
   if (index == -1 && lastIndex >= 0)
     index = 0;
 
+dump("ResetSelectedItem to index="+index+"\n");
+
   DictionaryList.selectedIndex = index;
 }
 
+function Close()
+{
+dump("Closing spelling dictionary dialog\n");
+  // Shutdown the spell check and close the dialog
+  spellChecker.UninitSpellChecker();
+  window.close();
+}
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index efd181c04cc..03a141f8f37 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -61,7 +61,7 @@
           <button class="dialog"  id="RemoveWord" oncommand="RemoveWord()" value="&RemoveButton.label;"/>
           <spring class="spacer"/>
           <spring flex="1"/>
-          <button class="dialog CloseButton"  id="Close" oncommand="onCancel()" value="&CloseButton.label;"/>
+          <button class="exit-dialog" id="cancel" value="&CloseButton.label;" onclick="Close()"/>
         </box>
       </row>
     </rows>
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.js b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
index 095dbb8ea25..7bab0f7237f 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
@@ -62,7 +62,7 @@ function Startup()
   InitDialog()
 
   // SET FOCUS TO FIRST CONTROL
-  dialog.widthInput.focus();
+  SetTextfieldFocus(dialog.widthInput);
 
   // Resize window
   window.sizeToContent();
@@ -82,12 +82,9 @@ function InitDialog()
 
   // We will use "height" here and in UI
   dialog.heightInput.value = height;
-dump("Calling InitPixelOrPercentMenulist\n");
   // Get the width attribute of the element, stripping out "%"
-  // This sets contents of combobox (adds pixel and percent menuitems elements)
+  // This sets contents of menulist (adds pixel and percent menuitems elements)
   dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, hLineElement, "width","pixelOrPercentMenulist");
-
-dump("AFTER Calling InitPixelOrPercentMenulist\n");
   align = globalElement.getAttribute("align");
   if (align == "center") {
     dialog.centerAlign.checked = true;
@@ -160,7 +157,7 @@ function ValidateData()
     // Set focus to the offending control
     dump("Height is empty\n");
     SetTextfieldFocus(dialog.heightInput);
-    dialog.heightInput.focus();
+    SetTextfieldFocus(dialog.heightInput);
     return false;
   }
   dump("Setting height="+height+"\n");
@@ -178,7 +175,7 @@ function ValidateData()
   width = ValidateNumberString(dialog.widthInput.value, 1, maxLimit);
   if (width == "") {
     dump("Width is empty\n");
-    dialog.widthInput.focus();
+    SetTextfieldFocus(dialog.widthInput);
     return false;
   }
   if (isPercent)
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index e7504b2e0d8..7ea20bab42f 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -48,7 +48,7 @@
   <keyset id="keyset"/>
   <popupset id="aTooltipSet" />
   
-  <titledbox><title><text value="&dimensionsBox.label;"/></title>
+  <titledbox orient="vertical"><title><text value="&dimensionsBox.label;"/></title>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
@@ -65,6 +65,7 @@
         </row>
       </rows>
     </grid>        
+    <checkbox id="3dShading" value="&threeDShading.label;" />
   </titledbox>
   <titledbox><title><text align="left" value="&alignmentBox.label;"/></title>
     <radiogroup id="alignmentGroup" orient="horizontal">
@@ -73,24 +74,13 @@
       <radio group="alignmentGroup" id="rightAlign" value="&rightRadio.value;" />
     </radiogroup>
   </titledbox>
+  <spring class="spacer"/>
   <box>
-    <grid flex="1">
-      <columns><column/><column flex="1"/><column/></columns>
-      <rows>
-        <row>
-          <checkbox id="3dShading" value="&threeDShading.label;" />
-          <spring/>
-          <button class="dialog"  id="SaveDefault" value="&saveSettings.label;" 
-               oncommand="onSaveDefault()"
-               tooltip="aTooltip" tooltiptext="&saveSettings.tooltip;" />
-        </row>
-        <row>
-          <spring/>
-          <spring/>
-          <button id="AdvancedEditButton" tooltip="aTooltip" tooltiptext="&advancedButton.tooltip;" />
-        </row>
-      </rows>
-    </grid>
+    <button class="dialog"  id="SaveDefault" value="&saveSettings.label;" 
+         oncommand="onSaveDefault()"
+         tooltip="aTooltip" tooltiptext="&saveSettings.tooltip;" />
+    <spring flex="1"/>
+    <button id="AdvancedEditButton"/>
   </box>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js
index 744116636fb..ebbf248c865 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.js
@@ -56,8 +56,7 @@ function Startup()
     }
   }
 
-  dialog.urlInput.focus();
-  dialog.urlInput.select();
+  SetTextfieldFocus(dialog.urlInput);
 }
 
 function onOK()
@@ -83,5 +82,5 @@ function chooseFile()
   }
 
   // Put focus into the input field
-  dialog.urlInput.focus();
+  SetTextfieldFocus(dialog.urlInput);
 }
\ No newline at end of file
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 219844a5c07..88851b5545e 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -33,6 +33,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
+    persist="screenX screenY"
     orient="vertical"
 	>
 
@@ -91,22 +92,11 @@
 			      </menupopup>
                 </menulist>
 
-          <!-- 
-		  <html s e l e c t name="common_targets" id="commonInput" size="4" oncommand="changeTarget()" onchange="changeTarget()">
-            <html o p t i o n value="_self">Same Frame</html o p t i o n>
-            <html o p t i o n value="_top">Whole Page</html o p t i o n>
-            <html o p t i o n value="_blank">New Window</html o p t i o n>
-            <html o p t i o n value="_parent">Parent Frame</html o p t i o n>
-          </html s e l e c t> 
-		  -->
-
 		  </row>
 		</rows>
       </grid>
   </titledbox>
 
-
-  <box orient="horizontal">
-   <box id="okCancelButtons"/>
-  </box>
+  <!-- from global dialogOverlay -->
+  <box id="okCancelButtons"/>
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index cff7698f11a..8713a53d5f3 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -132,7 +132,7 @@ function Startup()
     InitDialog();
   
   onMoreFewerImage();  // this call will initialize all widgets if entire dialog is visible
-  dialog.srcInput.focus();
+  SetTextfieldFocus(dialog.srcInput);
 }
 
 // Set dialog widgets with attribute data
@@ -155,8 +155,8 @@ function InitDialog()
   if ( SeeMore )
   {
 	  // setup the height and width widgets
-	  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "width", "widthUnitsMenulist");
-	  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "height", "heightUnitsMenulist");
+	  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "width", "widthUnitsMenulist", gPixel);
+	  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, imageElement, "height", "heightUnitsMenulist", gPixel);
 	  
 	  // TODO: We need to get the actual image dimensions.
 	  //       If different from attribute dimensions, then "custom" is checked.
@@ -219,7 +219,7 @@ function chooseFile()
   }
   
   // Put focus into the input field
-  dialog.srcInput.focus();
+  SetTextfieldFocus(dialog.srcInput);
 }
 
 function SetGlobalElementToCurrentDialogSettings()
@@ -298,29 +298,26 @@ function onMoreFewerImage()
     SetGlobalElementToCurrentDialogSettings();
     
     dialog.MoreSection.setAttribute("collapsed","true");
-    window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","0");
     dialog.MoreFewerButton.setAttribute("value",GetString("MoreProperties"));
     SeeMore = false;
 
     // Show the "Advanced Edit" button on same line as "More Properties"
-    dialog.AdvancedEditButton.removeAttribute("hidden");
-    dialog.AdvancedEditButton2.setAttribute("hidden","true");
+    dialog.AdvancedEditButton.removeAttribute("collapsed");
+    dialog.AdvancedEditButton2.setAttribute("collapsed","true");
+    window.sizeToContent();
   }
   else
   {
     dialog.MoreSection.removeAttribute("collapsed");
-    // Hide the "Advanced Edit" next to "More..." Use button at bottom right of dialog
-    dialog.AdvancedEditButton.setAttribute("style","display: none");
-    window.sizeToContent();
-
     dialog.MoreFewerButton.setAttribute("more","1");
     dialog.MoreFewerButton.setAttribute("value",GetString("FewerProperties"));
     SeeMore = true;
 
     // Show the "Advanced Edit" button at bottom
-    dialog.AdvancedEditButton.setAttribute("hidden","true");
+    dialog.AdvancedEditButton.setAttribute("collapsed","true");
     dialog.AdvancedEditButton2.removeAttribute("hidden");
+    window.sizeToContent();
     
     InitDialog();
     
@@ -480,7 +477,7 @@ function ValidateData()
   globalElement.setAttribute("src", src);
   
   // TODO: Should we confirm with user if no alt tag? Or just set to empty string?
-  var alt = dialog.altTextInput.value.trimString();
+  var alt = dialog.altTextInput.value; //.trimString();
   globalElement.setAttribute("alt", alt);
   
   //TODO: WE SHOULD ALWAYS SET WIDTH AND HEIGHT FOR FASTER IMAGE LAYOUT
@@ -528,7 +525,7 @@ function ValidateData()
     {
       if ( !SeeMore )
         onMoreFewerImage();
-      dialog.widthInput.focus();
+      SetTextfieldFocus(dialog.widthInput);
       return false;
     }
     if (isPercentWidth)
@@ -540,7 +537,7 @@ function ValidateData()
     {
       if ( !SeeMore )
         onMoreFewerImage();
-      dialog.heightInput.focus();
+      SetTextfieldFocus(dialog.heightInput);
       return false;
     }
     if (isPercentHeight)
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 16f31cbddbd..b435798327e 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -99,7 +99,7 @@
       persist = "more"/>
     <spring flex="1"/>
     <!-- From EdDialogOverlay.xul -->
-    <button id="AdvancedEditButton" tooltip="aTooltip" tooltiptext="&AdvancedEditButton.tooltip;"/>
+    <button id="AdvancedEditButton"/>
   </box>
 
   <!-- Area that shows and hides via MoreFewerButton --> 
@@ -128,7 +128,7 @@
             <columns><column/><column/><column/></columns>
             <rows>
               <!--//////  IMAGE WIDTH  //////-->
-              <row valign="baseline" autostretch="never">
+              <row valign="middle" autostretch="never">
                 <text class = "label" 
                   id    = "widthLabel"
                   for   = "widthInput"
@@ -143,7 +143,7 @@
                 <!-- contents are appended by JS -->
               </row>
               <!--////// IMAGE HEIGHT //////-->
-              <row valign="baseline" autostretch="never">
+              <row valign="middle" autostretch="never">
                 <text class = "label" 
                   id    = "heightLabel"
                   for   = "heightInput"
@@ -204,7 +204,7 @@
           <grid>
             <columns><column/><column/><column/></columns>
             <rows>
-              <row valign="baseline" autostretch="never">
+              <row valign="middle" autostretch="never">
                 <text 
                   class = "label align-right" 
                   id    = "leftrightLabel"
@@ -219,7 +219,7 @@
                   id    = "leftrighttypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
-              <row valign="baseline" autostretch="never">
+              <row valign="middle" autostretch="never">
                 <text 
                   class = "label align-right" 
                   id    = "topbottomLabel"
@@ -234,7 +234,7 @@
                   id    = "topbottomtypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
-              <row valign="baseline" autostretch="never">
+              <row valign="middle" autostretch="never">
                 <text class = "label align-right" 
                   id    = "borderLabel"
                   value = "&borderEditField.label;"/>
@@ -258,7 +258,7 @@
     <box>
       <spring flex="1"/>
       <!-- From EdDialogOverlay -->
-      <button id="AdvancedEditButton2" tooltip="aTooltip" tooltiptext="&AdvancedEditButton2.tooltip;"/>
+      <button id="AdvancedEditButton2"/>
     </box>
   </box> <!-- END OF MORE/FEWER SECTION -->
   <separator class="groove"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.js b/mozilla/editor/ui/dialogs/content/EdInsSrc.js
index 497a20cabcb..f74aab64b0c 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.js
@@ -28,9 +28,13 @@ function Startup()
 {
   if (!InitEditorShell())
     return;
-
   doSetOKCancel(onOK, null);
-  
+  var okButton = document.getElementById("ok");
+  if (okButton)
+  {
+    okButton.removeAttribute("default");
+    okButton.setAttribute("value",GetString("Insert"));
+  }  
   // Create dialog object to store controls for easy access
   srcInput = document.getElementById("srcInput");
 
@@ -40,7 +44,8 @@ function Startup()
     srcInput.value = selection;
 
   // Set initial focus
-  srcInput.focus();
+  srcInput.focus;
+  // Note: We can't set the caret location in a multiline textfield
 }
 
 function onOK()
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.js b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
index 5cc695b94ac..a89ce0ee98b 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertChars.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
@@ -21,12 +21,6 @@
  *   Baki Bon <bakibon@yahoo.com>   (original author)
  */
 
-var currentTab = 0;
-// These must be the index of the <tab> elements in proper order
-var LatinTab = 0;
-var HangulTab = 1;
-// Add more character classes here
-
 //------------------------------------------------------------------
 // From Unicode 3.0 Page 54. 3.11 Conjoining Jamo Behavior
 var SBase = 0xac00;
@@ -44,128 +38,223 @@ function Startup()
 {
   if (!InitEditorShell())
     return;
-  
-  // Let's try this out without the Korean portion
+
   StartupLatin();
-  StartupHangul();
+
+  doSetOKCancel(onOK, null);
+
+  var okButton = document.getElementById("ok");
+  if (okButton)
+    okButton.setAttribute("value",GetString("Insert"));
+
   window.sizeToContent();
 }
  
-function SelectTab(tabNumber)
+function onOK()
 {
-  currentTab = tabNumber;
-}
-
-function InsertCharacter()
-{
-  // This is non-modal, so check if opener still exists
-  // and simply close if parent is gone
-  // THIS DOESN'T WORK! Editor window is not destroyed yet,
-  //  so we still call into EditorShell -> nsEditor.cpp 
-  //  and crash trying to access mViewManager!
-
-  if (window.opener)
-  {
-    switch (currentTab)
-    {
-      case LatinTab:
-        editorShell.InsertSource(LatinChar);
-        break;
-      case HangulTab:
-        editorShell.InsertSource(HangulChar);
-        break;
-    }
-  }
-  else
-    window.close();
+  editorShell.InsertSource(LatinChar);
+  return true;
 }
 
 //------------------------------------------------------------------
-var HangulL;
-var HangulV;
-var HangulT;
-var HangulChar= String.fromCharCode(SBase);
-
-function StartupHangul()
-{
-
-  HangulL = document.getElementById("HangulL");
-  HangulV = document.getElementById("HangulV");
-  HangulT = document.getElementById("HangulT");
-
-  for(var i =0 ; i < LCount; i++)
-       AppendStringToMenulist(HangulL , String.fromCharCode(i+LBase));
-
-  for(var i =0 ; i < VCount; i++)
-       AppendStringToMenulist(HangulV , String.fromCharCode(i+VBase) );
-
-  AppendStringToMenulist(HangulT , " " );
-  for(var i =1 ; i < TCount; i++)
-       AppendStringToMenulist(HangulT , String.fromCharCode(i+TBase) );
-
-  HangulL.focus();
-}
-
-function SelectHangul()
-{
-  
-  HangulChar =  String.fromCharCode(
-       (HangulL.selectedIndex * VCount + 
-        HangulV.selectedIndex) * TCount + 
-        HangulT.selectedIndex + 
-        SBase ); 
-  HangulCharacter.value = HangulChar;
-}
-
-//------------------------------------------------------------------
-var LatinC;
 var LatinL;
 var LatinM;
 var LatinChar;
-var oldC=0;
 var oldL=0;
 var oldM=0;
 var LItems=0;
-// Index in the "Category list
-var SymbolIndex = 4;
-
+var category;
+var CategoryGroup;
+var initialize = true;
 
 function StartupLatin()
 {
-  LatinC = document.getElementById("LatinC");
+
   LatinL = document.getElementById("LatinL");
   LatinM = document.getElementById("LatinM");
   LatinL_Label = document.getElementById("LatinL_Label");
   LatinM_Label = document.getElementById("LatinM_Label");
-  
-  UpdateLatinL();
-  UpdateLatinM();
-  UpdateLatinC();
+
+  var Symbol      = document.getElementById("Symbol");
+  var AccentUpper = document.getElementById("AccentUpper");
+  var AccentLower = document.getElementById("AccentUpper");
+  var Upper       = document.getElementById("Upper");
+  var Lower       = document.getElementById("Lower");
+  CategoryGroup   = document.getElementById("CatGrp");
+
+  // Initialize which radio button is set from persistent attribute
+  var category = CategoryGroup.getAttribute("category");
+
+  switch (category)
+  {
+    case "AccentUpper": // Uppercase Diacritical
+      AccentUpper.checked = true;
+      break;
+    case "AccentLower": // Lowercase Diacritical
+      AccentLower.checked = true;
+      break;
+    case "Upper": // Uppercase w/o Diacritical
+      Upper.checked = true;
+      break;
+    case "Lower": // Lowercase w/o Diacritical
+      Lower.checked = true;
+      break;
+    default:
+      category = "Symbol";
+      Symbol.checked = true;
+      break;
+  }
+
+  ChangeCategory(category);
+  initialize = false;
 }
-function SelectLatinCategory()
+
+function ChangeCategory(newCategory)
 {
-  if(LatinC.selectedIndex != oldC ) {
+  if (category != newCategory || initialize)
+  {
+    category = newCategory;
+    // Note: Must do L before M to set LatinL.selectedIndex
     UpdateLatinL();
     UpdateLatinM();
-    UpdateLatinC();
-    oldC = LatinC.selectedIndex;
+    UpdateCharacter();
+    
+    // Set persistent attribute  
+    CategoryGroup.setAttribute("category", category);
   }
 }
+
 function SelectLatinLetter()
 {
-  if(LatinL.selectedIndex != oldL ) {
+  if(LatinL.selectedIndex != oldL )
+  {
     UpdateLatinM();
-    UpdateLatinC();
+    UpdateCharacter();
     oldL = LatinL.selectedIndex;
   }
 }
+
 function SelectLatinModifier()
 {
-  if(LatinM.selectedIndex != oldM ) {
-    UpdateLatinC();
+//  if(LatinM.selectedIndex != oldM )
+  {
+    UpdateCharacter();
     oldM = LatinM.selectedIndex;
   }
 }
+function DisableLatinL(disable)
+{
+  LatinL.disabled=disable;
+  LatinL_Label.setAttribute("disabled", disable ? "true" : "false");
+}
+
+function UpdateLatinL()
+{
+  ClearMenulist(LatinL);
+  switch(category) 
+  {
+    case "AccentUpper": // Uppercase Diacritical
+     DisableLatinL(false);
+     for(var basic=0; basic < 26; basic++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(0x41 + basic));
+     if(oldL < 26)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = upper.length;
+     break;
+    case "AccentLower": // Lowercase Diacritical
+     DisableLatinL(false);
+     for(var basic=0; basic < 26; basic++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(0x61 + basic));
+     if(oldL < 26)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = lower.length;
+     break;
+    default:
+     DisableLatinL(true);
+     break;
+  }
+}
+
+function UpdateLatinM()
+{
+  ClearMenulist(LatinM);
+  switch(category)
+  {
+    case "AccentUpper": // Uppercase Diacritical
+     for(var basic=0; basic < upper[LatinL.selectedIndex].length; basic++)
+       AppendStringToMenulist(LatinM , 
+             String.fromCharCode(upper[LatinL.selectedIndex][basic]));
+     if(oldM < upper[LatinL.selectedIndex].length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = upper[LatinL.selectedIndex].length;
+     break;
+
+    case "AccentLower": // Lowercase Diacritical
+     for(var basic=0; basic < lower[LatinL.selectedIndex].length; basic++)
+       AppendStringToMenulist(LatinM , 
+             String.fromCharCode(lower[LatinL.selectedIndex][basic]));
+     if(oldM < lower[LatinL.selectedIndex].length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = lower[LatinL.selectedIndex].length;
+     break;
+
+    case "Upper": // Uppercase w/o Diacritical
+     for(var i=0; i < otherupper.length; i++)
+       AppendStringToMenulist(LatinM, String.fromCharCode(otherupper[i]));
+     if(oldM < otherupper.length)
+        LatinM.selectedIndex = oldL; 
+     else 
+        LatinM.selectedIndex = otherupper.length;
+     break;
+
+    case "Lower": // Lowercase w/o Diacritical
+     for(var i=0; i < otherlower.length; i++)
+       AppendStringToMenulist(LatinM , String.fromCharCode(otherlower[i]));
+     if(oldL < otherlower.length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = otherlower.length;
+     break;
+
+    case "Symbol": // Symbol
+     for(var i=0; i < symbol.length; i++)
+       AppendStringToMenulist(LatinM , String.fromCharCode(symbol[i]));
+     if(oldM < symbol.length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = symbol.length;
+     break;
+  }
+}
+
+function UpdateCharacter()
+{
+  var index = LatinM.selectedIndex; 
+dump("Character is at: ("+LatinL.selectedIndex+","+index+")\n");
+  switch(category)
+  {
+    case "AccentUpper": // Uppercase Diacritical
+      String.fromCharCode(upper[LatinL.selectedIndex][index]);
+      break;
+    case "AccentLower": // Lowercase Diacritical
+      LatinChar = String.fromCharCode(lower[LatinL.selectedIndex][index]);
+      break;
+    case "Upper": // Uppercase w/o Diacritical
+      LatinChar = String.fromCharCode(otherupper[index]);
+      break;
+    case "Lower": // Lowercase w/o Diacritical
+      LatinChar = String.fromCharCode(otherlower[index]);
+      break;
+    case "Symbol":
+      LatinChar =  String.fromCharCode(symbol[index]);
+      break;
+  }
+dump("Character = "+LatinChar+"\n");
+}
 
 var upper=[ 
 [ // A 
@@ -413,106 +502,3 @@ otherlower = [
 0x01cc,
 0x01f3
 ];
-function UpdateLatinL()
-{
-  ClearMenulist(LatinL);
-  switch(LatinC.selectedIndex) {
-    case 0: // Uppercase Diacritical
-     for(var basic=0; basic < 26; basic++)
-       AppendStringToMenulist(LatinL , String.fromCharCode(0x41 + basic));
-     if(oldL < 26)
-        LatinL.selectedIndex = oldL; 
-     else 
-        LatinL.selectedIndex = upper.length;
-     break;
-    case 1: // Lowercase Diacritical
-     for(var basic=0; basic < 26; basic++)
-       AppendStringToMenulist(LatinL , String.fromCharCode(0x61 + basic));
-     if(oldL < 26)
-        LatinL.selectedIndex = oldL; 
-     else 
-        LatinL.selectedIndex = lower.length;
-     break;
-    case 2: // Uppercase w/o Diacritical
-     for(var i=0; i < otherupper.length; i++)
-       AppendStringToMenulist(LatinL , String.fromCharCode(otherupper[i]));
-     if(oldL < otherupper.length)
-        LatinL.selectedIndex = oldL; 
-     else 
-        LatinL.selectedIndex = otherupper.length;
-     break;
-    case 3: // Lowercase w/o Diacritical
-     for(var i=0; i < otherlower.length; i++)
-       AppendStringToMenulist(LatinL , String.fromCharCode(otherlower[i]));
-     if(oldL < otherlower.length)
-        LatinL.selectedIndex = oldL; 
-     else 
-        LatinL.selectedIndex = otherlower.length;
-     break;
-    case 4: // Symbol
-     for(var i=0; i < symbol.length; i++)
-       AppendStringToMenulist(LatinL , String.fromCharCode(symbol[i]));
-     if(oldL < symbol.length)
-        LatinL.selectedIndex = oldL; 
-     else 
-        LatinL.selectedIndex = symbol.length;
-     break;
-    default :
-
-     break;
-  }
-}
-function UpdateLatinM()
-{
-  ClearMenulist(LatinM);
-  switch(LatinC.selectedIndex) {
-    case 0: // Uppercase Diacritical
-     LatinM.disabled=false;
-     LatinM_Label.setAttribute("disabled","false");
-     for(var basic=0; basic < upper[LatinL.selectedIndex].length; basic++)
-       AppendStringToMenulist(LatinM , 
-             String.fromCharCode(upper[LatinL.selectedIndex][basic]));
-     if(oldM < upper[LatinL.selectedIndex].length)
-        LatinM.selectedIndex = oldM; 
-     else 
-        LatinM.selectedIndex = upper[LatinL.selectedIndex].length;
-     break;
-    case 1: // Lowercase Diacritical
-     LatinM.disabled=false;
-     LatinM_Label.setAttribute("disabled","false");
-     for(var basic=0; basic < lower[LatinL.selectedIndex].length; basic++)
-       AppendStringToMenulist(LatinM , 
-             String.fromCharCode(lower[LatinL.selectedIndex][basic]));
-     if(oldM < lower[LatinL.selectedIndex].length)
-        LatinM.selectedIndex = oldM; 
-     else 
-        LatinM.selectedIndex = lower[LatinL.selectedIndex].length;
-     break;
-    default:
-     LatinM.disabled=true;
-     LatinM_Label.setAttribute("disabled","true");
-     break;
-  }
-}
-function UpdateLatinC()
-{
-  switch(LatinC.selectedIndex) {
-    case 0: // Uppercase Diacritical
-       LatinChar = String.fromCharCode(upper[LatinL.selectedIndex][LatinM.selectedIndex]);
-     break;
-    case 1: // Lowercase Diacritical
-       LatinChar = String.fromCharCode(lower[LatinL.selectedIndex][LatinM.selectedIndex]);
-     break;
-    case 2: 
-       LatinChar = String.fromCharCode(otherupper[LatinL.selectedIndex]);
-     break;
-    case 3: 
-       LatinChar = String.fromCharCode(otherlower[LatinL.selectedIndex]);
-     break;
-    case 4: 
-       LatinChar = String.fromCharCode(symbol[LatinL.selectedIndex]);
-     break;
-    default:
-     break;
-  }
-}
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
index 8dd2d89e583..6d437a21f1a 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
@@ -26,6 +26,7 @@
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
 <?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInsertChars.dtd">
 <window class="dialog" title="&windowTitle.label;"
@@ -42,121 +43,30 @@
 
   <keyset id="keyset"/>
   <broadcaster id="args" value=""/>
-  <tabcontrol orient="vertical">
-    <tabbox>
-      <tab selected="true" value="&insertLatin.label;" oncommand="SelectTab(0)"/>
-      <tab value="&insertHangul.label;" oncommand="SelectTab(1)"/>
-      <spring flex="1"/>
-    </tabbox>
-    <tabpanel autostretch="never">
 
-<!-- PUT SYMBOL ON SEPARATE TAB?
-      <box class="tabpanel" orient="vertical" autostretch="never">
-        <text class="label" value="&commonSymbols.label;/>
-        <grid autostretch="never">
-          <columns><column/><column/><column/><column/><column/><columns/>
-          <rows>
-            <row>
-              <button id="symbol0" oncommand="InsertSymbol(0)"/>
-              <button id="symbol1" oncommand="InsertSymbol(0)"/>
-              <button id="symbol2" oncommand="InsertSymbol(0)"/>
-              <button id="symbol3" oncommand="InsertSymbol(0)"/>
-              <button id="symbol4" oncommand="InsertSymbol(0)"/>
-            </row>
-            <row>
-              <button id="symbol5" oncommand="InsertSymbol(0)"/>
-              <button id="symbol6" oncommand="InsertSymbol(0)"/>
-              <button id="symbol7" oncommand="InsertSymbol(0)"/>
-              <button id="symbol8" oncommand="InsertSymbol(0)"/>
-              <button id="symbol9" oncommand="InsertSymbol(0)"/>
-            </row>
-          </rows>
-      </box>
--->
-
-      <!-- ============================================================== -->
-      <!--                 Insert Latin                                   -->
-      <!-- ============================================================== -->
-      <box class="tabpanel" orient="vertical" autostretch="never" style="width: 20em">
-        <text class="label" value="&category.label;"/>
-        <menulist id="LatinC" oncommand="SelectLatinCategory()">
-          <menupopup>
-            <menuitem value="&accentUpper.label;"/>
-            <menuitem value="&accentLower.label;"/>
-            <menuitem value="&otherUpper.label;"/>
-            <menuitem value="&otherLower.label;"/>
-            <menuitem value="&commonSymbols.label;"/>
-          </menupopup>
-        </menulist>
-        <box>
-          <box orient="vertical" flex="1">
-            <!-- value is set in JS from editor.properties strings -->
-            <text class="label" id="LatinL_Label" value="&letter.label;"/>
-            <menulist class="bold larger" flex="1" id="LatinL" oncommand="SelectLatinLetter()"/>
-          </box>
-          <box orient="vertical" flex="1">
-            <text class="label" id="LatinM_Label" value="&character.label;"/>
-            <menulist class="bold larger" flex="1" id="LatinM" oncommand="SelectLatinModifier()"/>
-          </box>
-        </box>
-      </box>
-      <!-- ============================================================== -->
-      <!--                 Insert Hangul                                  -->
-      <!-- ============================================================== -->
-      <box class="tabpanel" orient="vertical" autostretch="never" style="width: 20em">
-<!--
-      <box class="tabpanel" orient="vertical" autostretch="never" style="width: 20em">
-MENULISTS INSIDE GRID ARE MESSED UP!
-        <grid>
-          <columns><column/><column/><column/></columns>
-          <rows>
-            <row>
-              <text class="label" value="L:"/>
-              <text class="label" value="+ V:"/>
-              <text class="label" value="+ T:"/>
-              <text class="label" value=" = "/>
-              <text class="label bold" id="HangulCharacter"/>
-            </row>
-            <row class="bold larger">
-              <menulist id="HangulL" oncommand="SelectHangul()"/>
-              <menulist id="HangulV" oncommand="SelectHangul()"/>
-              <menulist id="HangulT" oncommand="SelectHangul()"/>
-            </row>      
-          </rows>
-        </grid>
--->
-        <box>
-          <box orient="vertical" autostretch="never">
-            <text class="label" value="T:"/>
-            <menulist id="HangulL" oncommand="SelectHangul()"/>
-          </box>
-          <box orient="vertical" autostretch="never">
-            <text class="label" value="+ V:"/>
-            <menulist id="HangulV" oncommand="SelectHangul()"/>
-          </box>
-          <box orient="vertical" autostretch="never">
-            <box>
-              <text class="label" value="+ L:"/>
-              <spring flex="1"/>
-              <text class="label" value="="/>
-              <text class="label bold" id="HangulCharacter"/>
-            </box>
-            <menulist id="HangulT" oncommand="SelectHangul()"/>
-          </box>
-        </box>
-      </box>
-    </tabpanel>
-  </tabcontrol>
-
-  <!-- This needs to wrap, so use html instead of text
-       the style is used be sure it doesn't determine 
-       the dialog's width.
-   -->
-  <html class="label wrap" flex="1">&nonModalMsg.label;</html>
+  <titledbox orient="vertical"><title><text value="&category.label;"/></title>
+    <radiogroup id="CatGrp" orient="vertical" persist="category">
+      <radio group="CatGrp" id="AccentUpper" value="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
+      <radio group="CatGrp" id="AccentLower" value="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
+      <radio group="CatGrp" id="Upper"       value="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
+      <radio group="CatGrp" id="Lower"       value="&otherLower.label;"    oncommand="ChangeCategory(this.id)"/>
+      <radio group="CatGrp" id="Symbol"      value="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
+    </radiogroup> 
+    <spring class="spacer"/>
+  </titledbox>
   <box>
-    <spring flex="1"/>
-    <button class="dialog" value="&insert.label;" oncommand="InsertCharacter()"/>
-    <button class="dialog" value="&closeButton.label;" oncommand="window.close()"/>
-    <spring flex="1"/>
+    <box orient="vertical" flex="1">
+      <!-- value is set in JS from editor.properties strings -->
+      <text class="label" id="LatinL_Label" value="&letter.label;"/>
+      <menulist class="larger" flex="1" id="LatinL" oncommand="SelectLatinLetter()"/>
+    </box>
+    <box orient="vertical" flex="1">
+      <text class="label" id="LatinM_Label" value="&character.label;"/>
+      <menulist class="larger" flex="1" id="LatinM" oncommand="SelectLatinModifier()"/>
+    </box>
   </box>
+
+  <separator class="groove"/>
+  <!-- from global dialogOverlay -->
+  <box id="okCancelButtons"/>
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.js b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
index ab0b63ba3aa..03157766f85 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
@@ -61,14 +61,21 @@ function Startup()
   // Initialize all widgets with image attributes
   InitDialog();
 
-  // Set initial number to 1 row, 2 columns:
+  // Set initial number to 2 rows, 2 columns:
   // Note, these are not attributes on the table,
   //  so don't put them in InitDialog(),
   //  else the user's values will be trashed when they use 
   //  the Advanced Edit dialog
-  dialog.rowsInput.value = 1;
+  dialog.rowsInput.value = 2;
   dialog.columnsInput.value = 2;
 
+  // If no default value on the width, set to 100%
+  if (dialog.widthInput.value.length == 0)
+  {
+    dialog.widthInput.value = "100";
+    dialog.widthPixelOrPercentMenulist.selectedIndex = 1;
+  }
+
   dialog.rowsInput.focus();
 
   // Resize window
@@ -82,9 +89,9 @@ function InitDialog()
 {  
   // Get default attributes set on the created table:
   // Get the width attribute of the element, stripping out "%"
-  // This sets contents of select combobox list
-  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "widthInput","widthPixelOrPercentMenulist");
-  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "heightInput","heightPixelOrPercentMenulist");
+  // This sets contents of menu combobox list
+  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "widthInput","widthPixelOrPercentMenulist", gPercent);
+  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "heightInput","heightPixelOrPercentMenulist", gPixel);
   dialog.borderInput.value = globalElement.getAttribute("border");
 }
 
@@ -104,7 +111,7 @@ function ValidateData()
   if (columns == "")
   {
     // Set focus to the offending control
-    dialog.columnsInput.focus();
+    SetTextfieldFocus(dialog.columnsInput);
     return false;
   }
 
@@ -166,6 +173,8 @@ function onOK()
   {
     editorShell.CloneAttributes(tableElement, globalElement);
 
+    // Create necessary rows and cells for the table
+    // AFTER BUG 30378 IS FIXED, DON'T INSERT TBODY!
     var tableBody = editorShell.CreateElementWithDefaults("tbody");
     if (tableBody)
     {
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index cd14c4c2541..6493be16097 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -47,49 +47,46 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
   <popupset id="aTooltipSet" />
-  
-  <grid>
-    <columns><column/><column/><column/></columns>
-    <rows>
-      <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
-        <textfield class="narrow" id="rowsInput" onkeyup="forceInteger(this.id)" />
-        <spring/>
-      </row>
-      <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" value="&numColumnsEditField.label;" />
-        <textfield class="narrow" id="columnsInput" onkeyup="forceInteger(this.id)" />
-        <spring/>
-      </row>
-      <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" value="&widthEditField.label;" />
-        <textfield class="narrow" id="widthInput" onkeyup="forceInteger(this.id)" />
-        <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist>
-          <!-- child elements are appended by JS -->
-      </row>
-      <row valign="baseline" text-align="right" autostretch="never">
-        <text class="label align-right" value="&heightEditField.label;"
-            tooltip="aTooltip" tooltiptext="&heightEditField.tooltip;" />
-        <textfield class="narrow" id="heightInput" onkeyup="forceInteger(this.id)" />
-        <menulist id="heightPixelOrPercentMenulist"><menupopup/></menulist>
-          <!-- child elements are appended by JS -->
-      </row>
-      <row valign="baseline" autostretch="never">
-        <text class="label align-right" text-align="right" value="&borderEditField.label;"
-            tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" />
-        <textfield class="narrow" id="borderInput" onkeyup="forceInteger(this.id)" />
-        <text class="label" value="&pixels.label;"/>  
-      </row>
-      <spring class="spacer"/>
-      <row valign="baseline" autostretch="never">
-        <spring/>
-        <spring/>
-        <!-- from EdDialogOverlay -->
-        <button class="dialog" id="AdvancedEditButton" tooltip="aTooltip" tooltiptext="&AdvancedEditButton.tooltip;"/>
-      </row>
-    </rows>
-  </grid>
-  <separator class="groove"/>
+  <titledbox><title><text value="&size.label;"/></title>
+    <grid>
+      <columns><column/><column/><column/></columns>
+      <rows>
+        <row valign="middle" text-align="right" autostretch="never">
+          <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
+          <textfield class="narrow" id="rowsInput" onkeyup="forceInteger(this.id)" />
+          <spring/>
+        </row>
+        <row valign="middle" text-align="right" autostretch="never">
+          <text class="label align-right" value="&numColumnsEditField.label;" />
+          <textfield class="narrow" id="columnsInput" onkeyup="forceInteger(this.id)" />
+          <spring/>
+        </row>
+        <row valign="middle" text-align="right" autostretch="never">
+          <text class="label align-right" value="&widthEditField.label;" />
+          <textfield class="narrow" id="widthInput" onkeyup="forceInteger(this.id)" />
+          <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist>
+            <!-- child elements are appended by JS -->
+        </row>
+        <row valign="middle" text-align="right" autostretch="never">
+          <text class="label align-right" value="&heightEditField.label;"
+              tooltip="aTooltip" tooltiptext="&heightEditField.tooltip;" />
+          <textfield class="narrow" id="heightInput" onkeyup="forceInteger(this.id)" />
+          <menulist id="heightPixelOrPercentMenulist"><menupopup/></menulist>
+            <!-- child elements are appended by JS -->
+        </row>
+      </rows>
+    </grid>
+    <spring class="small-separator"/>
+  </titledbox>
+  <spring class="small-separator"/>
+  <box>
+    <text class="label align-right" text-align="right" value="&borderEditField.label;"
+        tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" />
+    <textfield class="narrow" id="borderInput" onkeyup="forceInteger(this.id)" />
+    <text class="label" value="&pixels.label;"/>  
+  </box>
+  <!-- from EdDialogOverlay -->
+  <box id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
 	<box id="okCancelButtons"/> 
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 0705a78b4f6..73d9e07cf40 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -30,6 +30,8 @@ var newLinkText;
 var HNodeArray;
 var haveNamedAnchors = false;
 var haveHeadings = false;
+var canChangeHeadingSelected = true;
+var canChangeAnchorSelected = true;
 
 // NOTE: Use "href" instead of "a" to distinguish from Named Anchor
 // The returned node is has an "a" tagName
@@ -60,6 +62,7 @@ function Startup()
   dialog.MoreSection         = document.getElementById("MoreSection");
   dialog.MoreFewerButton     = document.getElementById("MoreFewerButton");
   dialog.AdvancedEditSection = document.getElementById("AdvancedEdit");
+  dialog.ok                  = document.getElementById("ok");
 
   var selection = editorShell.editorSelection;
   if (selection)
@@ -72,6 +75,7 @@ function Startup()
   
   if (imageElement)
   {
+dump("Selected imageElement="+imageElement+"\n");
     // Get the parent link if it exists -- more efficient than GetSelectedElement()
     anchorElement = editorShell.GetElementOrParentByTagName("href", imageElement);
     if (anchorElement)
@@ -92,6 +96,8 @@ function Startup()
     //   entire selection is within the link.
     anchorElement = editorShell.GetSelectedElement(tagName);
 
+dump("Selected element="+anchorElement+"\n");
+
     if (anchorElement)
     {
       // Select the entire link
@@ -142,6 +148,9 @@ function Startup()
     dialog.linkTextCaption.setAttribute("value",GetString("LinkText"));
     // Message above input field:
     dialog.linkTextMessage.setAttribute("value", GetString("EnterLinkText"));
+    
+    // This sets enable state on OK button
+    ChangeText();
   }
   else
   {
@@ -199,10 +208,10 @@ function Startup()
   if (insertLinkAtCaret) {
     dump("Setting focus to dialog.linkTextInput\n");
     // We will be using the HREF inputbox, so text message
-    dialog.linkTextInput.focus();
+    SetTextfieldFocus(dialog.linkTextInput);
   } else {
     dump("Setting focus to dialog.linkTextInput\n");
-    dialog.hrefInput.focus();
+    SetTextfieldFocus(dialog.hrefInput);
 
     // We will not insert a new link at caret, so remove link text input field
     dialog.linkTextInput.setAttribute("hidden","true");
@@ -227,15 +236,7 @@ function chooseFile()
     dialog.hrefInput.value = fileName;
   }
   // Put focus into the input field
-  dialog.hrefInput.focus();
-}
-
-function RemoveLink()
-{
-  // Simple clear the input field!
-  // BUG: This doesn't clear the input field!
-  dialog.hrefInput.value = "";
-  dialog.hrefInput.focus();
+  SetTextfieldFocus(dialog.hrefInput);
 }
 
 function FillListboxes()
@@ -305,12 +306,28 @@ function FillListboxes()
   }
 }
 
+function ChangeText()
+{
+  if (insertLinkAtCaret)
+  {
+    var text = dialog.linkTextInput.value.trimString();
+    SetElementEnabledById( "ok", (text.length > 0));
+  }
+}
+
+function ChangeLocation()
+{
+  // Unselect the treelists
+  UnselectNamedAnchor();
+  UnselectHeadings();
+}
+
 function GetExistingHeadingIndex(text)
 {
   var len = dialog.HeadingsList.getAttribute("length");
   for (var i=0; i < len; i++)
   {
-    if (dialog.HeadingsList.options[i].value == text)
+    if (GetTreelistValueAt(dialog.HeadingsList, i) == text)
       return i;
   }
   return -1;
@@ -318,16 +335,44 @@ function GetExistingHeadingIndex(text)
 
 function SelectNamedAnchor()
 {
-dump("SelectNamedAnchor. haveNamedAnchors="+haveNamedAnchors+"|\n");
-  if (haveNamedAnchors)
-    dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.NamedAnchorList);
+  if (canChangeAnchorSelected)
+  {
+    if (haveNamedAnchors)
+      dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.NamedAnchorList);
+    else
+      UnselectNamedAnchor();
+  
+    UnselectHeadings();
+  }
 }
 
 function SelectHeading()
 {
-dump("SelectHeading. haveHeadings="+haveHeadings+"|\n");
-  if (haveHeadings)
-    dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.HeadingsList);
+  if (canChangeHeadingSelected)
+  {
+    if (haveHeadings)
+      dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.HeadingsList);
+    else
+      UnselectHeadings();
+
+    UnselectNamedAnchor();
+  }
+}
+
+function UnselectNamedAnchor()
+{
+  // Prevent recursive calling of SelectNamedAnchor()
+  canChangeAnchorSelected = false;
+  dialog.NamedAnchorList.selectedIndex = -1;  
+  canChangeAnchorSelected = true;
+}
+
+function UnselectHeadings()
+{
+  // Prevent recursive calling of SelectHeading()
+  canChangeHeadingSelected = false;
+  dialog.HeadingsList.selectedIndex = -1;  
+  canChangeHeadingSelected = true;
 }
 
 // Get and validate data from widgets.
@@ -355,8 +400,8 @@ function ValidateData()
     newLinkText = TrimString(dialog.linkTextInput.value);
     if (newLinkText.length == 0)
     {
-      ShowInputErrorMessage(GetString("GetInputError"));
-      dialog.linkTextInput.focus();
+      ShowInputErrorMessage(GetString("EmptyLinkTextError"));
+      SetTextfieldFocus(dialog.linkTextInput);
       return false;
     }
   }
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index c54ed855af4..3d700617a59 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -35,6 +35,7 @@
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()"
+   persist="screenX screenY"
    orient="vertical" >
 
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -45,28 +46,20 @@
   <keyset id="keyset"/>
 
   <box orient="vertical" style="min-width: 20em">
-    <titledbox orient="vertical"><title><text id="linkTextCaption" align="left" value="&LinkTitle.label;"/></title>
+    <titledbox orient="vertical"><title><text id="linkTextCaption" align="left"/></title>
       <text class="label" id="linkTextMessage"/> 
-	    <textfield id="linkTextInput" flex="1"/>
+	    <textfield id="linkTextInput" flex="1"  onkeyup="ChangeText()"/>
     </titledbox>
 
     <titledbox orient="vertical"><title><text class="label" value="&LinkURLBox.label;"/></title>
       <text class="label" value="&LinkURLEditField.label;"/>
-      <grid>
-        <columns><column/><column/></columns>
-        <rows>
-          <row autostretch="never" valign="middle">
-            <textfield id="hrefInput" flex="1"/>
-            <button class="dialog" id="ChooseFile" flex="1"/>
-          </row>
-          <row>
-            <box autostretch="never">
-              <button class="dialog" id="MoreFewerButton" align="left" oncommand="onMoreFewer()" persist="more"/>
-            </box>
-            <button class="dialog" id="RemoveLink" oncommand="RemoveLink()" value="&RemoveLinkButton.label;" flex="1"/>
-          </row>
-        </rows>
-      </grid>
+      <box autostretch="never" valign="middle">
+        <textfield id="hrefInput" flex="1" style="min-width: 18em" onkeyup="ChangeLocation()"/>
+        <button class="dialog" id="ChooseFile" flex="1"/>
+      </box>
+      <box autostretch="never">
+        <button class="dialog" id="MoreFewerButton" align="left" oncommand="onMoreFewer()" persist="more"/>
+      </box>
       <box id="MoreSection" orient="vertical">
         <spring class="bigspacer"/>
         <text class="label" align="left" value="&NamedAnchorMsg.label;"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
index bf57fefe48b..c0dfa6aaa10 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.js
@@ -77,7 +77,7 @@ function Startup()
 
   InitDialog();
   
-  nameInput.focus();
+  SetTextfieldFocus(nameInput);
 }
 
 function InitDialog()
@@ -104,7 +104,7 @@ function ValidateData()
   var name = TrimString(nameInput.value);
   if (name.length == 0) {
       ShowInputErrorMessage(GetString("MissingAnchorNameError"));
-      nameInput.focus();
+      SetTextfieldFocus(nameInput);
       return false;
   } else {
     // Replace spaces with "_" and strip other characters
@@ -114,7 +114,7 @@ function ValidateData()
 
     if (AnchorNameExists(name)) {
       ShowInputErrorMessage(GetString("DuplicateAnchorNameError").replace(/%name%/,name));            
-      nameInput.focus();
+      SetTextfieldFocus(nameInput);
       return false;
     }
     globalElement.setAttribute("name",name);
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.js b/mozilla/editor/ui/dialogs/content/EdPageProps.js
index af3decaf9c9..5929e47415e 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.js
@@ -20,13 +20,11 @@
  * Contributor(s): 
  */
 
-var MoreSection;
 var title = "";
 var author = "";
 var description = "";
 var authorElement;
 var descriptionElement;
-var headNode;
 var insertNewAuthor = false;
 var insertNewDescription = false;
 var titleWasEdited = false;
@@ -50,9 +48,6 @@ function Startup()
   dialog.TitleInput       = document.getElementById("TitleInput");
   dialog.AuthorInput      = document.getElementById("AuthorInput");
   dialog.DescriptionInput = document.getElementById("DescriptionInput");
-  dialog.MoreSection      = document.getElementById("MoreSection");
-  dialog.MoreFewerButton  = document.getElementById("MoreFewerButton");
-  dialog.HeadSrcInput     = document.getElementById("HeadSrcInput");
   doSetOKCancel(onOK, null);
   
   // Default string for new page is set from DTD string in XUL,
@@ -92,14 +87,9 @@ function Startup()
     insertNewDescription = true;
   }
   
-  headNode = editorShell.editorDocument.getElementsByTagName("head").item(0);
-  if (!headNode)
-    window.close();
-
-  InitMoreFewer();
   InitDialog();
 
-  dialog.TitleInput.focus();
+  SetTextfieldFocus(dialog.TitleInput);
 }
 
 function InitDialog()
@@ -107,8 +97,6 @@ function InitDialog()
   dialog.TitleInput.value = editorShell.GetDocumentTitle();
   dialog.AuthorInput.value = authorElement.getAttribute("content");
   dialog.DescriptionInput.value = descriptionElement.getAttribute("content");
-  // Get the entire contents of the "head" region.
-  dialog.HeadSrcInput.value = editorShell.GetHeadContentsAsHTML();
 }
 
 function TextfieldChanged(ID)
@@ -139,25 +127,6 @@ function onOK()
 {
   if (ValidateData())
   {
-    // Save only if advanced "head editing" region is open?
-    if (SeeMore)
-    {
-      // Delete existing children of HEAD      
-      // Note that we DO NOT use editorShell method 
-      //  because this is not an undoable task
-      while(headNode.firstChild)
-        headNode.removeChild(headNode.firstChild);
-
-      // This method does not use the transaction system:
-      if (dialog.HeadSrcInput.value.length > 0)
-        editorShell.ReplaceHeadContentsWithHTML(dialog.HeadSrcInput.value);        
-    }
-
-    //Problem: How do we reconcile changes in same elements in 
-    //         advanced region and here? 
-    // 1. Save manually-edited results first
-    // 2. Save each of the 3 textfield results only if user actually changed a value
-
     if (titleWasEdited)
     {
       // Set title contents even if string is empty
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
index 53680f92fa6..b07467d67a3 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
@@ -55,36 +55,22 @@
         <text class="label" value="&lastModified.label;" flex ="1" align="left"/>
         <text class="label" id="PageModDate" align="left"/>
       </row>
-      <row valign="baseline">
+      <row valign="middle">
         <text class="label" value="&titleInput.label;"/>
         <textfield id="TitleInput" flex ="1" onkeyup="TextfieldChanged(this.id)"/>
       </row>
-      <row valign="baseline">
+      <row valign="middle">
         <text class="label" value="&authorInput.label;"/>
         <textfield id="AuthorInput" flex ="1" onkeyup="TextfieldChanged(this.id)"/>
       </row>
-      <row valign="baseline">
+      <row valign="middle">
         <text class="label" value="&descriptionInput.label;"/>
         <textfield class="MinWidth20em" id="DescriptionInput" flex ="1" onkeyup="TextfieldChanged(this.id)"/>
       </row>
     </rows>
   </grid>
   <spring class="bigspacer"/>
-  <box>
-    <button class="dialog" align="left" id="MoreFewerButton" oncommand="onMoreFewer()" persist = "more"/>
-    <spring flex="1"/>
-  </box>
-  <box id="MoreSection" orient="vertical" flex="1">
-    <!-- html used for labels that need to wrap -->
-    <html class="wrap" flex="1">&headSection.label;</html>
-    <box orient="vertical" flex="1" style="width: 10em; height: 10em;">
-      <textfield id="HeadSrcInput" multiline="true" style="width: 1em" rows="1" flex="1"/>
-    </box>
-    <box>
-      <box orient="vertical"><text class="label" value="&example.label;"/></box>
-      <html class="wrap bold" flex="1">&example.value;</html>
-    </box>
-  </box>
+  <html class="wrap" flex="1">&EditHEADSource.label;</html>
   <separator class="groove"/>
   <box id="okCancelButtons"/> 
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
index 5f33e7ee47a..cfb2a41268e 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
@@ -23,6 +23,7 @@
 var MisspelledWord;
 var spellChecker;
 var allowSelectWord = true;
+var PreviousReplaceWord = "";
 
 // dialog initialization code
 function Startup()
@@ -37,15 +38,13 @@ function Startup()
     dump("SpellChecker not found!!!\n");
     window.close();
   }
-  // Save as a property of the window so it can be used by child dialogs
-  window.spellChecker = spellChecker;
 
   // Create dialog object to store controls for easy access
   dialog = new Object;
   if (!dialog)
   {
     dump("Failed to create dialog object!!!\n");
-    window.close();
+    Close();
   }
   dialog.MisspelledWordLabel = document.getElementById("MisspelledWordLabel");
   dialog.MisspelledWord = document.getElementById("MisspelledWord");
@@ -74,6 +73,7 @@ function Startup()
   }
   // Initial replace word is the misspelled word;
   dialog.ReplaceWordInput.value = MisspelledWord;
+  PreviousReplaceWord = MisspelledWord;
 
   if (dialog.LanguageMenulist)
   {
@@ -94,7 +94,9 @@ function Startup()
 
   DoEnabling();
 
-  dialog.SuggestedList.focus();  
+  // Treelist doesn't show any focus feedback! Set to textfield instead
+  //dialog.SuggestedList.focus();  
+  SetTextfieldFocus(dialog.ReplaceWordInput);
 }
 
 function InitLanguageMenu(curLang)
@@ -150,9 +152,9 @@ function DoEnabling()
 {
   if (MisspelledWord.length == 0)
   {
-    dialog.MisspelledWordLabel.setAttribute("value",GetString("CheckSpellingDone"));
+    dialog.MisspelledWord.setAttribute("value",GetString("CheckSpellingDone"));
     
-    SetElementEnabledById("MisspelledWord", false);
+    SetElementEnabledById("MisspelledWordLabel", false);
     SetElementEnabledById("ReplaceWordLabel", false);
     SetElementEnabledById("ReplaceWord", false);
     SetElementEnabledById("CheckWord", false);
@@ -164,9 +166,7 @@ function DoEnabling()
     SetElementEnabledById("ReplaceAll", false);
     SetElementEnabledById("AddToDictionary", false);
   } else {
-    dialog.MisspelledWordLabel.setAttribute("value",GetString("MisspelledWordLabel"));
-
-    SetElementEnabledById("MisspelledWord", true);
+    SetElementEnabledById("MisspelledWordLabel", true);
     SetElementEnabledById("ReplaceWordLabel", true);
     SetElementEnabledById("ReplaceWord", true);
     SetElementEnabledById("CheckWord", true);
@@ -174,9 +174,9 @@ function DoEnabling()
     SetElementEnabledById("SuggestedList", true);
     SetElementEnabledById("Ignore", true);
     SetElementEnabledById("IgnoreAll", true);
-    SetElementEnabledById("Replace", true);
-    SetElementEnabledById("ReplaceAll", true);
     SetElementEnabledById("AddToDictionary", true);
+
+    SetReplaceEnable();
   }
 }
 
@@ -194,12 +194,13 @@ function SetWidgetsForMisspelledWord()
 
   // Initial replace word is misspelled word 
   dialog.ReplaceWordInput.value = MisspelledWord;
+  PreviousReplaceWord = MisspelledWord;
   
   DoEnabling();
   
   // EXPERIMENTAL: Automatically shift focus to replace word editfield
   if (MisspelledWord)
-    dialog.ReplaceWordInput.focus();
+    SetTextfieldFocus(dialog.ReplaceWordInput);
 }
 
 function CheckWord()
@@ -227,8 +228,18 @@ function SelectSuggestedWord()
 {
   if (allowSelectWord)
   {
-    var selValue = GetSelectedTreelistValue(dialog.SuggestedList);
-    dialog.ReplaceWordInput.value = selValue;
+    var index = dialog.SuggestedList.selectedIndex;
+    if (index == -1)
+    {
+      dialog.ReplaceWordInput.value = PreviousReplaceWord;
+dump("Word de-selected\n");
+    }
+    else
+    {
+      var selValue = GetSelectedTreelistValue(dialog.SuggestedList);
+      dialog.ReplaceWordInput.value = selValue;
+    }
+    SetReplaceEnable();
   }
 }
 
@@ -240,9 +251,14 @@ function ChangeReplaceWord()
   allowSelectWord = false;
 
   // Unselect the word in the suggested list when user edits the replacement word
-  dialog.SuggestedList.clearItemSelection();
+  dialog.SuggestedList.selectedIndex = -1;
 
   allowSelectWord = saveAllow;
+
+  // Remember the new word
+  PreviousReplaceWord = dialog.ReplaceWordInput.value;
+
+  SetReplaceEnable();
 }
 
 function Ignore()
@@ -319,13 +335,6 @@ function Recheck()
   }
 }
 
-function Close()
-{
-  // Shutdown the spell check and close the dialog
-  spellChecker.UninitSpellChecker();
-  window.close();
-}
-
 function FillSuggestedList()
 {
   list = dialog.SuggestedList;
@@ -348,8 +357,6 @@ function FillSuggestedList()
     
     var len = list.getAttribute("length");
 
-dump(len+"=number of words in list\n");
-
     if (count == 0) {
       // No suggestions - show a message but don't let user select it
       var item = AppendStringToTreelistById(list, "NoSuggestedWords");
@@ -359,5 +366,24 @@ dump(len+"=number of words in list\n");
       allowSelectWord = true;
     }
   }
+
+  SetReplaceEnable();
+}
+
+function SetReplaceEnable()
+{
+  // Enable "Change..." buttons only if new word is different than misspelled
+  var newWord = dialog.ReplaceWordInput.value;
+  var enable = newWord.length > 0 && newWord != MisspelledWord;
+  SetElementEnabledById("Replace", enable);
+  SetElementEnabledById("ReplaceAll", enable);
+}
+
+function Close()
+{
+dump("Closing spell checker dialog\n");
+  // Shutdown the spell check and close the dialog
+  spellChecker.UninitSpellChecker();
+  window.close();
 }
 
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index ec07555ce12..540847a01ce 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -39,36 +39,32 @@
   <script language="Javascript" src="chrome://global/content/strres.js" />
   <!-- The argument to ShowWindowWithArgs (the editor appCore name) is placed here -->
   <broadcaster id="args" value=""/>
-  <box>
-    <!-- value is set in JS -->
-    <text class="label" id="MisspelledWordLabel"/>
-    <spring class="bigspacer"/>
-    <text class="label bold" id="MisspelledWord"/>
-  </box>
+  <grid>
+    <columns><column/><column style="width: 15em" flex="1"/><column style="min-width: 8em"/></columns>
+    <rows>
+      <row>
+        <text class="label" id="MisspelledWordLabel" value="&misspelledWord.label;"/>
+        <text class="label bold" id="MisspelledWord"/>
+        <spring/>
+      </row>
+      <row>
+        <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
+        <textfield id="ReplaceWord" onkeyup="ChangeReplaceWord()"/>
+        <button id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
+      </row>
+    </rows>
+  </grid>
+  <text class="label" id="SuggestedListLabel" value="&suggestions.label;"/>
   <grid>
     <columns><column style="width: 15em" flex="1"/><column style="width: 15em" flex="1"/></columns>
     <rows>
-      <row>
-        <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
-        <spring/>
-      </row>
-      <row>
-        <textfield id="ReplaceWord" onkeyup="ChangeReplaceWord()"/>
-        <box flex="1">
-          <button id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
-        </box>
-      </row>
-      <row>
-        <text class="label" id="SuggestedListLabel" value="&suggestions.label;"/>
-        <spring/>
-      </row>
       <row>
         <!-- BUG! setting class="MinWidth20em" on tree doesn't work (width=0) -->
         <tree rows="8" class="list" id="SuggestedList" onselect="SelectSuggestedWord()" onclick="SelectSuggestedWord()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
         <grid flex="1">
-          <columns><column flex="1"/><column flex="1"/></columns>
+          <columns><column style="min-width: 8em" flex="1"/><column style="min-width: 8em" flex="1"/></columns>
           <rows>
             <row>
               <button class="dialog" id="Ignore" oncommand="Ignore()" value="&ignoreButton.label;"/>
@@ -78,10 +74,8 @@
               <button class="dialog" id="Replace" oncommand="Replace()" value="&changeButton.label;"/>
               <button class="dialog" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeAllButton.label;"/>
             </row>
-            <row>
-              <text class="label" value="&userDictionary.label;"/>
-              <spring/>
-            </row>
+            <spring class="bigspacer"/>
+            <text class="label" value="&userDictionary.label;"/>
             <row>
               <button class="dialog" id="AddToDictionary" oncommand="AddToDictionary()" value="&addToUserDictionaryButton.label;"/>
               <button class="dialog" id="EditDictionary"  oncommand="EditDictionary()" value="&editUserDictionaryButton.label;"/>
@@ -98,7 +92,7 @@
           <!-- contents are appended by JS -->
         <box flex="1">
           <button class="dialog" id="Recheck" flex="1" value="&recheckButton.label;" oncommand="Recheck()"/>
-          <button class="dialog" id="Close" flex="1" value="&closeButton.label;" oncommand="Close()"/>
+          <button class="exit-dialog" id="cancel" flex="1" value="&closeButton.label;" onclick="Close()"/>
         </box>
       </row>
     </rows>
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.js b/mozilla/editor/ui/dialogs/content/EdTableProps.js
index d017709162c..542ff43ab59 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.js
@@ -106,8 +106,6 @@ function Startup()
   dialog.TableAlignList = document.getElementById("TableAlignList");
   dialog.TableCaptionList = document.getElementById("TableCaptionList");
   dialog.TableInheritColor = document.getElementById("TableInheritColor");
-  dialog.TableImageInput = document.getElementById("TableImageInput");
-  dialog.TableImageButton = document.getElementById("TableImageButton");
 
   dialog.RowsCheckbox = document.getElementById("RowsCheckbox");
   dialog.ColumnsCheckbox = document.getElementById("ColumnsCheckbox");
@@ -119,7 +117,6 @@ function Startup()
   dialog.TableHAlignCheckbox = document.getElementById("TableHAlignCheckbox");
   dialog.TableCaptionCheckbox = document.getElementById("TableCaptionCheckbox");
   dialog.TableColorCheckbox = document.getElementById("TableColorCheckbox");
-  dialog.TableImageCheckbox = document.getElementById("TableImageCheckbox");
 
   // Cell Panel
   dialog.SelectionList = document.getElementById("SelectionList");
@@ -140,8 +137,6 @@ function Startup()
   dialog.CellStyleList = document.getElementById("CellStyleList");
   dialog.TextWrapList = document.getElementById("TextWrapList");
   dialog.CellInheritColor = document.getElementById("CellInheritColor");
-  dialog.CellImageInput = document.getElementById("CellImageInput");
-  dialog.CellImageButton = document.getElementById("CellImageButton");
 
   dialog.CellHeightCheckbox = document.getElementById("CellHeightCheckbox");
   dialog.CellWidthCheckbox = document.getElementById("CellWidthCheckbox");
@@ -152,7 +147,6 @@ function Startup()
   dialog.CellStyleCheckbox = document.getElementById("CellStyleCheckbox");
   dialog.TextWrapCheckbox = document.getElementById("TextWrapCheckbox");
   dialog.CellColorCheckbox = document.getElementById("CellColorCheckbox");
-  dialog.CellImageCheckbox = document.getElementById("CellImageCheckbox");
 
   TabPanel = document.getElementById("TabPanel");
   var TableTab = document.getElementById("TableTab");
@@ -249,7 +243,7 @@ function Startup()
   if (currentPanel == CellPanel)
     dialog.SelectionList.focus(); 
   else
-    dialog.TableRowsInput.focus();
+    SetTextfieldFocus(dialog.TableRowsInput);
 }
 
 
@@ -258,8 +252,8 @@ function InitDialog()
   // Get Table attributes
   dialog.TableRowsInput.value = rowCount;
   dialog.TableColumnsInput.value = colCount;
-  dialog.TableHeightInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "height", "TableHeightUnits");
-  dialog.TableWidthInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "width", "TableWidthUnits");
+  dialog.TableHeightInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "height", "TableHeightUnits", gPercent);
+  dialog.TableWidthInput.value = InitPixelOrPercentMenulist(globalTableElement, TableElement, "width", "TableWidthUnits", gPercent);
   dialog.BorderWidthInput.value = globalTableElement.border;
   dialog.SpacingInput.value = globalTableElement.cellSpacing;
   dialog.PaddingInput.value = globalTableElement.cellPadding;
@@ -287,9 +281,6 @@ dump("Caption Element = "+TableCaptionElement+"\n");
   }
   dialog.TableCaptionList.selectedIndex = index;
   
-  if (globalTableElement.background)
-    dialog.TableImageInput.value = globalTableElement.background;
-  
   SetColor("tableBackgroundCW", globalTableElement.bgColor); 
 
   InitCellPanel(SelectedCellsType);
@@ -303,8 +294,8 @@ function InitCellPanel()
     // This assumes order of items is Cell, Row, Column
     dialog.SelectionList.selectedIndex = SelectedCellsType-1;
 
-    dialog.CellHeightInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "height", "CellHeightUnits");
-    dialog.CellWidthInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "width", "CellWidthUnits");
+    dialog.CellHeightInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "height", "CellHeightUnits", gPercent);
+    dialog.CellWidthInput.value = InitPixelOrPercentMenulist(globalCellElement, CellElement, "width", "CellWidthUnits", gPixel);
 
     dialog.RowSpanInput.value = globalCellElement.getAttribute("rowspan");
     dialog.ColSpanInput.value = globalCellElement.getAttribute("colspan");
@@ -355,9 +346,6 @@ function InitCellPanel()
     dialog.TextWrapList.selectedIndex = globalCellElement.noWrap ? 1 : 0;
     
     SetColor("cellBackgroundCW", globalCellElement.bgColor); 
-    
-    if (globalCellElement.background)
-      dialog.CellImageInput.value = globalCellElement.background;
   }
 }
 
@@ -700,36 +688,6 @@ function SetSpanEnable()
   dialog.ColSpanCheckbox.setAttribute("disabled", (SelectedCellsType == SELECT_ROW) ? "true" : "false");
 }
 
-function ChooseTableImage()
-{
-  // Get a local file, converted into URL format
-  fileName = GetLocalFileURL("img");
-  if (fileName && fileName.length > 0)
-  {
-    dialog.TableImageInput.setAttribute("value",fileName);
-
-    SetCheckbox("TableImageCheckbox");
-  }
-  CellDataChanged = true;
-
-  // Put focus into the input field
-  dialog.TableImageInput.focus();
-}
-
-function ChooseCellImage()
-{
-  fileName = GetLocalFileURL("img");
-  if (fileName && fileName.length > 0)
-  {
-    dialog.CellImageInput.setAttribute("value",fileName);
-    SetCheckbox("CellImageCheckbox");
-  }
-  CellDataChanged = true;
-
-  // Put focus into the input field
-  dialog.CellImageInput.focus();
-}
-
 function SwitchPanel(newPanel)
 {
   if (currentPanel != newPanel)
@@ -776,7 +734,7 @@ function ValidateNumber(inputWidgetID, listWidget, minVal, maxVal, element, attN
       SwitchPanel(validatePanel);
 
       // Error - shift to offending input widget
-      inputWidget.focus();
+      SetTextfieldFocus(inputWidget);
       error = true;
     }
     else      
@@ -804,76 +762,35 @@ function SetAlign(listID, defaultValue, element, attName)
 function ValidateTableData()
 {
   validatePanel = TablePanel;
-  if (dialog.RowsCheckbox.checked)
-  {
-    newRowCount = Number(ValidateNumber("TableRowsInput", null, 1, maxRows, null, null));
-    if (error) return false;
-  }
+  newRowCount = Number(ValidateNumber("TableRowsInput", null, 1, maxRows, null, null));
+  if (error) return false;
 
-  if (dialog.ColumnsCheckbox.checked)
-  {
-    newColCount = Number(ValidateNumber("TableColumnsInput", null, 1, maxColumns, null, null));
-    if (error) return false;
-  }
+  newColCount = Number(ValidateNumber("TableColumnsInput", null, 1, maxColumns, null, null));
+  if (error) return false;
 
-  if (dialog.TableHeightCheckbox.checked)
-  {
-    ValidateNumber("TableHeightInput", dialog.TableHeightUnits, 
-                    1, maxPixels, globalTableElement, "height");
-    if (error) return false;
-  }
 
-  if (dialog.TableWidthCheckbox.checked)
-  {
-    ValidateNumber("TableWidthInput", dialog.TableWidthUnits, 
-                   1, maxPixels, globalTableElement, "width");
-    if (error) return false;
-  }
+  ValidateNumber("TableHeightInput", dialog.TableHeightUnits, 
+                  1, maxPixels, globalTableElement, "height");
+  if (error) return false;
 
-  if (dialog.TableBorderCheckbox.checked)
-  {
-    var border = ValidateNumber("BorderWidthInput", null, 0, maxPixels, globalTableElement, "border");
-    // TODO: Deal with "BORDER" without value issue
-    if (error) return false;
-  }
 
-  if (dialog.CellSpacingCheckbox.checked)
-  {
-    ValidateNumber("SpacingInput", null, 0, maxPixels, globalTableElement, "cellspacing");
-    if (error) return false;
-  }
+  ValidateNumber("TableWidthInput", dialog.TableWidthUnits, 
+                 1, maxPixels, globalTableElement, "width");
+  if (error) return false;
 
-  if (dialog.CellPaddingCheckbox.checked)
-  {
-    ValidateNumber("PaddingInput", null, 0, maxPixels, globalTableElement, "cellpadding");
-    if (error) return false;
-  }
+  var border = ValidateNumber("BorderWidthInput", null, 0, maxPixels, globalTableElement, "border");
+  // TODO: Deal with "BORDER" without value issue
+  if (error) return false;
 
-  if (dialog.TableHAlignCheckbox.checked)
-    SetAlign("TableAlignList", defHAlign, globalTableElement, "align");
+  ValidateNumber("SpacingInput", null, 0, maxPixels, globalTableElement, "cellspacing");
+  if (error) return false;
+
+  ValidateNumber("PaddingInput", null, 0, maxPixels, globalTableElement, "cellpadding");
+  if (error) return false;
+
+  SetAlign("TableAlignList", defHAlign, globalTableElement, "align");
 
   // Color is set on globalCellElement immediately
-
-  // Background Image
-  if (dialog.TableImageCheckbox.checked)
-  {
-    var imageName = dialog.TableImageInput.value.trimString();
-    if (imageName && imageName != "")
-    {
-      if (IsValidImage(imageName))
-        globalTableElement.background = imageName;
-      else
-      {
-        dialog.TableImageInput.focus();
-        // Switch to appropriate panel for error reporting
-        SwitchPanel(validatePanel);
-        ShowInputErrorMessage(GetString("MissingImageError"));
-        return false;
-      }
-    } else {
-      globalTableElement.removeAttribute("background");
-    }
-  }
   return true;
 }
 
@@ -946,27 +863,6 @@ dump("Alignment char="+alignChar+"\n");
     else
       globalCellElement.removeAttribute("nowrap");
   }
-
-  // Background Image
-  if (dialog.CellImageCheckbox.checked)
-  {
-    var imageName = dialog.TableImageInput.value.trimString();
-    if (imageName && imageName != "")
-    {
-      if (IsValidImage(imageName))
-        globalCellElement.background = imageName;
-      else
-      {
-        dialog.CellImageInput.focus();
-        // Switch to appropriate panel for error reporting
-        SwitchPanel(validatePanel);
-        ShowInputErrorMessage(GetString("MissingImageError"));
-      }
-    } else {
-      globalCellElement.removeAttribute("background");
-    }
-  }  
-
   return true;
 }
 
@@ -1260,10 +1156,6 @@ dump("Insert a table caption...\n");
 
   if (dialog.TableColorCheckbox.checked)
     CloneAttribute(TableElement, globalTableElement, "bgcolor");
-
-  if (dialog.TableImageCheckbox.checked)
-    CloneAttribute(TableElement, globalTableElement, "background");
-  
 }
 
 function ApplyCellAttributes()
@@ -1307,9 +1199,6 @@ function ApplyAttributesToOneCell(destElement)
   if (dialog.CellColorCheckbox.checked)
     CloneAttribute(destElement, globalCellElement, "bgcolor");
 
-  if (dialog.CellImageCheckbox.checked)
-    CloneAttribute(destElement, globalCellElement, "background");
-
   if (dialog.CellStyleCheckbox.checked)
   {
     var newStyleIndex = dialog.CellStyleList.selectedIndex;
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index 184a6697b61..932ece391c5 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -139,41 +139,28 @@
           </box>
           <spring class="bigspacer"/>
         </box> <!-- Border and alignment -->
-
-        <titledbox orient="vertical"><title><text align="left" value="&background.label;"/></title>
-        <grid>
-          <columns><column/><column/></columns>
-          <rows>
-            <row valign="middle" autostretch="never">
-              <checkbox id="TableColorCheckbox" value="&color.label;"/>
-              <box valign="middle">
-                <menu class="colorpicker">
-    	            <box>
-                    <spring id="tableBackgroundCW" class="color-well"/>
-                    <image class="popup-trigger"/>
-                  </box>
-    	            <menupopup>
-                    <colorpicker id="tableBackgroundCP" palettename="standard" 
-                      onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode);"/>
-                    <button class="dialog" value="&defaultColor.label;" 
-                      oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode)"/>
-    	            </menupopup>
-                </menu>
-                <spring class="spacer"/>
-                <text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
-              </box>
-            </row>
-            <row valign="middle">
-              <checkbox id="TableImageCheckbox" value="&image.label;"/>
-              <textfield id="TableImageInput" flex="1"/>
-              <button class="dialog" value="&ChooseImage.label;" id="TableImageButton" oncommand="ChooseTableImage()"/>
-            </row>
-          </rows>
-        </grid>
-        </titledbox><!-- Table Background -->
+        <spring class="spacer"/>
+        <box>
+          <text class="label" value="&backgroundColor.label;"/>
+          <spring class="spacer"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="tableBackgroundCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="tableBackgroundCP" palettename="standard" 
+                onclick="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode);"/>
+              <button class="dialog" value="&defaultColor.label;" 
+                oncommand="GetColorAndUpdate('tableBackgroundCP','tableBackgroundCW','TableColorCheckbox', this.parentNode)"/>
+    	      </menupopup>
+          </menu>
+          <spring class="spacer"/>
+          <text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
+        </box>
         <spring class="spacer"/>
         <box flex="1" autostretch="never">
-          <html  class="wrap" flex="1" style="width: 1em">&tableUseCheckboxHelp.label;</html>
+          <spring flex="1"/>
           <!-- From EdDialogOvlerlay.xul -->
           <button class="dialog" id="AdvancedEditButton"/>
         </box>
@@ -292,37 +279,25 @@
             </menulist>
           </box>
         </box><!-- Alignment and Style -->
-        <titledbox orient="vertical"><title><text align="left" value="&background.label;"/></title>
-        <grid>
-          <columns><column/><column/></columns>
-          <rows>
-            <row valign="middle" autostretch="never">
-              <checkbox id="CellColorCheckbox" value="&color.label;"/>
-              <box valign="middle">
-                <menu class="colorpicker">
-    	            <box>
-                    <spring id="cellBackgroundCW" class="color-well"/>
-                    <image class="popup-trigger"/>
-                  </box>
-    	            <menupopup>
-                    <colorpicker id="cellBackgroundCP" palettename="standard"
-                        onclick="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW', 'CellColorCheckbox', this.parentNode)"/>
-                    <button class="dialog" value="&defaultColor.label;"
-                        oncommand="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW', 'CellColorCheckbox', this.parentNode)"/>
-    	            </menupopup>
-                </menu>
-                <spring class="spacer"/>
-                <text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
-              </box>
-            </row>
-            <row valign="middle" autostretch="never">
-              <checkbox id="CellImageCheckbox" value="&image.label;" />
-              <textfield id="CellImageInput" flex="1"/>
-              <button class="dialog" value="&ChooseImage.label;" id="CellImageButton" oncommand="ChooseCellImage()"/>
-            </row>
-          </rows>
-        </grid>
-        </titledbox><!-- Table Background -->
+        <spring class="spacer"/>
+        <box>
+          <text class="label" value="&backgroundColor.label;"/>
+          <spring class="spacer"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="cellBackgroundCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="cellBackgroundCP" palettename="standard"
+                  onclick="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW', 'CellColorCheckbox', this.parentNode)"/>
+              <button class="dialog" value="&defaultColor.label;"
+                  oncommand="GetColorAndUpdate('cellBackgroundCP','cellBackgroundCW', 'CellColorCheckbox', this.parentNode)"/>
+    	      </menupopup>
+          </menu>
+          <spring class="spacer"/>
+          <text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
+        </box>
         <spring class="spacer"/>
         <box autostretch="never">
           <html  class="wrap" flex="1" style="width: 1em">&cellUseCheckboxHelp.label;</html>
diff --git a/mozilla/editor/ui/dialogs/content/EditConflict.xul b/mozilla/editor/ui/dialogs/content/EditConflict.xul
index abf9d3a9a40..5aaa5d6d7a4 100644
--- a/mozilla/editor/ui/dialogs/content/EditConflict.xul
+++ b/mozilla/editor/ui/dialogs/content/EditConflict.xul
@@ -34,6 +34,7 @@
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()"
+   persist="screenX screenY"
    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
diff --git a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js
index 3cb927534b6..57e763830b2 100644
--- a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js
+++ b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.js
@@ -69,7 +69,7 @@ function Startup()
     helpTextParent.appendChild(helpText);
   
   // SET FOCUS TO FIRST CONTROL
-  dialog.TitleInput.focus();
+  SetTextfieldFocus(dialog.TitleInput);
   LoadAvailableCharSets();
   initDone = true;
 }