diff --git a/profile/resources/content/createProfileWizard.xul b/profile/resources/content/createProfileWizard.xul
index 94b46999b2c..643260cb51d 100644
--- a/profile/resources/content/createProfileWizard.xul
+++ b/profile/resources/content/createProfileWizard.xul
@@ -12,7 +12,7 @@
 ]>
 
 
-<window title="&newprofile.title;" align="vertical"
+<window title="&newprofile.title;" orient="vertical"
         class="color-dialog"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -27,11 +27,11 @@
 	<script language="javascript" src="chrome://global/content/wizardManager.js"></script>
 	<script language="javascript" src="chrome://global/content/widgetStateManager.js"></script>
 
-  <box class="box-header" id="header" value="&profileWizard.title;"/>
-  <box id="contentarea" flex="1">
-  	<html:iframe src="about:blank" style="width: 40em; height: 18em; overflow: auto;" name="content" id="content" flex="1"/>
+  <box class="box-header" id="header" title="&window.title.label;" description="&profileWizard.title;"/>
+  <box class="wizard-box" flex="1">
+  	<html:iframe src="about:blank" style="width: 40em; height: 20em; overflow: auto;" name="content" id="content" flex="1"/>
   </box>
+  <separator class="groove"/>
 	<box id="wizardButtons"/>
-  <box class="box-status" id="status" value="&window.title.label;" progress=""/>
 
 </window>
diff --git a/profile/resources/content/deleteProfile.js b/profile/resources/content/deleteProfile.js
index e2fa199288d..ef794338256 100644
--- a/profile/resources/content/deleteProfile.js
+++ b/profile/resources/content/deleteProfile.js
@@ -17,6 +17,7 @@ function Startup()
     cancelButton.setAttribute( "value", "Cancel Yah" );
   }
   Button2.removeAttribute("collapsed");
+  okButton.focus();
 }
 
 function onDeleteFiles()
diff --git a/profile/resources/content/deleteProfile.xul b/profile/resources/content/deleteProfile.xul
index 91a4de94097..410e9604845 100644
--- a/profile/resources/content/deleteProfile.xul
+++ b/profile/resources/content/deleteProfile.xul
@@ -27,8 +27,8 @@
   <box orient="vertical" flex="1">
     <html>&intro;</html> 
     <html>&question;</html> 
-    <separator class="groove"/>
-    <box id="okCancelButtons" class="Button1"/>
+    <separator/>
+    <box id="okCancelButtonsRight" class="Button1"/>
   </box>
 
 </window>
diff --git a/profile/resources/content/newProfile1_2.xul b/profile/resources/content/newProfile1_2.xul
index ebf940a49a6..1c6e1801346 100644
--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@@ -47,10 +47,7 @@
 
 
   <box id="dirbox">
-    <box orient="vertical" flex="1">
-      <html class="indent" id="ProfileDir"/>
-      <spring flex="1"/>
-    </box>
+    <html class="indent" id="ProfileDir" flex="1" style="overflow: auto;"/>
     <box orient="vertical" valign="top">
       <button value="&button.choosefolder.label;" oncommand="chooseProfileFolder();"/>
       <button id="useDefault" value="&button.usedefault.label;" oncommand="setDisplayToDefaultFolder();" disabled="true"/>
@@ -59,12 +56,13 @@
 
   <separator/>
 
-  <box autostretch="never" halign="right">
+  <box autostretch="never">
+    <html id="finishtext">&pnl2.finish.text;</html> 
+    <spring flex="1"/>
     <button value="&langSelection.label;" oncommand="showLangDialog();"/>
   </box>
 
   <!--spring flex="1"/-->
-  <html id="finishtext">&pnl2.finish.text;</html> 
 
   <data id="ProfileLocale" />
 </window>
diff --git a/profile/resources/content/profileSelection.xul b/profile/resources/content/profileSelection.xul
index e3dbddbbdef..8b9f6932d9e 100644
--- a/profile/resources/content/profileSelection.xul
+++ b/profile/resources/content/profileSelection.xul
@@ -29,6 +29,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/profile/profile.css" type="text/css"?>
+
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -57,16 +58,16 @@
     <key id="fooKey" key="s" xulkey="true" shift="true" onkeydown="foo()"/>
   </keyset>
 
-  <box class="box-header" id="header" value="&windowtitle.label;"/>
+  <box class="box-header" id="header" title="&profilemanager.label;" description="&windowtitle.label;"/>
   
-  <box id="contentarea" flex="1">
+  <box class="wizard-box" flex="1">
 
     <!-- instructions -->
     <deck id="prattle">
       <html id="intro" style="width: 17em;" flex="1">&introgeneral.label;</html>
       <box orient="vertical" id="manager">
         <html style="width: 17em;" class="label">&pmTextA.label;</html>
-        <spring flex="1"/>
+        <separator/>
         <box>
           <box orient="vertical" flex="1" id="managebuttons">
             <button id="newbutton" value="&newButton.label;" oncommand="CreateProfileWizard();"/>
diff --git a/profile/resources/content/selectLang.xul b/profile/resources/content/selectLang.xul
index 125189d45b8..d60d55766ec 100644
--- a/profile/resources/content/selectLang.xul
+++ b/profile/resources/content/selectLang.xul
@@ -39,7 +39,8 @@
       </template>
 
     </tree>
-  
-  <box id="okCancelButtons"/>
+
+  <separator/>  
+  <box id="okCancelButtonsRight"/>
         
 </window>        
