Index: branches/release-41/tmpl/wizard/optional.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/optional.tmpl (revision 2484)
+++ branches/release-41/tmpl/wizard/optional.tmpl (revision 2704)
@@ -141,5 +141,5 @@
 </div>
 
-<div id="submit" <mt:unless name=mail_transfer>style="display: none"</mt:unless>>
+<div id="submit" class="action-buttons" <mt:unless name=mail_transfer>style="display: none"</mt:unless>>
 <div class="left">
 <input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="this.form.reset(); go('previous_step')" />
Index: branches/release-41/tmpl/wizard/complete.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/complete.tmpl (revision 1461)
+++ branches/release-41/tmpl/wizard/complete.tmpl (revision 2704)
@@ -12,13 +12,13 @@
 function toggleConfig() {
     var manually = getByID('manually');
-    var retry = getByID('retry');
-    var automatic = getByID('automatic');
+    var retry = getByID('retry-buttons');
+    var automatic = getByID('automatic-buttons');
     if (manually) {
         if (manually.checked == true) {
+            retry.style.display = 'none';
+            automatic.style.display = 'block';
+        } else {
             retry.style.display = 'block';
             automatic.style.display = 'none';
-        } else {
-            retry.style.display = 'none';
-            automatic.style.display = 'block';
         }
     }
@@ -74,30 +74,28 @@
 <mt:unless name="config_created">
 <p>
-    <input id="manually" class="cb" type="checkbox" name="manually" value="1" onclick="toggleConfig()" <mt:if name="manually">checked="checked"</mt:if>> <label for="manually"><__trans phrase="I will create the mt-config.cgi file manually."></label>
+    <input id="manually" class="cb" type="checkbox" name="manually" value="1" onclick="toggleConfig()" <mt:if name="manually">checked="checked"</mt:if>> <label for="manually"><__trans phrase="The mt-config.cgi file has been created manually."></label>
 </p>
 </mt:unless>
 
-<p>
-    <div id="automatic" <mt:if name="FILE_NOT_FOUND">style="display:none;"</mt:if>>
-        <div class="left">
-            <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('previous_step')" />
-        </div>
-        <div class="right">
-<mt:unless name=CONFIG_CREATED>
-            <input name="retry" type="submit" class="sb" value="<__trans phrase="Retry">" onclick="go('retry')" />
+<div id="retry-buttons" class="action-buttons" <mt:if name="file_not_found">style="display:none;"</mt:if>>
+    <div class="left">
+        <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('previous_step')" />
+    </div>
+    <div class="right">
+<mt:unless name="config_created">
+        <input name="retry" type="submit" class="sb" value="<__trans phrase="Retry">" onclick="go('retry')" />
 <mt:else>
-            <input name="continue" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="document.location.href='<mt:var name="mt_script">'; return false" />
+        <input name="continue" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="document.location.href='<mt:var name="mt_script">'; return false" />
 </mt:unless>
-        </div>
     </div>
-    <div id="retry" <mt:unless name="file_not_found">style="display:none;"</mt:unless>>
-        <div class="left">
-            <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('retry')" />
-        </div>
-        <div class="right">
-            <input name="retry" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="go('retry')" />
-        </div>
+</div>
+<div id="automatic-buttons" class="action-buttons" <mt:unless name="file_not_found">style="display:none;"</mt:unless>>
+    <div class="left">
+        <input type="submit" class="sb" value="<__trans phrase="Back">" onclick="go('retry')" />
     </div>
-</p>
+    <div class="right">
+        <input name="retry" type="submit" class="sb" value="<__trans phrase="Continue">" onclick="go('retry')" />
+    </div>
+</div>
 
 </form>
Index: branches/release-41/tmpl/wizard/cfg_dir.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/cfg_dir.tmpl (revision 1309)
+++ branches/release-41/tmpl/wizard/cfg_dir.tmpl (revision 2704)
@@ -78,5 +78,5 @@
 </div>
 
-<div id="submit" <mt:if name="success">style="display: none"</mt:if>>
+<div id="submit" class="action-buttons" <mt:if name="success">style="display: none"</mt:if>>
 <div class="left">
 <input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="this.form.reset(); go('previous_step')" />
Index: branches/release-41/tmpl/wizard/start.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/start.tmpl (revision 2484)
+++ branches/release-41/tmpl/wizard/start.tmpl (revision 2704)
@@ -1,10 +1,4 @@
-<mt:unless name="cfg_exists">
-    <mt:setvarblock name="page_title"><__trans phrase="Welcome to Movable Type"></mt:setvarblock>
-<mt:else>
-    <mt:setvarblock name="page_title"><__trans phrase="Configuration File Exists"></mt:setvarblock>
-</mt:unless>
-<mt:unless name="valid_static_path">
-    <mt:setvarblock name="html_head" append="1">
-        <style type="text/css" media="screen">
+<mt:setvarblock name="inline_styles">
+    <style type="text/css" media="screen">
         body {
             font-family: Candara, "Helvetica Neue", Arial, sans-serif;
@@ -76,4 +70,5 @@
             padding: 10px;
             margin-bottom: 1em;
+            height: 1%;  /*IE6 Hack*/
         }
         .no-static-path h3 {
@@ -97,12 +92,15 @@
         .msg {
             margin: 0 0 10px 0;
-            padding: 16px 10px 16px 46px;
+            padding: 16px 10px;
         }
         .msg-error {
             background-color: #FF9;
         }
+        .msg, .no-static-path, fieldset {
+            height: 1%;  /* IE6 Hack */
+        }
         </style>
 
-        <script type="text/javascript">
+    <script type="text/javascript">
         /* <![CDATA[ */
         function getByID(n, d) {
@@ -114,38 +112,50 @@
         }
         /* ]]> */
+    </script>
+</mt:setvarblock>
+<mt:unless name="cfg_exists">
+    <mt:setvarblock name="page_title"><__trans phrase="Welcome to Movable Type"></mt:setvarblock>
+    <mt:unless name="valid_static_path">
+        <mt:unless name="file_invalid">
+            <mt:setvarblock name="html_head" append="1">
+                <$mt:var name="inline_styles"$>
+            </mt:setvarblock>
+        </mt:unless>
+    <mt:else>
+        <mt:setvarblock name="js_include" append="1">
+        <style type="text/css">
+            .msg {
+                margin: 0 0 10px 0;
+                padding: 16px 10px 16px 10px;
+            }
+            .msg-error {
+                background-color: #FF9;
+            }
+            #container  div.no-static-path,
+            #container #static_webpath_config {
+                display: none;
+            }
+            #container.bad-static-path div.no-static-path,
+            #container.bad-static-path #static_webpath_config {
+                display: block;
+            }
+            </style>
+            <script type="text/javascript">
+            /* <![CDATA[ */
+            function js_check() {
+                if (! openManual ) {
+                    // mt.js not loading properly; static path incorrect
+                    var c = getByID("container");
+                    c.className = "bad-static-path";
+                }
+            }
+            window.onload = js_check;
+            /* ]]> */
         </script>
