diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.js b/mozilla/editor/ui/dialogs/content/EdColorProps.js
index ab3ea7d821c..96862528c6a 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.js
@@ -63,8 +63,8 @@ var vlinkStr =       "vlink";
 var alinkStr =       "alink";
 var bgcolorStr =     "bgcolor";
 var backgroundStr =  "background";
-var colorStyle =     "color:";
-var backImageStyle = " background-image:";
+var colorStyle =     "color: ";
+var backImageStyle = " background-image: url(";
 
 // dialog initialization code
 function Startup()
@@ -218,9 +218,8 @@ function SetColor(ColorWellID, color)
       // Must combine background color and image style values
       styleValue = colorStyle+color;
       if (dialog.backgroundImage > 0)
-      {
-        styleValue += ";"+backImageStyle+backImageStyle+";";
-      }
+        styleValue += ";"+backImageStyle+backImageStyle+");";
+
       dialog.ColorPreview.setAttribute(styleStr,styleValue);
       break;
   }
@@ -277,7 +276,7 @@ function onBackgroundImageCheckbox()
   if (dialog.BackgroundImageCheckbox.checked && ValidateImage())
   {
     // Append image style
-    styleValue += backImageStyle+dialog.BackgroundImage+";";
+    styleValue += backImageStyle+dialog.BackgroundImage+");";
   }
 dump(styleValue+"=style value when setting image\n")
   // Set style on preview (removes image if not checked or not valid)
diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
index bfc97ec5ae7..131909248cf 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
@@ -42,92 +42,85 @@
 
   <broadcaster id="args" value=""/>
 
-  <text value="&pageColors.label;"/>
-  <spring class="bigspacer"/>
+  <text class="dialog bold" value="&pageColors.label;"/>
   <box orient="vertical">
     <radiogroup orient="vertical">
       <radio id="DefaultColorsRadio" value="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"/>
       <radio id="CustomColorsRadio" value="&customColorsRadio.label;" oncommand="UseCustomColors()"/>
     </radiogroup>
   </box>
-  <spring class="bigspacer"/>
-
-<!-- DON'T SHOW COLOR SCHEMES UNTIL REDESIGNED -->
-  <box>
-    <spring class="bigspacer"/>
-    <box align="vertical" flex="1">
-      <box>
-        <text value="&normalText.label;"/>
-        <spring flex="1"/>
-        <menu class="colorpicker">
-    	    <box>
-            <spring id="textCW" class="color-well"/>
-            <image class="popup-trigger"/>
-          </box>
-    	    <menupopup id="normalMenuPopup">
-            <colorpicker id="textCP" palettename="standard" oncommand="GetColorAndUpdate('textCP','textCW',this);"/>
-    	    </menupopup>
-        </menu>
-      </box>
-      <box>
-        <text value="&linkText.label;"/>
-        <spring flex="1"/>
-        <menu class="colorpicker">
-    	    <box>
-            <spring id="linkCW" class="color-well"/>
-            <image class="popup-trigger"/>
-          </box>
-    	    <menupopup>
-            <colorpicker id="linkCP" palettename="standard" oncommand="GetColorAndUpdate('linkCP','linkCW',this);"/>
-    	    </menupopup>
-        </menu>
-      </box>
-      <box>
-        <text value="&activeLinkText.label;"/>
-        <spring flex="1"/>
-        <menu class="colorpicker">
-    	    <box>
-            <spring id="activeCW" class="color-well"/>
-            <image class="popup-trigger"/>
-          </box>
-    	    <menupopup>
-            <colorpicker id="activeCP" palettename="standard" oncommand="GetColorAndUpdate('activeCP','activeCW',this);"/>
-    	    </menupopup>
-        </menu>
-      </box>
-      <box>
-        <text value ="&visitedLinkText.label;"/>
-        <spring flex="1"/>
-        <menu class="colorpicker">
-    	    <box>
-            <spring id="visitedCW" class="color-well"/>
-            <image class="popup-trigger"/>
-          </box>
-    	    <menupopup>
-            <colorpicker id="visitedCP" palettename="standard" oncommand="GetColorAndUpdate('visitedCP','visitedCW',this);"/>
-    	    </menupopup>
-        </menu>
-      </box>
-      <box>
-        <text value="&background.label;"/>
-        <spring flex="1"/>
-        <menu class="colorpicker">
-    	    <box>
-            <spring id="backgroundCW" class="color-well"/>
-            <image class="popup-trigger"/>
-          </box>
-    	    <menupopup>
-            <colorpicker id="backgroundCP" palettename="standard" oncommand="GetColorAndUpdate('backgroundCP','backgroundCW',this);"/>
-    	    </menupopup>
-        </menu>
-      </box>
-    </box>
-    <spring class="bigspacer"/>
+  <spring class="spacer"/>
+  <box class="big-left-margin">
+    <grid>
+      <columns><column/><column/></columns>
+      <rows>
+        <row>
+          <text class="dialog" value="&normalText.label;"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="textCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup id="normalMenuPopup">
+              <colorpicker id="textCP" palettename="standard" oncommand="GetColorAndUpdate('textCP','textCW',this);"/>
+    	      </menupopup>
+          </menu>
+        </row>
+        <row>
+        <text class="dialog" value="&linkText.label;"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="linkCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="linkCP" palettename="standard" oncommand="GetColorAndUpdate('linkCP','linkCW',this);"/>
+    	      </menupopup>
+          </menu>
+        </row>
+        <row>
+          <text class="dialog" value="&activeLinkText.label;"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="activeCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="activeCP" palettename="standard" oncommand="GetColorAndUpdate('activeCP','activeCW',this);"/>
+    	      </menupopup>
+          </menu>
+        </row>
+        <row>
+          <text class="dialog" value ="&visitedLinkText.label;"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="visitedCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="visitedCP" palettename="standard" oncommand="GetColorAndUpdate('visitedCP','visitedCW',this);"/>
+    	      </menupopup>
+          </menu>
+        </row>
+        <row>
+          <text class="dialog" value="&background.label;"/>
+          <menu class="colorpicker">
+    	      <box>
+              <spring id="backgroundCW" class="color-well"/>
+              <image class="popup-trigger"/>
+            </box>
+    	      <menupopup>
+              <colorpicker id="backgroundCP" palettename="standard" oncommand="GetColorAndUpdate('backgroundCP','backgroundCW',this);"/>
+    	      </menupopup>
+          </menu>
+        </row>
+      </rows>
+    </grid>
     <box orient="vertical" id="ColorPreview">
-      <text id="NormalText" value="&normalText.label;"/>
-      <text id="LinkText" value="&linkText.label;"/>
-      <text id="ActiveLinkText" value="&activeLinkText.label;"/>
-      <text id="VisitedLinkText" value="&visitedLinkText.label;"/>
+      <text class="dialog" id="NormalText" value="&normalText.label;"/>
+      <text class="dialog" id="LinkText" value="&linkText.label;"/>
+      <text class="dialog" id="ActiveLinkText" value="&activeLinkText.label;"/>
+      <text class="dialog" id="VisitedLinkText" value="&visitedLinkText.label;"/>
     </box>
   </box>
   <separator class="groove"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
index afc90a7abf2..5c5222dd327 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
@@ -95,7 +95,7 @@ function ReplaceStringInList(list, index, string)
 }
 
 // THESE WILL BE REMOVE ONCE ALL DIALOGS ARE CONVERTED TO NEW WIDGETS
-function AppendStringToListByID(list, stringID)
+function AppendStringToListById(list, stringID)
 {
   AppendStringToList(list, editorShell.GetString(stringID));
 }
@@ -215,7 +215,7 @@ function PrepareStringForURL(string)
 // this function takes an elementID and a flag
 // if the element can be found by ID, then it is either enabled (by removing "disabled" attr)
 // or disabled (setAttribute) as specified in the "doEnable" parameter
-function SetElementEnabledByID( elementID, doEnable )
+function SetElementEnabledById( elementID, doEnable )
 {
   element = document.getElementById(elementID);
   if ( element )
@@ -231,7 +231,7 @@ function SetElementEnabledByID( elementID, doEnable )
   }
   else
   {
-    dump("Element "+elementID+" not found in SetElementEnabledByID\n");
+    dump("Element "+elementID+" not found in SetElementEnabledById\n");
   }
 }
 
@@ -241,7 +241,7 @@ function SetElementEnabledByID( elementID, doEnable )
 // The class is set to either "enabled" or "disabled" depending on the flag passed in.
 // This function relies on css having a special appearance for these two classes.
 
-function SetClassEnabledByID( elementID, doEnable )
+function SetClassEnabledById( elementID, doEnable )
 {
   element = document.getElementById(elementID);
   if ( element )
@@ -310,7 +310,7 @@ function InitPixelOrPercentMenulist(elementForAtt, elementInDoc, attribute, menu
   return size;
 }
 
-function AppendStringToMenulistByID(menulist, stringID)
+function AppendStringToMenulistById(menulist, stringID)
 {
   return AppendStringToMenulist(menulist, editorShell.GetString(stringID));
 }
@@ -366,7 +366,7 @@ dump(menulist+"=menulist in ClearMenulist\n");
           <treecell value="the text the user sees"/>
 */
 
-function AppendStringToTreelistByID(tree, stringID)
+function AppendStringToTreelistById(tree, stringID)
 {
   return AppendStringToTreelist(tree, editorShell.GetString(stringID));
 }
@@ -393,10 +393,13 @@ dump("Failed to create <treechildren>\n");
     if (treeitem && treerow && treecell)
     {
       treerow.appendChild(treecell);
-      treeeitem.appendChild(treerow);
+      treeitem.appendChild(treerow);
       treechildren.appendChild(treeitem)
       treecell.setAttribute("value", string);
-      return menuItem;
+      var len = Number(tree.getAttribute("length"));
+      if (!len) len = -1;
+      tree.setAttribute("length",len+1);
+      return treeitem;
     }
   }
   return null;
