--- downloadProgress.xul.original	Mon May 29 19:39:11 2000
+++ downloadProgress.xul	Mon May 29 19:33:20 2000
@@ -1,6 +1,7 @@
 <?xml version="1.0"?> 
 
 <?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/downloadProgress.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/downloadProgress.dtd">
 
@@ -11,90 +12,64 @@
         onload="onLoad()"
         onunload="onUnload()">
 
-    <html:script src="chrome://global/content/downloadProgress.js"/>
+    <script src="chrome://global/content/downloadProgress.js"/>
 
     <!-- This is non-visible content that simply adds translatable string
          into the document so that it is accessible to JS code.
     -->
-    <html:div style="display:none">
-        <html:div id="dialog.strings.confirmCancel">&confirmCancel;</html:div>
-        <html:div id="dialog.strings.progressMsg">&progressMsg;</html:div>
-        <html:div id="dialog.strings.completeMsg">&completeMsg;</html:div>
-        <html:div id="dialog.strings.percentMsg">&percentMsg;</html:div>
-        <html:div id="dialog.strings.shortTimeFormat">&shortTimeFormat;</html:div>
-        <html:div id="dialog.strings.longTimeFormat">&longTimeFormat;</html:div>
-        <html:div id="dialog.strings.unknownTime">&unknownTime;</html:div>
-    </html:div>
-
-    <html:table style="width:100%;">
-
-        <html:tr>
-            <html:td align="right">
-                &location;
-            </html:td>
-            <html:td align="left">
-                <html:input id="dialog.location" readonly="" style="background-color:lightgray;width:300px;"/>
-            </html:td>
-        </html:tr>
-    
-        <html:tr>
-            <html:td align="right">
-                &saving;
-            </html:td>
-            <html:td align="left">
-                <html:input id="dialog.fileName" readonly="" value="" style="background-color:lightgray;width:300px;"/>
-            </html:td>
-        </html:tr>
-
-        <html:tr>
-            <html:td align="right">
-                &status;
-            </html:td>
-            <html:td align="left">
-                <html:span id="dialog.status">
-                    &#160;
-                </html:span>
-            </html:td>
-        </html:tr>
-
-        <html:tr>
-            <html:td align="right">
-                &timeElapsed;
-            </html:td>
-            <html:td align="left">
-                <html:span id="dialog.timeElapsed">
-                    &#160;    
-                </html:span>
-            </html:td>
-        </html:tr>
-
-        <html:tr>
-            <html:td align="right">
-                &timeLeft;
-            </html:td>
-            <html:td align="left">
-                <html:span id="dialog.timeLeft">
-                    &#160;
-                </html:span>
-            </html:td>
-        </html:tr>
-
-        <html:tr>
-            <html:td align="center" height="40px" colspan="2">
-                <progressmeter id="dialog.progress" mode="normal" value="0"
-                               style="width:300px;height:16px;"/>
-                <html:span id="dialog.progressPercent" style="border-left:5px solid lightgray;">
-                    0%
-                </html:span>
-            </html:td>
-        </html:tr>
-
-        <html:tr>
-            <html:td align="center" colspan="2">
-                <html:button id="dialog.cancel" onclick="stop()">&dialogCancel.label;</html:button>
-            </html:td>
-        </html:tr>
 
-    </html:table>
+    <box style="display:none">
+        <box id="dialog.strings.confirmCancel" value="&confirmCancel;"/>
+        <box id="dialog.strings.progressMsg" value="&progressMsg;"/>
+        <box id="dialog.strings.completeMsg" value="&completeMsg;"/>
+        <box id="dialog.strings.percentMsg" value="&percentMsg;"/>
+        <box id="dialog.strings.shortTimeFormat" value="&shortTimeFormat;"/>
+        <box id="dialog.strings.longTimeFormat" value="&longTimeFormat;"/>
+        <box id="dialog.strings.unknownTime" value="&unknownTime;"/>
+    </box>
+
+
+    <box align="vertical" flex="1">
+	<grid>
+	  <columns>
+	    <column flex="1"/>
+	    <column flex="1"/>
+	  </columns>
+	  <rows>
+	    <row class="dlrow">
+	      <text value="&location; " class="textlabel"/>
+	      <textfield id="location" value="" readonly="" class="deactivated"/>
+	    </row>
+	    <row class="dlrow">
+	      <text value="&saving; " class="textlabel"/>
+	      <textfield id="fileName" value="" readonly="" class="deactivated"/>
+	    </row>
+	    <row class="dlrow">
+	      <text value="&status; " class="textlabel"/>
+	      <text id="status" value="&#160;"/>
+	    </row>
+	    <row class="dlrow">
+	      <text value="&timeElapsed; " class="textlabel"/>
+	      <text id="timeElapsed" value="&#160;"/>
+	    </row>
+	    <row class="dlrow">
+	      <text value="&timeLeft; " class="textlabel"/>
+	      <text id="timeLeft" value="&#160;"/>
+	    </row>
+	  </rows>
+	</grid> 
+
+	<box align="horizontal" id="progressbox">
+		<spring flex="1"/>
+                <progressmeter id="progress" mode="normal" value="0"/>
+                <text id="progressPercent" value="0%" class="textlabel"/>
+		<spring flex="1"/>
+	</box>
+	<box align="horizontal" id="buttonbox">
+		<spring flex="1"/>
+                <button id="cancel" onclick="stop()" value="&dialogCancel.label;"/>
+		<spring flex="1"/>
+	</box>
+    </box>
 
 </window>