-    </mt:setvarblock>
+        </mt:setvarblock>
+    </mt:unless>
 <mt:else>
-    <mt:setvarblock name="js_include" append="1">
-        <style type="text/css">
-        .msg {
-            margin: 0 0 10px 0;
-            padding: 16px 10px 16px 10px;
-        }
-        .msg-error {
-            background-color: #FF9;
-        }
-        #container  div.no-static-path,
-        #container #static_webpath_config {
-            display: none;
-        }
-        #container.bad-static-path div.no-static-path,
-        #container.bad-static-path #static_webpath_config {
-            display: block;
-        }
-        </style>
-        <script type="text/javascript">
-        /* <![CDATA[ */
-        function js_check() {
-            if (! openManual ) {
-                // mt.js not loading properly; static path incorrect
-                var c = getByID("container");
-                c.className = "bad-static-path";
-            }
-        }
-        window.onload = js_check;
-        /* ]]> */
-        </script>
-    </mt:setvarblock>
+    <mt:setvarblock name="page_title"><__trans phrase="Configuration File Exists"></mt:setvarblock>
+    <$mt:var name="inline_styles"$>
 </mt:unless>
 
@@ -227,7 +237,7 @@
         </fieldset>
     </div>
-
-    <div class="right"><input type="submit" class="sb" value="<__trans phrase="Begin">" /></div>
-
+    <div class="action-buttons">
+        <div class="right"><input type="submit" class="sb" value="<__trans phrase="Begin">" /></div>
+    </div>
 </form>
 
Index: branches/release-41/tmpl/wizard/configure.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/configure.tmpl (revision 2616)
+++ branches/release-41/tmpl/wizard/configure.tmpl (revision 2704)
@@ -163,5 +163,10 @@
 <mt:unless name="success">
 <mt:setvarblock name="db_setup_url"><__trans phrase="http://www.movabletype.org/documentation/[_1]" params="installation/setting-up-your-database.html"></mt:setvarblock>
-<p id="db_hint" class="hint"><__trans phrase="If your database type is not listed in the menu above, then you need to <a target="help" href="[_1]">install the Perl module necessary to connect to your database</a>.  If this is the case, please check your installation and <a href="javascript:void(0)" onclick="[_2]">re-test your installation</a>." params="<mt:var name="db_setup_url">%%reTest();"></p>
+    <div id="db_hint">
+        <p class="hint"><__trans phrase="Is your preferred database not listed? View the <a href="[_1]" target="_blank">Movable Type System Check</a> see if additional modules are necessary." params="mt-check.cgi"></p>
+        <p class="hint"><__trans phrase="Once installed, <a href="javascript:void(0)" onclick="[_2]">click here refresh this screen</a>." params="reTest();"></p>
+        <p class="hint"><__trans phrase="Read more: <a href="[_1]" target="_blank">Setting Up Your Database</a>" params="<mt:var name="db_setup_url">"></p>
+    </div>
+    
 </mt:unless>
 
@@ -262,5 +267,5 @@
 
 <mt:unless name="success">
-<div id="submit" <mt:unless name="dbtype">style="display: none"</mt:unless>>
+<div id="submit" class="action-buttons" <mt:unless name="dbtype">style="display: none"</mt:unless>>
 <div class="right">
 <input name="test" type="submit" class="sb" value="<__trans phrase="Test Connection">" onclick="go('test');" />
@@ -279,5 +284,5 @@
 
 <mt:if name="success">
-<div id="continue">
+<div id="continue" class="action-buttons">
 <div class="right">
 <input name="test" type="submit" class="sb" value="<__trans phrase="Test Connection">" onclick="go('test');" />
Index: branches/release-41/tmpl/wizard/blog.tmpl
===================================================================
--- branches/release-41/tmpl/wizard/blog.tmpl (revision 1309)
+++ branches/release-41/tmpl/wizard/blog.tmpl (revision 2704)
@@ -62,5 +62,5 @@
     </mtapp:setting>
 
-<div id="continue">
+<div id="continue" class="action-buttons">
 <div class="left">
 <input name="back" type="submit" class="sb" value="<__trans phrase="Back">" onclick="needValidate = false; this.form.reset(); go('previous_step');" />