@@ -405,8 +408,13 @@ dump("Failed to create <treechildren>\n");
 function ClearTreelist(tree)
 {
   if (tree)
+  {
     while (tree.firstChild)
       tree.removeChild(tree.firstChild);
+    
+    // Count list items
+    tree.setAttribute("length", 0);
+  }
 }
 
 function GetSelectedTreelistValue(tree)
@@ -620,6 +628,7 @@ function InitMoreFewer()
   //   attribute on the dialog.MoreFewerButton button
   //   onMoreFewer will toggle it and redraw the dialog
   SeeMore = (dialog.MoreFewerButton.getAttribute("more") != "1");
+dump(SeeMore+"=SeeMore - InitMoreFewer\n");
   onMoreFewer();
 }
 
@@ -628,6 +637,8 @@ function onMoreFewer()
   if (SeeMore)
   {
     dialog.MoreSection.setAttribute("style","display: none");
+    //TODO: Bugs in box layout prevent us from using this:
+    //dialog.MoreSection.setAttribute("style","visibility: collapse");
     window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","0");
     dialog.MoreFewerButton.setAttribute("value",GetString("MoreProperties"));
@@ -636,6 +647,7 @@ function onMoreFewer()
   else
   {
     dialog.MoreSection.setAttribute("style","display: inherit");
+    //dialog.MoreSection.setAttribute("style","visibility: inherit");
     window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","1");
     dialog.MoreFewerButton.setAttribute("value",GetString("FewerProperties"));
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index b9b2d71ce40..9a4e4555833 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -43,18 +43,18 @@
   <script language="JavaScript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <keyset id="keyset"/>
-  <titledbox><title><text align="left" value="&dimensionsBox.label;"/></title>
+  <titledbox><title><text value="&dimensionsBox.label;"/></title>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
         <row vertical-align="baseline" autostretch="never">
-          <text value="&heightEditField.label;"/>
-          <textfield id="height" onkeyup="forceInteger('height')"/>
-          <text value="&pixelsPopup.value;"/>
+          <text class="dialog" value="&heightEditField.label;"/>
+          <textfield class="narrow" id="height" onkeyup="forceInteger('height')"/>
+          <text class="dialog" value="&pixelsPopup.value;"/>
         </row>
         <row vertical-align="baseline" autostretch="never">
-          <text value="&widthEditField.label;"/>
-          <textfield id="width" flex="1" onkeyup="forceInteger('width')"/>
+          <text class="dialog" value="&widthEditField.label;"/>
+          <textfield class="narrow" id="width" flex="1" onkeyup="forceInteger('width')"/>
           <menulist id="pixelOrPercentMenulist"/>
           <!-- menupopup and menuitems added by JS -->
         </row>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index 466b9db2425..3edfe410dd2 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -268,6 +268,8 @@ function onMoreFewerImage()
     SetGlobalElementToCurrentDialogSettings();
     
     dialog.MoreSection.setAttribute("style","display: none");
+    //TODO: Bugs in box layout prevent us from using this:
+    //dialog.MoreSection.setAttribute("style","visibility: collapse");
     // Show the "Advanced Edit" button on same line as "More Properties"
     dialog.AdvancedEditButton2.setAttribute("style","display: inherit");
     window.sizeToContent();
@@ -278,6 +280,7 @@ function onMoreFewerImage()
   else
   {
     dialog.MoreSection.setAttribute("style","display: inherit");
+    //dialog.MoreSection.setAttribute("style","visibility: inherit");
     // Hide the "Advanced Edit" next to "More..." Use button at bottom right of dialog
     dialog.AdvancedEditButton2.setAttribute("style","display: none");
     window.sizeToContent();
@@ -309,18 +312,18 @@ function doDimensionEnabling( doEnable )
   // Enabled only if "Custom" is checked
   var enable = (doEnable && dialog.customsizeRadio.checked);
 
-  SetElementEnabledByID( "widthInput", enable );
-  SetElementEnabledByID( "widthLabel", enable);
-  SetElementEnabledByID( "widthUnitsMenulist", enable );
+  SetElementEnabledById( "widthInput", enable );
+  SetElementEnabledById( "widthLabel", enable);
+  SetElementEnabledById( "widthUnitsMenulist", enable );
 
-  SetElementEnabledByID( "heightInput", enable );
-  SetElementEnabledByID( "heightLabel", enable );
-  SetElementEnabledByID( "heightUnitsMenulist", enable );
+  SetElementEnabledById( "heightInput", enable );
+  SetElementEnabledById( "heightLabel", enable );
+  SetElementEnabledById( "heightUnitsMenulist", enable );
 
   var constrainEnable = enable 
          && ( dialog.widthUnitsMenulist.selectedIndex == 0 )
          && ( dialog.heightUnitsMenulist.selectedIndex == 0 );
-  SetElementEnabledByID( "constrainCheckbox", constrainEnable );
+  SetElementEnabledById( "constrainCheckbox", constrainEnable );
 }
 
 function doOverallEnabling()
@@ -331,37 +334,37 @@ function doOverallEnabling()
   
   wasEnableAll = canEnableAll;
 
-  SetElementEnabledByID("ok", canEnableAll );
-  SetElementEnabledByID( "altTextLabel", canEnableAll );
+  SetElementEnabledById("ok", canEnableAll );
+  SetElementEnabledById( "altTextLabel", canEnableAll );
 
   // Do widgets for sizing
-  SetElementEnabledByID( "dimensionsLabel", canEnableAll );
+  SetElementEnabledById( "dimensionsLabel", canEnableAll );
   doDimensionEnabling( canEnableAll );
   
-  SetElementEnabledByID("alignLabel", canEnableAll );
-  SetElementEnabledByID("alignTypeSelect", canEnableAll );
+  SetElementEnabledById("alignLabel", canEnableAll );
+  SetElementEnabledById("alignTypeSelect", canEnableAll );
 
   // spacing Box
-  SetElementEnabledByID( "spacingLabel", canEnableAll );
-  SetElementEnabledByID( "imageleftrightInput", canEnableAll );
-  SetElementEnabledByID( "leftrightLabel", canEnableAll );
-  SetElementEnabledByID( "leftrighttypeLabel", canEnableAll );
+  SetElementEnabledById( "spacingLabel", canEnableAll );
+  SetElementEnabledById( "imageleftrightInput", canEnableAll );
+  SetElementEnabledById( "leftrightLabel", canEnableAll );
+  SetElementEnabledById( "leftrighttypeLabel", canEnableAll );
 
-  SetElementEnabledByID( "imagetopbottomInput", canEnableAll );
-  SetElementEnabledByID( "topbottomLabel", canEnableAll );
-  SetElementEnabledByID( "topbottomtypeLabel", canEnableAll );
+  SetElementEnabledById( "imagetopbottomInput", canEnableAll );
+  SetElementEnabledById( "topbottomLabel", canEnableAll );
+  SetElementEnabledById( "topbottomtypeLabel", canEnableAll );
 
-  SetElementEnabledByID( "border", canEnableAll );
-  SetElementEnabledByID( "borderLabel", canEnableAll );
-  SetElementEnabledByID( "bordertypeLabel", canEnableAll );
+  SetElementEnabledById( "border", canEnableAll );
+  SetElementEnabledById( "borderLabel", canEnableAll );
+  SetElementEnabledById( "bordertypeLabel", canEnableAll );
 
   // This shouldn't find button, but it does!
-  SetElementEnabledByID( "AdvancedEditButton2", canEnableAll );
-  SetElementEnabledByID( "AdvancedEditButton3", canEnableAll );
+  SetElementEnabledById( "AdvancedEditButton2", canEnableAll );
+  SetElementEnabledById( "AdvancedEditButton3", canEnableAll );
 
-  SetElementEnabledByID( "editImageMap", canEnableAll );
+  SetElementEnabledById( "editImageMap", canEnableAll );
   // TODO: ADD APPROPRIATE DISABLING BASED ON EXISTENCE OF IMAGE MAP
-  SetElementEnabledByID( "removeImageMap", canEnableAll && canRemoveImageMap);
+  SetElementEnabledById( "removeImageMap", canEnableAll && canRemoveImageMap);
 }
 
 // constrainProportions contribution by pete@postpagan.com
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 0c12452b230..e90f531874d 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -49,259 +49,207 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
 
-<titledbox orient="vertical">
-  <title
-    class = "dialog"
-    align = "left">
-    <text value="&locationBox.label;"/>
-  </title>
-
-  <box>
+  <titledbox orient="vertical">
+    <title><text value="&locationBox.label;"/></title>
     <!--/////// Src URL and ALT Text //////-->
-    <box orient="vertical">
-      <box>
-        <text class = "label" 
-          for   = "srcInput"
-          value = "&locationEditField.label;"
-          align = "right" />
-      </box>
-      <box>
-        <text class = "label"
-          id    = "altTextLabel" 
-          for   = "altTextInput"
-          value = "&altTextEditField.label;" />
-      </box>
-    </box>
-    
-    <spring flex="100%"/>
-    
-    <box orient="vertical">
-      <box>
-        <textfield 
-          id         = "srcInput" 
-          class      = "MinWidth20em"
-          onkeyup    = "doOverallEnabling()"
-          onmouseup  = "doOverallEnabling()"
-          onchange   = "doOverallEnabling()" />
-        <spring flex="100%"/>
-        <!-- from EdDialogOverlay.xul -->
-        <button id="ChooseFile"/>
-      </box>
-
-      <spring flex="100%"/>
-
-      <box>  
-        <textfield
-          id       ="altTextInput"
-          class      = "MinWidth20em"
-          onchange = "doOverallEnabling()"/>
-      </box>  
-    </box> 
-  </box>
-</titledbox>
-
-<box>
-  <button 
-    class   = "dialog" 
-    id      = "MoreFewerButton" 
-    align   = "left" 
-    oncommand = "onMoreFewerImage()" 
-    persist = "more"/>
-  <spring flex="100%"/>
-  <!-- From EdDialogOverlay.xul -->
-  <button id="AdvancedEditButton2"/>
-</box>
-<!-- Area that shows and hides via MoreFewerButton --> 
-<box id="MoreSection" orient="vertical" flex="100%">
-  <box flex="100%">
-    <box orient="vertical">
-    <!-- //////// Image Dimensions //////// -->
-    <titledbox orient="vertical" flex="100%">
-      <title
-        class="dialog"
-        id="dimensionsLabel">
-        <text value="&dimensionsBox.label;"/>
-      </title>
-      
-      <!-- THESE NEED TO BE onchange RATHER THAN oncommand -->
-      <radiogroup orient="vertical">
-        <radio
-          id      = "originalsizeRadio" 
-          value   = "&originalSizeRadio.label;"
-         oncommand = "doDimensionEnabling( false );"/>
-        <radio
-          id      = "customsizeRadio" 
-          value   = "&customSizeRadio.label;"
-          oncommand = "doDimensionEnabling( true );" />
-      </radiogroup>
-
-	  <!-- preferred width and height added to increase performance in boxes (otherwise buttons will jump!!) -evaughan -->
-      <spring flex="100%"/>
-      
-        <!--//////  IMAGE WIDTH  //////-->
-      <box>
-        <text class = "label" 
-          id    = "widthLabel"
-          for   = "widthInput"
-          value = "&widthEditField.label;" />
-        <spring flex="100%"/>
-        <textfield
-          id       = "widthInput" 
-          class    = "MinWidth20em"
-          onfocus  = "oldSourceInt = this.value;"
-          onkeyup  = "constrainProportions(this.id, 'heightInput')" 
-          onchange = "doOverallEnabling()" />
-        <spring flex="100%"/>
-        <menulist id = "widthUnitsMenulist" oncommand = "doOverallEnabling()"/>
-        <!-- contents are appended by JS -->
-      </box>
-
-        <!--////// IMAGE HEIGHT //////-->
-      <box>
-        <text class = "label" 
-          id    = "heightLabel"
-          for   = "heightInput"
-          value = "&heightEditField.label;" />
-        <spring flex="100%"/>
-        <textfield 
-          id       = "heightInput" 
-          onfocus  = "oldSourceInt = this.value;"
-          onkeyup  = "constrainProportions(this.id, 'widthInput')"
-          onchange = "doOverallEnabling()" />
-        <spring flex="100%"/>
-        <menulist id = "heightUnitsMenulist" oncommand = "doOverallEnabling()"/>
-          <!-- contents are appended by JS -->
-      </box>
-
-      <!--////// CONSTRAIN DIMENSIONS //////-->
-	  <box>
-      <checkbox id="constrainCheckbox" value="&constrainCheckbox.label;"/>
-	  </box>
-    </titledbox>
-
-    <titledbox flex="100%">
-      <title
-        class="dialog"
-        id="imagemapLabel">
-        <text value="&imagemapBox.label;"/>
-      </title>
-      <button
-        class   = "dialog"
-        id      = "editImageMap"
-        oncommand = "editImageMap()"
-        value   = "&editImageMapButton.label;"/>
-      <button
-        class   = "dialog"
-        id      = "removeImageMap"
-        oncommand = "removeImageMap()"
-        value   = "&removeImageMapButton.label;"/>
-    </titledbox>
-
-    </box>
-
-    <box orient="vertical" flex="100%">
-      <!-- Bottom Right Region -->
-      <!--//////// Alignment ////////-->
-      <titledbox flex="1" orient="vertical">
-        <title
-          class = "dialog" 
-          id    = "alignLabel"
-          for   = "alignTypeSelect">
-          <text value="&alignment.label;"/>
-        </title>
-
-      <menulist id = "alignTypeSelect" onchange = "doOverallEnabling()" >
-        <menupopup>
-          <menuitem value = "&topPopup.value;" 
-             src          = "resource:/chrome/editor/skin/default/images/img-align-top.gif"
-          />
-          <menuitem value = "&centerPopup.value;"
-             src          = "resource:/chrome/editor/skin/default/images/img-align-middle.gif" 
-          />
-          <menuitem value = "&bottomPopup.value;"
-             src          = "resource:/chrome/editor/skin/default/images/img-align-bottom.gif" 
-          />
-          <menuitem value = "&wrapLeftPopup.value;"
-             src          = "resource:/chrome/editor/skin/default/images/img-align-right.gif" 
-          />
-          <menuitem value = "&wrapRightPopup.value;"
-             src          = "resource:/chrome/editor/skin/default/images/img-align-left.gif" 
-          />
-        </menupopup>
-      </menulist>
-      </titledbox>
-
-      <!--//////// Borders and Spacing ////////-->
-      <titledbox flex="100%">
-        <title
-          class = "dialog"
-          id    = "spacingLabel"> 
-          <text value="&spacingBox.label;"/>
-        </title>
-
-        <box orient="vertical">
-          <text class = "align-right" 
-            id    = "leftrightLabel"
-            value = "&leftRightEditField.label;"/>
-          <spring flex="100%"/>
-          <text class = "align-right" 
-            id    = "topbottomLabel"
-            value = "&topBottomEditField.label;"/>
-          <spring flex="100%"/>
-          <text class = "align-right" 
-            id    = "borderLabel"
-            value = "&borderEditField.label;"/>
-        </box>
-        
-        <box orient="vertical">
+    <grid>
+      <columns><column/><column/><column/></columns>
+      <rows>
+        <row>
+          <text class = "dialog" 
+            for   = "srcInput"
+            value = "&locationEditField.label;"
+            align = "right" />
           <textfield 
-            id        = "imageleftrightInput" 
-            onkeyup   = "forceInteger(this.id)" 
-            onchange  = "doOverallEnabling()"/>
-          <spring flex="100%"/>
-          <textfield 
-            id        = "imagetopbottomInput" 
-            onkeyup   = "forceInteger(this.id)"
-            onchange  = "doOverallEnabling()"/>
-          <spring flex="100%"/>
+            id         = "srcInput" 
+            class      = "MinWidth20em"
+            onkeyup    = "doOverallEnabling()"
+            onmouseup  = "doOverallEnabling()"
+            onchange   = "doOverallEnabling()" />
+          <!-- from EdDialogOverlay.xul -->
+          <button id="ChooseFile"/>
+        </row>
+        <row>
+          <text class = "dialog"
+            id    = "altTextLabel" 
+            for   = "altTextInput"
+            value = "&altTextEditField.label;" />
           <textfield
-            id        = "border" 
-            onkeyup   = "forceInteger(this.id)"
-            onchange  = "doOverallEnabling()" />
-        </box>
-        
-        <box orient="vertical">
-          <text class = "label" 
-            id    = "leftrighttypeLabel"
-            for   = "imageleftrightInput"
-            value = "&pixelsPopup.value;" />
-          <spring flex="100%"/>
-          <text class = "label" 
-            id    = "topbottomtypeLabel"
-            for   = "imagetopbottomInput"
-            value = "&pixelsPopup.value;" />
-          <spring flex="100%"/>
-          <text class = "label" 
-            id    = "bordertypeLabel"
-            for   = "border"
-            value = "&pixelsPopup.value;" />
-        </box>
-
-      </titledbox>
-    </box> <!-- Bottom Right region -->
-  </box> <!-- The horizontal box -->
-  
-  <!-- buttons along bottom -->
-  <box>
-    <spring flex="100%"/>
-    <!-- From EdDialogOverlay -->
-    <button id="AdvancedEditButton3"/>
+            id       ="altTextInput"
+            class      = "MinWidth20em"
+            onchange = "doOverallEnabling()"/>
+          <spring/> <!-- placeholder for 3rd column -->
+        </row>
+      </rows>
+    </grid>
+  </titledbox>
+  <box> 
+    <button 
+      class   = "dialog" 
+      id      = "MoreFewerButton" 
+      align   = "left" 
+      oncommand = "onMoreFewerImage()" 
+      persist = "more"/>
+    <spring flex="1"/>
+    <!-- From EdDialogOverlay.xul -->
+    <button id="AdvancedEditButton2"/>
   </box>
-</box> <!-- END OF MORE/FEWER SECTION -->
 
-<separator/>
+  <!-- Area that shows and hides via MoreFewerButton --> 
+  <box id="MoreSection" orient="vertical" flex="1">
+    <box flex="1">
+      <box orient="vertical">
+        <!-- //////// Image Dimensions //////// -->
+        <titledbox orient="vertical" flex="1">
+          <title><text id="dimensionsLabel" value="&dimensionsBox.label;"/></title>
+          <radiogroup orient="vertical">
+            <radio
+              id      = "originalsizeRadio" 
+              value   = "&originalSizeRadio.label;"
+              oncommand = "doDimensionEnabling( false );"/>
+            <radio
+              id      = "customsizeRadio" 
+              value   = "&customSizeRadio.label;"
+              oncommand = "doDimensionEnabling( true );" />
+          </radiogroup>
+          <spring class="spacer"/>
+          <grid class="big-left-margin">
+            <columns><column/><column/><column/></columns>
+            <rows>
+              <!--//////  IMAGE WIDTH  //////-->
+              <row vertical-align="baseline" autostretch="never">
+                <text class = "dialog" 
+                  id    = "widthLabel"
+                  for   = "widthInput"
+                  value = "&widthEditField.label;" />
+                <textfield
+                  id       = "widthInput" 
+                  class    = "narrow"
+                  onfocus  = "oldSourceInt = this.value;"
+                  onkeyup  = "constrainProportions(this.id, 'heightInput')" 
+                  onchange = "doOverallEnabling()" />
+                <menulist id = "widthUnitsMenulist" oncommand = "doOverallEnabling()"/>
+                <!-- contents are appended by JS -->
+              </row>
+              <!--////// IMAGE HEIGHT //////-->
+              <row vertical-align="baseline" autostretch="never">
+                <text class = "dialog" 
+                  id    = "heightLabel"
+                  for   = "heightInput"
+                  value = "&heightEditField.label;" />
+                <textfield 
+                  id       = "heightInput" 
+                  class    = "narrow"
+                  onfocus  = "oldSourceInt = this.value;"
+                  onkeyup  = "constrainProportions(this.id, 'widthInput')"
+                  onchange = "doOverallEnabling()" />
+                <menulist id = "heightUnitsMenulist" oncommand = "doOverallEnabling()"/>
+                <!-- contents are appended by JS -->
+              </row>
+            </rows>          
+          </grid>
+          <!--////// CONSTRAIN DIMENSIONS //////-->
+          <checkbox id="constrainCheckbox" value="&constrainCheckbox.label;"/>
+        </titledbox>
+        <!--////// IMAGE MAP BUTTONS //////-->
+        <titledbox flex="1">
+          <title><text id="imagemapLabel" value="&imagemapBox.label;"/></title>
+          <box>
+            <button
+              class   = "dialog"
+              id      = "editImageMap"
+              oncommand = "editImageMap()"
+              value   = "&editImageMapButton.label;"/>
+            <button
+              class   = "dialog"
+              id      = "removeImageMap"
+              oncommand = "removeImageMap()"
+              value   = "&removeImageMapButton.label;"/>
+          </box>
+        </titledbox>
+      </box> <!-- vert. box on bottom left side -->
 
-<!-- from global dialogOverlay -->
-<box id="okCancelButtons"/> 
+      <!-- Bottom Right Region -->
+      <box orient="vertical" flex="1">
+        <!--//////// Alignment ////////-->
+        <titledbox flex="1" orient="vertical">
+          <title><text class="dialog" id="alignLabel" value="&alignment.label;"/></title>
+          <menulist id = "alignTypeSelect" onchange ="doOverallEnabling()">
+            <menupopup vertical-align="middle">
+              <menuitem class="middle"><image id="img-align-top"/>   <text class="dialog" value = "&topPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-middle"/><text class="dialog" value = "&centerPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-bottom"/><text class="dialog" value = "&bottomPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-left"/>  <text class="dialog" value = "&wrapLeftPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-right"/> <text class="dialog" value = "&wrapRightPopup.value;"/></menuitem>
+            </menupopup>
+          </menulist>
+        </titledbox>
+
+        <!--//////// Borders and Spacing ////////-->
+        <titledbox flex="1">
+          <title><text id="spacingLabel" value="&spacingBox.label;"/></title>
+          <grid>
+            <columns><column/><column/><column/></columns>
+            <rows>
+              <row vertical-align="baseline" autostretch="never">
+                <text 
+                  class = "dialog align-right" 
+                  id    = "leftrightLabel"
+                  value = "&leftRightEditField.label;"/>
+                <textfield 
+                  class     = "narrow"
+                  id        = "imageleftrightInput" 
+                  onkeyup   = "forceInteger(this.id)" 
+                  onchange  = "doOverallEnabling()"/>
+                <text 
+                  class = "dialog" 
+                  id    = "leftrighttypeLabel"
+                  value = "&pixelsPopup.value;" />
+              </row>
+              <row vertical-align="baseline" autostretch="never">
+                <text 
+                  class = "dialog align-right" 
+                  id    = "topbottomLabel"
+                  value = "&topBottomEditField.label;"/>
+                <textfield 
+                  class     = "narrow"
+                  id        = "imagetopbottomInput" 
+                  onkeyup   = "forceInteger(this.id)"
+                  onchange  = "doOverallEnabling()"/>
+                <text
+                  class = "dialog" 
+                  id    = "topbottomtypeLabel"
+                  value = "&pixelsPopup.value;" />
+              </row>
+              <row vertical-align="baseline" autostretch="never">
+                <text class = "dialog align-right" 
+                  id    = "borderLabel"
+                  value = "&borderEditField.label;"/>
+                <textfield
+                  class     = "narrow"
+                  id        = "border" 
+                  onkeyup   = "forceInteger(this.id)"
+                  onchange  = "doOverallEnabling()" />
+                <text 
+                  class = "dialog" 
+                  id    = "bordertypeLabel"
+                  value = "&pixelsPopup.value;" />
+              </row>
+            </rows>
+          </grid>
+        </titledbox>
+      </box> <!-- Bottom Right region -->
+    </box> <!-- The horizontal box -->
+  
+    <!-- buttons along bottom -->
+    <box>
+      <spring flex="1"/>
+      <!-- From EdDialogOverlay -->
+      <button id="AdvancedEditButton3"/>
+    </box>
+  </box> <!-- END OF MORE/FEWER SECTION -->
+  <separator class="groove"/>
+  <!-- from global dialogOverlay -->
+  <box id="okCancelButtons"/> 
 
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.js b/mozilla/editor/ui/dialogs/content/EdInsSrc.js
index 64668730d62..497a20cabcb 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.js
@@ -21,8 +21,7 @@
  */
 
 /* Insert Source HTML dialog */
-
-var dialog;
+var srcInput;
 
 // dialog initialization code
 function Startup()
@@ -33,32 +32,21 @@ function Startup()
   doSetOKCancel(onOK, null);
   
   // Create dialog object to store controls for easy access
-  dialog = new Object;
-  dialog.srcInput = document.getElementById("srcInput");
-
-  // Kinda clunky: Message was wrapped in a <p>,
-  // so actual message is a child text node
-  dialog.srcMessage = (document.getElementById("srcMessage")).firstChild;
-
-  if (null == dialog.srcInput ||
-      null == dialog.srcMessage )
-  {
-    dump("Not all dialog controls were found!!!\n");
-  }
+  srcInput = document.getElementById("srcInput");
 
   selection = editorShell.GetContentsAs("text/html", 35);
   selection = (selection.replace(/<body[^>]*>/,"")).replace(/<\/body>/,"");
   if (selection != "")
-    dialog.srcInput.value = selection;
+    srcInput.value = selection;
 
   // Set initial focus
-  dialog.srcInput.focus();
+  srcInput.focus();
 }
 
 function onOK()
 {
-  if (dialog.srcInput.value != "")
-    editorShell.InsertSource(dialog.srcInput.value);
+  if (srcInput.value != "")
+    editorShell.InsertSource(srcInput.value);
   else {
     dump("Null value -- not inserting\n");
     return false;
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
index 529ab504049..a1e2d6dced7 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
@@ -44,10 +44,16 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
 
-  <text id="srcMessage" value="&sourceEditField.label;"/>
-  <textarea rows="16" cols="80" id="srcInput" flex="1"/>
+  <text class="dialog" id="srcMessage" value="&sourceEditField.label;"/>
+  <textfield id="srcInput" multiline="true" rows="6" flex="1"/>
   <!-- Will this accept the embedded HTML tags? -->
-  <text value="&example.label;"/>
+  <box>
+    <spring class="bigspacer"/>
+    <text value="&example.label;"/>
+    <text class="bold" value="&exampleOpenTag.label;"/>
+    <text class="bold italic" value="&exampleText.label;"/>
+    <text class="bold" value="&exampleCloseTag.label;"/>
+  </box>
   <spring class="spacer"/>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 1c325bc4293..ddb613e1306 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -48,33 +48,33 @@
     <columns><column/><column/><column/></columns>
     <rows>
       <row vertical-align="baseline"  autostretch="never">
-        <text class="align-right" flex="1" value="&numRowsEditField.label;"/>
-        <textfield id="rows" onkeyup="forceInteger(this.id)" />
+        <text class="dialog align-right" value="&numRowsEditField.label;"/>
+        <textfield class="narrow" id="rows" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
       <spring class="spacer"/>
       <row vertical-align="baseline"  autostretch="never">
-        <text class="align-right" flex="1" value="&numColumnsEditField.label;"/>
-        <textfield id="columns" onkeyup="forceInteger(this.id)" />
+        <text class="dialog align-right" value="&numColumnsEditField.label;"/>
+        <textfield class="narrow" id="columns" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
       <spring class="spacer"/>
       <row vertical-align="baseline"  autostretch="never">
-        <text class="align-right" flex="1" value="&widthEditField.label;"/>
-        <textfield id="width" onkeyup="forceInteger(this.id)" />
+        <text class="dialog align-right" value="&widthEditField.label;"/>
+        <textfield class="narrow" id="width" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
       <spring class="spacer"/>
       <row vertical-align="baseline"  autostretch="never">
-        <text class="align-right" flex="1" value="&widthEditField.label;"/>
-        <textfield id="width" onkeyup="forceInteger(this.id)" />
+        <text class="dialog align-right" value="&widthEditField.label;"/>
+        <textfield class="narrow" id="width" onkeyup="forceInteger(this.id)" />
         <menulist id="pixelOrPercentMenulist"><menupopup/></menulist>
           <!-- child elements are appended by JS -->
       </row>
       <spring class="spacer"/>
       <row vertical-align="baseline" autostretch="never">
-        <text class="align-right" flex="1" value="&borderEditField.label;"/>
-        <textfield id="borderInput" onkeyup="forceInteger(this.id)" />
+        <text class="dialog align-right" value="&borderEditField.label;"/>
+        <textfield class="narrow" id="borderInput" onkeyup="forceInteger(this.id)" />
         <text value="&pixelsPopup.value;"/>  
       </row>
     </rows>
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 3886b5b3e01..50b9ca2f136 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -62,11 +62,10 @@ function Startup()
   dialog.AdvancedEditSection = document.getElementById("AdvancedEdit");
 
   var selection = editorShell.editorSelection;
-  if (selection) {
+  if (selection)
     dump("There is a selection: collapsed = "+selection.isCollapsed+"\n");
-  } else {
+  else
     dump("Failed to get selection\n");
-  }
 
   // See if we have a single selected image
   imageElement = editorShell.GetSelectedElement("img");
@@ -139,11 +138,10 @@ function Startup()
   
   if (insertLinkAtCaret)
   {
-    // Note: Use linkTextMessage for normal weight, 
-    //       because linkTextCaption is bold (set in EdDialog.css)
-    dialog.linkTextMessage.setAttribute("value",GetString("EnterLinkText"));
-    // Hide the other string 
-    dialog.linkTextCaption.setAttribute("hidden","true");
+    // Titledbox caption:
+    dialog.linkTextCaption.setAttribute("value",GetString("LinkText"));
+    // Message above input field:
+    dialog.linkTextMessage.setAttribute("value", GetString("EnterLinkText"));
   }
   else
   {
@@ -244,20 +242,25 @@ function FillListboxes()
 {
   var NamedAnchorNodeList = editorShell.editorDocument.anchors;
   var NamedAnchorCount = NamedAnchorNodeList.length;
-  if (NamedAnchorCount > 0) {
-    for (var i = 0; i < NamedAnchorCount; i++) {
-      AppendStringToList(dialog.NamedAnchorList,NamedAnchorNodeList.item(i).name);
+  if (NamedAnchorCount > 0)
+  {
+    for (var i = 0; i < NamedAnchorCount; i++)
+    {
+      var item = AppendStringToTreelist(dialog.NamedAnchorList, NamedAnchorNodeList.item(i).name);
+
     }
     haveNamedAnchors = true;
   } else {
     // Message to tell user there are none
-    AppendStringToList(dialog.NamedAnchorList,GetString("NoNamedAnchors"));
-    dialog.NamedAnchorList.setAttribute("disabled", "true");
+    var item = AppendStringToTreelistById(dialog.NamedAnchorList, "NoNamedAnchors");
+    if (item) item.setAttribute("disabled", "true");
   }
   var firstHeading = true;
-  for (var j = 1; j <= 6; j++) {
+  for (var j = 1; j <= 6; j++)
+  {
     var headingList = editorShell.editorDocument.getElementsByTagName("h"+String(j));
-    if (headingList.length > 0) {
+    if (headingList.length > 0)
+    {
       var heading = headingList.item(0);
 
       // Skip headings that already have a named anchor as their first child
@@ -266,23 +269,23 @@ function FillListboxes()
       var child = heading.firstChild;
 //      if( child && child.name )
 //        dump(child.name+" = Child.name. Length="+child.name.length+"\n");
-      if (child && child.nodeName == "A" && child.name && (child.name.length>0)) {
+      if (child && child.nodeName == "A" && child.name && (child.name.length>0))
         continue;
-      }
 
       var range = editorShell.editorDocument.createRange();
       range.setStart(heading,0);
       var lastChildIndex = heading.childNodes.length;
       range.setEnd(heading,lastChildIndex);
       var text = range.toString();
-      if (text) {
+      if (text)
+      {
         // Use just first 40 characters, don't add "...",
         //  and replace whitespace with "_" and strip non-word characters
         text = PrepareStringForURL(TruncateStringAtWordEnd(text, 40, false));
         // Append "_" to any name already in the list
         if (GetExistingHeadingIndex(text) > -1)
           text += "_";
-        AppendStringToList(dialog.HeadingsList, text);
+        AppendStringToTreelist(dialog.HeadingsList, text);
 
         // Save nodes in an array so we can create anchor node under it later
         if (!HNodeArray)
@@ -292,18 +295,21 @@ function FillListboxes()
       }
     }
   }
-  if (HNodeArray) {
+  if (HNodeArray)
+  {
     haveHeadings = true;
   } else {
     // Message to tell user there are none
-    AppendStringToList(dialog.HeadingsList,GetString("NoHeadings"));
-    dialog.HeadingsList.setAttribute("disabled", "true");
+    var item = AppendStringToTreelistById(dialog.HeadingsList, "NoHeadings");
+    if (item) item.setAttribute("disabled", "true");
   }
 }
 
 function GetExistingHeadingIndex(text)
 {
-  for (var i=0; i < dialog.HeadingsList.length; i++) {
+  var len = dialog.HeadingsList.getAttribute("length");
+  for (var i=0; i < len; i++)
+  {
     if (dialog.HeadingsList.options[i].value == text)
       return i;
   }
@@ -312,16 +318,15 @@ function GetExistingHeadingIndex(text)
 
 function SelectNamedAnchor()
 {
-  if (haveNamedAnchors) {
-    dialog.hrefInput.value = "#"+dialog.NamedAnchorList.options[dialog.NamedAnchorList.selectedIndex].value;
-  }
+dump("SelectNamedAnchor\n");
+  if (haveNamedAnchors)
+    dialog.hrefInput.value = "#"+dialog.NamedAnchorList.value;
 }
 
 function SelectHeading()
 {
-  if (haveHeadings) {
-    dialog.hrefInput.value = "#"+dialog.HeadingsList.options[dialog.HeadingsList.selectedIndex].value;
-  }
+  if (haveHeadings)
+    dialog.hrefInput.value = "#"+dialog.HeadingsList.value;
 }
 
 // Get and validate data from widgets.
@@ -329,21 +334,26 @@ function SelectHeading()
 function ValidateData()
 {
   href = dialog.hrefInput.value.trimString();
-  if (href.length > 0) {
+  if (href.length > 0)
+  {
     // Set the HREF directly on the editor document's anchor node
     //  or on the newly-created node if insertNew is true
     globalElement.setAttribute("href",href);
-  } else if (insertNew) {
+  }
+  else if (insertNew)
+  {
     // We must have a URL to insert a new link
     //NOTE: We accept an empty HREF on existing link to indicate removing the link
     ShowInputErrorMessage(GetString("EmptyHREFError"));
     return false;
   }
-  if (dialog.linkTextInput) {
+  if (dialog.linkTextInput)
+  {
     // The text we will insert isn't really an attribute,
     //  but it makes sense to validate it
     newLinkText = TrimString(dialog.linkTextInput.value);
-    if (newLinkText.length == 0) {
+    if (newLinkText.length == 0)
+    {
       ShowInputErrorMessage(GetString("GetInputError"));
       dialog.linkTextInput.focus();
       return false;
@@ -357,7 +367,8 @@ function onOK()
 {
   if (ValidateData())
   {
-    if (href.length > 0) {
+    if (href.length > 0)
+    {
       // Copy attributes to element we are changing or inserting
       editorShell.CloneAttributes(anchorElement, globalElement);
 
@@ -365,20 +376,21 @@ function onOK()
       editorShell.BeginBatchChanges();
 
       // Get text to use for a new link
-      if (insertLinkAtCaret) {
+      if (insertLinkAtCaret)
+      {
         // Append the link text as the last child node 
         //   of the anchor node
         textNode = editorShell.editorDocument.createTextNode(newLinkText);
-        if (textNode) {
+        if (textNode)
           anchorElement.appendChild(textNode);
-        }
         try {
           editorShell.InsertElementAtSelection(anchorElement, false);
         } catch (e) {
           dump("Exception occured in InsertElementAtSelection\n");
           return true;
         }
-      } else if (insertNew) {
+      } else if (insertNew)
+      {
         //  Link source was supplied by the selection,
         //  so insert a link node as parent of this
         //  (may be text, image, or other inline content)
@@ -390,7 +402,8 @@ function onOK()
         }
       }
       // Check if the link was to a heading 
-      if (href[0] == "#") {
+      if (href[0] == "#")
+      {
         var name = href.substr(1);
         var index = GetExistingHeadingIndex(name);
         if (index >= 0) {
@@ -409,7 +422,9 @@ dump("Anchor node created and inserted under heading\n");
         }
       }
       editorShell.EndBatchChanges();
-    } else if (!insertNew) {
+    } 
+    else if (!insertNew)
+    {
       // We already had a link, but empty HREF means remove it
       editorShell.RemoveTextProperty("a", "");
     }
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index a61f01a0d74..07665c97ec7 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -45,16 +45,15 @@
   <keyset id="keyset"/>
 
   <box align="vertical" style="min-width: 20em">
-  	<text id="linkTextCaption" value="&LinkTitle.label;" align="left" valign="bottom"/>
-    <text id="linkTextMessage" style="min-width: 200px;" align="left"/> 
-	  <textfield id="linkTextInput"/>
-    <spring class="spacer"/>
+    <titledbox orient="vertical"><title><text id="linkTextCaption" align="left" value="&LinkTitle.label;"/></title>
+      <text class="dialog" id="linkTextMessage"/> 
+	    <textfield id="linkTextInput" flex="1"/>
+    </titledbox>
 
-    <titledbox orient="vertical"><title><text value="&LinkURLBox.label;"/></title>
-      <text align="left" value="&LinkURLEditField.label;"/>
-      <spring class="spacer"/>
+    <titledbox orient="vertical"><title><text class="dialog" value="&LinkURLBox.label;"/></title>
+      <text class="dialog" value="&LinkURLEditField.label;"/>
       <box autostretch="never"  valign="middle">
-        <textfield id="hrefInput"/>
+        <textfield id="hrefInput" flex="1"/>
         <spring class="spacer"/>
         <!-- from EdDialogOverlay.xul -->
         <!-- The style: width setting is need to cover a bug in button width resizing when text changes -->
@@ -68,13 +67,12 @@
       </box>
       <box id="MoreSection" align="vertical">
         <spring class="bigspacer"/>
-        <text align="left" value="&NamedAnchorMsg.label;"/>
-        <html:select id="NamedAnchorList" size="3" onchange="SelectNamedAnchor()"/>
+        <text class="dialog" align="left" value="&NamedAnchorMsg.label;"/>
+        <tree class="list" id="NamedAnchorList" oncommand="SelectNamedAnchor()"/>
         <spring class="spacer"/>
-        <text align="left" value="&HeadingMsg.label;"/>
-        <html:select id="HeadingsList" size="3" onchange="SelectHeading()"/>
-        <!-- Use div so it can wrap -->
-        <html:div>&HeadingMsg2.label;</html:div>
+        <text class="dialog" align="left" value="&HeadingMsg.label;"/>
+        <tree class="list" id="HeadingsList" oncommand="SelectHeading()"/>
+        <text class="dialog" flex="1" value="&HeadingMsg2.label;"/>
       </box>
     </titledbox>
   </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.js b/mozilla/editor/ui/dialogs/content/EdListProps.js
index 40cee62eb3b..feb34d3efc7 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.js
@@ -92,11 +92,11 @@ function InitDialog()
 
 function BuildBulletStyleList()
 {
-  ClearList(BulletStyleList);
+  ClearMenulist(BulletStyleList);
   var label = "";
   var selectedIndex = -1;
 
-  //dump("List Type: "+ListType+" globalElement: "+globalElement+"\n");
+dump("List Type: "+ListType+" globalElement: "+globalElement+"\n");
 
   if (ListType == "ul")
   {
@@ -106,9 +106,9 @@ function BuildBulletStyleList()
     StartingNumberLabel.setAttribute("disabled", "true");
     label = GetString("BulletStyle");
 
-    AppendStringToListByID(BulletStyleList,"SolidCircle");
-    AppendStringToListByID(BulletStyleList,"OpenCircle");
-    AppendStringToListByID(BulletStyleList,"SolidSquare");
+    AppendStringToMenulistById(BulletStyleList,"SolidCircle");
+    AppendStringToMenulistById(BulletStyleList,"OpenCircle");
+    AppendStringToMenulistById(BulletStyleList,"SolidSquare");
 
     BulletStyleList.selectedIndex = BulletStyleIndex;
     ListTypeList.selectedIndex = 1;
@@ -121,11 +121,11 @@ function BuildBulletStyleList()
     StartingNumberLabel.removeAttribute("disabled");
     label = GetString("NumberStyle");
 
-    AppendStringToListByID(BulletStyleList,"Style_1");
-    AppendStringToListByID(BulletStyleList,"Style_I");
-    AppendStringToListByID(BulletStyleList,"Style_i");
-    AppendStringToListByID(BulletStyleList,"Style_A");
-    AppendStringToListByID(BulletStyleList,"Style_a");
+    AppendStringToMenulistById(BulletStyleList,"Style_1");
+    AppendStringToMenulistById(BulletStyleList,"Style_I");
+    AppendStringToMenulistById(BulletStyleList,"Style_i");
+    AppendStringToMenulistById(BulletStyleList,"Style_A");
+    AppendStringToMenulistById(BulletStyleList,"Style_a");
 
     BulletStyleList.selectedIndex = NumberStyleIndex;
     ListTypeList.selectedIndex = 2;
@@ -155,6 +155,7 @@ function BuildBulletStyleList()
 
 function SelectListType()
 {
+dump(ListTypeList+"ListTypeList\n");
   switch (ListTypeList.selectedIndex)
   {
     case 1:
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul
index a4529620851..f06471488e7 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul
@@ -42,26 +42,27 @@
   <keyset id="keyset"/>
   <broadcaster id="args" value=""/>
 
-  <text for="ListType" value="&ListType.label;"/>
-  <html:select class="ComboBox" id="ListType" onchange="SelectListType()">
-    <html:option>&none.value;</html:option>
-    <html:option>&bulletList.value;</html:option>
-    <html:option>&numberList.value;</html:option>
-    <html:option>&definitionList.value;</html:option>
-  </html:select>
+  <text class="dialog" value="&ListType.label;"/>
+  <menulist flex="1" id="ListType" oncommand="SelectListType()">
+    <menupopup>
+      <menuitem value="&none.value;"/>
+      <menuitem value="&bulletList.value;"/>
+      <menuitem value="&numberList.value;"/>
+      <menuitem value="&definitionList.value;"/>
+    </menupopup>
+  </menulist>
   <spring class="spacer"/>
 
   <!-- message text and list items are set in JS 
        text value should be identical to string with id=BulletStyle in editor.properties 
   -->
-  <text id="BulletStyleLabel" value="&bulletStyle.label;"/>
-  <html:select class="ComboBox" id="BulletStyle" style="min-width: 10em" onchange="SelectBulletStyle()"/>
+  <text class="dialog" id="BulletStyleLabel" value="&bulletStyle.label;"/>
+  <menulist flex="1" class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
   <spring class="spacer"/>
-
   <box>
-    <text id="StartingNumberLabel" for="StartingNumber" value="&startingNumber.label;"/>
+    <text class="dialog" id="StartingNumberLabel" value="&startingNumber.label;"/>
     <spring class="spacer"/>
-    <html:input type="text" id="StartingNumber" size="3" onkeyup="forceInteger('StartingNumber')"/>
+    <textfield class="narrow" id="StartingNumber" onkeyup="forceInteger('StartingNumber')"/>
     <spring/>
   </box>
   <!-- from EdDialogOverlay -->
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 0e64ad071cf..52cb29b8319 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -43,9 +43,9 @@
 
   <keyset id="keyset"/>
 
-  <text align="left" for="nameInput" value="&anchorNameEditField.label;"/>
+  <text class="dialog" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
   <textfield class="MinWidth20em" id="nameInput"/>
-  <text align="left" value="&noSpacesMsg.label;"/>
+  <text class="dialog" align="left" value="&noSpacesMsg.label;"/>
   <spring class="spacer"/>
   <!-- from EdDialogOverlay -->
   <box id="AdvancedEdit"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
index c5344941a75..ced2b12a9ae 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
@@ -51,12 +51,12 @@ function Startup()
   dialog.MisspelledWord = document.getElementById("MisspelledWord");
   dialog.ReplaceWordInput = document.getElementById("ReplaceWord");
   dialog.SuggestedList = document.getElementById("SuggestedList");
-  dialog.LanguageList = document.getElementById("LanguageList");
+  dialog.LanguageMenulist = document.getElementById("LanguageMenulist");
 
   if (!dialog.MisspelledWord ||
       !dialog.ReplaceWordInput ||
       !dialog.SuggestedList  ||
-      !dialog.LanguageList )
+      !dialog.LanguageMenulist )
   {
     dump("Not all dialog controls were found!!!\n");
   }
@@ -76,8 +76,8 @@ function Startup()
   dialog.ReplaceWordInput.value = MisspelledWord;
 
   //Use English for now TODO: Kin needs to finish this work so we can fill in list
-  dialog.LanguageList.selectedIndex = 0;
-  dump("Language Listed Index = "+dialog.LanguageList.selectedIndex+"\n");
+  
+  dump("Language Listed Index = "+dialog.LanguageMenulist.selectedIndex+"\n");
 
   DoEnabling();
 
@@ -90,31 +90,31 @@ function DoEnabling()
   {
     dialog.MisspelledWordLabel.setAttribute("value",GetString("CheckSpellingDone"));
     
-    SetElementEnabledByID("MisspelledWord", false);
-    SetElementEnabledByID("ReplaceWordLabel", false);
-    SetElementEnabledByID("ReplaceWord", false);
-    SetElementEnabledByID("CheckWord", false);
-    SetElementEnabledByID("SuggestedListLabel", false);
-    SetElementEnabledByID("SuggestedList", false);
-    SetElementEnabledByID("Ignore", false);
-    SetElementEnabledByID("IgnoreAll", false);
-    SetElementEnabledByID("Replace", false);
-    SetElementEnabledByID("ReplaceAll", false);
-    SetElementEnabledByID("AddToDictionary", false);
+    SetElementEnabledById("MisspelledWord", false);
+    SetElementEnabledById("ReplaceWordLabel", false);
+    SetElementEnabledById("ReplaceWord", false);
+    SetElementEnabledById("CheckWord", false);
+    SetElementEnabledById("SuggestedListLabel", false);
+    SetElementEnabledById("SuggestedList", false);
+    SetElementEnabledById("Ignore", false);
+    SetElementEnabledById("IgnoreAll", false);
+    SetElementEnabledById("Replace", false);
+    SetElementEnabledById("ReplaceAll", false);
+    SetElementEnabledById("AddToDictionary", false);
   } else {
     dialog.MisspelledWordLabel.setAttribute("value",GetString("MisspelledWordLabel"));
 
-    SetElementEnabledByID("MisspelledWord", true);
-    SetElementEnabledByID("ReplaceWordLabel", true);
-    SetElementEnabledByID("ReplaceWord", true);
-    SetElementEnabledByID("CheckWord", true);
-    SetElementEnabledByID("SuggestedListLabel", true);
-    SetElementEnabledByID("SuggestedList", true);
-    SetElementEnabledByID("Ignore", true);
-    SetElementEnabledByID("IgnoreAll", true);
-    SetElementEnabledByID("Replace", true);
-    SetElementEnabledByID("ReplaceAll", true);
-    SetElementEnabledByID("AddToDictionary", true);
+    SetElementEnabledById("MisspelledWord", true);
+    SetElementEnabledById("ReplaceWordLabel", true);
+    SetElementEnabledById("ReplaceWord", true);
+    SetElementEnabledById("CheckWord", true);
+    SetElementEnabledById("SuggestedListLabel", true);
+    SetElementEnabledById("SuggestedList", true);
+    SetElementEnabledById("Ignore", true);
+    SetElementEnabledById("IgnoreAll", true);
+    SetElementEnabledById("Replace", true);
+    SetElementEnabledById("ReplaceAll", true);
+    SetElementEnabledById("AddToDictionary", true);
   }
 }
 
@@ -152,8 +152,9 @@ function CheckWord()
       MisspelledWord = word;
       FillSuggestedList();
     } else {
-      ClearList(dialog.SuggestedList);
-      AppendStringToList(dialog.SuggestedList, GetString("CorrectSpelling"));
+      ClearTreelist(dialog.SuggestedList);
+      var item = AppendStringToTreelistById(dialog.SuggestedList, "CorrectSpelling");
+      if (item) item.setAttribute("disabled", "true");
       // Suppress being able to select the message text
       allowSelectWord = false;
     }
@@ -248,21 +249,24 @@ function FillSuggestedList()
   list = dialog.SuggestedList;
 
   // Clear the current contents of the list
-  ClearList(list);
+  ClearTreelist(list);
 
+dump(MisspelledWord+"=misspelledword\n");
   if (MisspelledWord.length > 0)
   {
     // Get suggested words until an empty string is returned
     do {
       word = spellChecker.GetSuggestedWord();
-      dump("Suggested Word = "+word+"\n");
-      if (word != "") {
-        AppendStringToList(list, word);
+      dump("Suggested Word="+word+"|\n");
+      if (word.length > 0) {
+        AppendStringToTreelist(list, word);
       }
-    } while (word != "");
-    if (list.length == 0) {
+    } while (word.length > 0);
+
+    if (list.getAttribute("length") == 0) {
       // No suggestions - show a message but don't let user select it
-      AppendStringToList(list, GetString("NoSuggestedWords"));
+      var item = AppendStringToTreelistById(list, "NoSuggestedWords");
+      if (item) item.setAttribute("disabled", "true");
       allowSelectWord = false;
     } else {
       allowSelectWord = true;
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 031bcd0635d..4aa99531b9d 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -41,58 +41,60 @@
 <box align="vertical">
   <box align="horizontal">
     <!-- value is set in JS -->
-    <text id="MisspelledWordLabel"/>
+    <text class="dialog" id="MisspelledWordLabel"/>
     <spring class="bigspacer"/>
-    <text id="MisspelledWord"/>
+    <text class="dialog bold" id="MisspelledWord"/>
   </box>
-  <text id="ReplaceWordLabel" value="&wordEditField.label;"/>
+  <text class="dialog" id="ReplaceWordLabel" value="&wordEditField.label;"/>
   <box align="horizontal">
-    <html:input type="text" class="SpellCheckWord" id="ReplaceWord" size="24" onkeyup="ChangeReplaceWord()"/>
-    <spring class="bigspacer"/>
-    <button class="dialog" id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
-    <spring flex="100%"/>
-  </box>
-  <spring class="spacer"/>
-  <text id="SuggestedListLabel" value="&suggestions.label;"/>
-  <box align="horizontal">
-    <html:select class="SpellCheckList" id="SuggestedList" size="8" onchange="SelectSuggestedWord()"/>
-    <box align="vertical">
-      <box align="horizontal"> 
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="Ignore" oncommand="Ignore()" value="&ignoreButton.label;"/>
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="IgnoreAll" oncommand="IgnoreAll()" value="&ignoreallButton.label;"/>
-      </box>
-      <spring class="bigspacer"/>
-      <box align="horizontal"> 
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="Replace" oncommand="Replace()" value="&changeButton.label;"/>
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeallButton.label;"/>
-      </box>
-      <spring class="bigspacer"/>
-      <box align="horizontal"> 
-        <spring class="bigspacer"/>
-        <html:label> &userDictionary.label; </html:label>
-      </box> 
-      <box align="horizontal"> 
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="AddToDictionary" oncommand="AddToDictionary()" value="&addtouserdictionaryButton.label;"/>
-        <spring class="bigspacer"/>
-        <button class="dialog" flex="100%" id="EditDictionary" oncommand="EditDictionary()" value="&edituserdictionaryButton.label;"/>
-      </box>
+    <textfield class="MinWidth20em" id="ReplaceWord" onkeyup="ChangeReplaceWord()"/>
+    <spring class="spacer"/>
+    <box flex="1">
+      <button class="dialog MinWidth10em" flex="1" id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
+      <spring class="MinWidth20em" flex="1"/>
     </box>
   </box>
-  <html:label> &languagePopup.label; </html:label>
+  <spring class="spacer"/>
+  <text class="dialog" id="SuggestedListLabel" value="&suggestions.label;"/>
   <box align="horizontal">
-    <html:select class="SpellCheckLanguage" id="LanguageList" size="1"  onchange="SelectLanguage()">
-      <option> &englishLanguagePopup.value; </option>
-    </html:select>
-    <spring class="bigspacer"/>
-    <button class="dialog"  id="Recheck" oncommand="Recheck()" value="&recheckButton.label;"/>
-    <spring class="bigspacer"/>
-    <button class="dialog"  id="Close" oncommand="Close()" value="&closeButton.label;"/>
-    <spring class="bigspacer"/>
+    <tree class="list MinWidth20em" id="SuggestedList" oncommand="SelectSuggestedWord()"/>
+    <spring class="spacer"/>
+    <grid flex="1">
+      <columns><column flex="1"/><column flex="1"/></columns>
+      <rows>
+        <row>
+          <button class="dialog" flex="1" id="Ignore" oncommand="Ignore()" value="&ignoreButton.label;"/>
+          <button class="dialog" flex="1" id="IgnoreAll" oncommand="IgnoreAll()" value="&ignoreAllButton.label;"/>
+        </row>
+        <row>
+          <button class="dialog" flex="1" id="Replace" oncommand="Replace()" value="&changeButton.label;"/>
+          <button class="dialog" flex="1" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeAllButton.label;"/>
+        </row>
+        <row>
+          <text class="dialog" flex="1" value="&userDictionary.label;"/>
+          <spring/>
+        </row>
+        <row>
+          <button class="dialog" flex="1" id="AddToDictionary" oncommand="AddToDictionary()" value="&addToUserDictionaryButton.label;"/>
+          <button class="dialog" flex="1" id="EditDictionary" oncommand="EditDictionary()" value="&editUserDictionaryButton.label;"/>
+        </row>
+      </rows> 
+    </grid>
+  </box>
+  <text class="dialog" value ="&languagePopup.label;"/>
+  <box>
+    <menulist class="MinWidth20em" id="LanguageMenulist" oncommand="SelectLanguage()">
+      <menupopup>
+        <menuitem id="English" value="&englishLanguagePopup.value;"/>
+        <menuitem id="Spanish" value="&spanishLanguagePopup.value;"/>
+        <menuitem id="French" value="&frenchLanguagePopup.value;"/>
+      </menupopup>
+    </menulist>
+    <spring class="spacer"/>
+    <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()"/>
+    </box>
   </box> 
 </box>
 </window>
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index 74aa47d5731..944c9b538e3 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -54,7 +54,7 @@
     <tabpanel class="Padding5" orient="vertical" id="TabPanel">
       <!-- TABLE PANEL -->
       <box id="TablePanel" orient="vertical">
-        <titledbox class="NoBottomPad NoTopMargin NoTopPadding"><title><text value="&size.label;"/></title>
+        <titledbox><title><text value="&size.label;"/></title>
           <box orient="vertical">
             <box valign="middle" autostretch="never">
               <text class="MinWidth50" align="left" for="TableRowsInput" value="&tableRows.label;"/>
@@ -81,10 +81,10 @@
               <html:select id="TableWidthUnits"/>
             </box>
           </box>
-        <spring flex="1"/>
+          <spring flex="1"/>
         </titledbox>
         <box>
-          <titledbox class="NoBottomPad" align="vertical"><title><text align="left" value="&tableBorderSpacing.label;"/></title>
+          <titledbox align="vertical"><title><text align="left" value="&tableBorderSpacing.label;"/></title>
             <box valign="middle" autostretch="never">
               <text align="left" for="BorderWidthInput" value="&tableBorderWidth.label;"/>
               <spring class="spacer"/>
@@ -130,7 +130,7 @@
           </box>
           <spring class="bigspacer"/>
         </box>
-        <titledbox class="NoBottomPad" align="vertical"><title><text align="left" value="&background.label;"/></title>
+        <titledbox align="vertical"><title><text align="left" value="&background.label;"/></title>
           <box valign="middle" autostretch="never">
             <text class="MinWidth50" align="left" value="&color.label;"/>
             <menu class="colorpicker">
@@ -171,7 +171,7 @@
 
       <!-- CELL PANEL -->
     	<box id="CellPanel" orient="vertical">
-        <titledbox class="NoTopMargin NoTopPadding NoBottomPad" autostretch="never" valign="middle">
+        <titledbox autostretch="never" valign="middle">
           <title><text align="left" value="&cellSelection.label;"/></title>
           <spring class="spacer"/>
           <menulist class="MinWidth50" id="SelectionList">
@@ -187,7 +187,7 @@
           <button class="dialog MinWidth50" value="&cellSelectionNext.label;" oncommand="SelectNext()" disabled="true"/>
         </titledbox>
         <!-- cell size titledbox -->
-        <titledbox class="NoBottomPad"><title><text align="left" value="&size.label;"/></title>
+        <titledbox><title><text align="left" value="&size.label;"/></title>
           <box orient="vertical">
             <box valign="middle" autostretch="never">
               <text class="MinWidth50" align="left" for="CellHeightInput" value="&tableHeight.label;"/>
@@ -219,11 +219,11 @@
           </box>
         </titledbox>
         <box>
-          <titledbox class="NoBottomPad" orient="vertical" flex="1">
+          <titledbox orient="vertical" flex="1">
             <title><text align="left" value="&cellContentAlignment.label;"/></title>
             <box valign="top" autostretch="never">
               <text class="MinWidth70" align="right" for="CellHAlignSelect" value="&cellHorizontal.label;"/>
-              <html:select class="MinWidth100" id="CellHAlignSelect" onchange="SelectCellHAlign()">
+              <html:select class="MinWidth100" id="CellHAlignSelect" oncommand="SelectCellHAlign()">
                 <html:option value="left">&AlignLeft.label;</html:option>
                 <html:option value="center">&AlignCenter.label;</html:option>
                 <html:option value="right">&AlignRight.label;</html:option>
@@ -244,7 +244,7 @@
             </box>
           </titledbox>
           <spring class="spacer"/>
-          <titledbox class="NoBottomPad" orient="vertical">
+          <titledbox orient="vertical">
             <title><text align="left" value="&cellTextStyle.label;"/></title>
             <box valign="middle" autostretch="never">
               <html:input type="checkbox" id="HeaderCheck"/>
@@ -256,7 +256,7 @@
             </box>
           </titledbox>
         </box>
-        <titledbox class="NoBottomPad" orient="vertical"><title><text align="left" value="&background.label;"/></title>
+        <titledbox orient="vertical"><title><text align="left" value="&background.label;"/></title>
           <box valign="middle" autostretch="never">
             <text class="MinWidth50" align="left" value="&color.label;"/>
             <menu class="colorpicker">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd
index dfd557fd482..b89bcdf7c62 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertSource.dtd
@@ -23,4 +23,8 @@
 <!-- Window title -->
 <!ENTITY windowTitle.label "Insert HTML">
 <!ENTITY sourceEditField.label "Enter HTML tags and text:">
-<!ENTITY example.label "Example: <b>&lt;i&gt;Hello World!&lt;/i&gt;</b>">
+<!ENTITY example.label "Example: ">
+<!-- Don't translate the next 2: they are text for HTML tagnames: "<i>" and "</i>" -->
+<!ENTITY exampleOpenTag.label "&lt;i&gt;">
+<!ENTITY exampleCloseTag.label "&lt;/i&gt;">
+<!ENTITY exampleText.label "Hello World!">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd
index 61e0da8994b..ce3e14a1fe7 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorSpellCheck.dtd
@@ -28,13 +28,13 @@
 <!ENTITY suggestions.label "Suggestions:">
 
 <!ENTITY ignoreButton.label "Ignore">
-<!ENTITY ignoreallButton.label "Ignore All">
+<!ENTITY ignoreAllButton.label "Ignore All">
 <!ENTITY changeButton.label "Change">
-<!ENTITY changeallButton.label "Change All">
+<!ENTITY changeAllButton.label "Change All">
 
 <!ENTITY userDictionary.label "User Dictionary:">
-<!ENTITY addtouserdictionaryButton.label "Add Word">
-<!ENTITY edituserdictionaryButton.label "Edit">
+<!ENTITY addToUserDictionaryButton.label "Add Word">
+<!ENTITY editUserDictionaryButton.label "Edit">
 <!ENTITY recheckButton.label "Recheck">
 <!ENTITY closeButton.label "Close">
 
diff --git a/mozilla/editor/ui/dialogs/skin/EditorDialog.css b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
index 4315a5e4735..e3998628d10 100644
--- a/mozilla/editor/ui/dialogs/skin/EditorDialog.css
+++ b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
@@ -62,40 +62,51 @@ image.popup-trigger {
   list-style-image: url(chrome://global/skin/scroll-down.gif);
 }
 
-/* XUL ELEMENTS */
+/* Most should be moved to global files */
+
+titledbox {
+  padding-bottom: 4px;
+}
+
+*.MinWidth10em {
+  min-width: 10em;
+}
+
 *.MinWidth20em {
   min-width: 20em;
 }
 
-box#ColorPreview {
-  border:           1px inset #CCCCCC;
-  padding-left:     5px;
-  padding-right:    5px;
-  min-width:        100px;
-  min-height:       50px;
+*.big-left-margin {
+  margin-left:    10px;
 }
 
-
-/* These reduce extra space to 
-   minimize total height in Table Dialog
-titledbox.NoBottomPad {
-  padding-bottom: 0px;
+*.middle {
+  vertical-align: middle:
 }
 
-titledbox.NoTopMargin {
-  margin-bottom: 0px;
+text.dialog {
+  margin: 1px 2px 1px 4px;
 }
 
-titledbox.NoTopPadding {
-  padding-top: 0px;
+text.bold {
+  font-weight: bold;
 }
 
-tabpanel.Padding5 {
-  padding: 5px;
+text.italic {
+  font-style: italic;
+}
+
+tree.list {
+  border: 1px inset #CCCCCC;
+  margin: 1px 4px 2px 4px;
+  width: 10em;
+  height: 3em;
+}
+
+textfield.narrow {
+  width: 3em;
 }
-*/
 
-/* SHOULD GO IN GLOBAL.CSS */
 *.align-right {
   text-align: right;
 }
@@ -108,22 +119,29 @@ text[hidden="true"], input[hidden="true"] {
   display: none;
 }
 
+box#ColorPreview {
+  border: 1px inset #CCCCCC;
+  margin-left:    10px;
+  padding-left:    5px;
+  padding-right:   5px;
+  min-width:     100px;
+  min-height:     50px;
+}
+
 select#alignTypeSelect,label#alignLabel {
   margin-left: 5px;
 }
 
 button#MoreFewerButton[more="0"] {
-  margin-left: 6px;
   list-style-image: url(chrome://global/skin/scroll-down.gif);
   /* bug 9459 - changing button text doesn't resize width.
      This covers that problem, but we want this size anyway */
-  width: 10em;
+  min-width: 10em;
 }
 
 button#MoreFewerButton[more="1"] {
-  margin-left: 6px;
   list-style-image: url(chrome://global/skin/scroll-up.gif);
-  width: 10em;
+  min-width: 10em;
 }
 
 /* We use a borderless button to show misspelled word in dialog */
@@ -186,21 +204,21 @@ img.AlignIcon {
   /*vertical-align: middle;*/
 }
 
-button#img-align-top {
+image#img-align-top {
 	list-style-image:url("chrome://editor/skin/images/img-align-top.gif");
 }
-button#img-align-middle {
+image#img-align-middle {
 	list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");
 }
-button#img-align-bottom {
+image#img-align-bottom {
 	list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");
 }
-button#img-align-left {
-	list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
-}
-button#img-align-right {
+image#img-align-right {
 	list-style-image:url("chrome://editor/skin/images/img-align-right.gif");
 }
+image#img-align-left {
+	list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
+}
 
 /* Rest are from Ben Goodger for Advanced Edit dialog 
    These need reviewing and eliminate all but essential attributes */