diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
index 220ff971b..77ac0ca28 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
@@ -1,33 +1,30 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SetupViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Setup.ViewModels"%>
-<h1><%=Html.TitleForPage("Orchard " + _Encoded("Setup"))%></h1>
-<div class="">
-
-</div>
-
-
+<h1><%=Html.TitleForPage(_Encoded("Get Started").ToHtmlString())%></h1>
 <%
 using (Html.BeginFormAntiForgeryPost()) { %>
 <%=Html.ValidationSummary() %>
-<fieldset>
+<h2><%=_Encoded("Please answer a few questions to configure your site.")%></h2>
+<fieldset class="site">
     <div>
-        <%=Html.LabelFor(svm => svm.SiteName) %>
+        <label for="SiteName"><%=_Encoded("What is the name of your site?") %></label>
         <%=Html.EditorFor(svm => svm.SiteName) %>
         <%=Html.ValidationMessage("SiteName", "*") %>
     </div>
     <div>
-        <%=Html.LabelFor(svm => svm.AdminUsername) %>
+        <label for="AdminUsername"><%=_Encoded("Choose a user name:") %></label>
         <%=Html.EditorFor(svm => svm.AdminUsername)%>
         <%=Html.ValidationMessage("AdminUsername", "*")%>
     </div>
     <div>
-        <%=Html.LabelFor(svm => svm.AdminPassword) %>
+        <label for="AdminPassword"><%=_Encoded("Choose a password:") %></label>
         <%=Html.PasswordFor(svm => svm.AdminPassword) %>
         <%=Html.ValidationMessage("AdminPassword", "*") %>
     </div>
 </fieldset>
-<fieldset>
+<fieldset class="data">
+    <legend><%=_Encoded("How would you like to store your data?") %></legend>
     <%=Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage") %>
     <div>
         <input type="radio" name="databaseOptions" id="builtin" value="true" checked="checked" />
@@ -36,12 +33,19 @@ using (Html.BeginFormAntiForgeryPost()) { %>
     <div>
         <input type="radio" name="databaseOptions" id="sql" value="false" />
         <label for="sql" class="forcheckbox"><%=_Encoded("Use an existing SQL Server (or SQL Express) database") %></label>
-        <!-- Should add some javascript to hide the connection string field if that option isn't selected -->
-        <label for="connection"><%=_Encoded("Connection string") %></label>
-        <%=Html.EditorFor(svm => svm.DatabaseConnectionString)%>
+        <span>
+            <label for="DatabaseConnectionString"><%=_Encoded("Connection string") %></label>
+            <%=Html.EditorFor(svm => svm.DatabaseConnectionString)%>
+        </span>
     </div>
 </fieldset>
 <fieldset>
     <input class="button" type="submit" value="<%=_Encoded("Finish Setup") %>" />
 </fieldset><%
-} %>
\ No newline at end of file
+} %>
+<script type="text/javascript">
+    $(function() {
+        $("#sql").change(function() { $(this).siblings("span").slideDown(200).find("input").focus(); });
+        $("#builtin").change(function() { $("#sql").siblings("span").slideUp(200); });
+    });
+</script>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 53968a055..c46f8ce2b 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -231,9 +231,7 @@
     <Content Include="Themes\SafeMode\Theme.png" />
     <Content Include="Themes\SafeMode\Theme.txt" />
     <Content Include="Themes\SafeMode\Views\Document.aspx" />
-    <Content Include="Themes\SafeMode\Views\Footer.ascx" />
     <Content Include="Themes\SafeMode\Views\Layout.ascx" />
-    <Content Include="Themes\SafeMode\Views\Menu.ascx" />
     <Content Include="Themes\TheAdminClassic\Styles\images\background_header.jpg" />
     <Content Include="Themes\TheAdminClassic\Styles\images\icons.png" />
     <Content Include="Themes\TheAdminClassic\Styles\images\orchardLogo.jpg" />
diff --git a/src/Orchard.Web/Themes/SafeMode/Styles/site.css b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
index 63fa85419..c49327828 100644
--- a/src/Orchard.Web/Themes/SafeMode/Styles/site.css
+++ b/src/Orchard.Web/Themes/SafeMode/Styles/site.css
@@ -29,12 +29,11 @@ body {
 
 h1,h2,h3,h4,h5,h6,legend {font-weight:normal; font-style: normal;}
 
-h1 {font-size: 180%;}
-h2 {font-size: 160%;}
-h3 {font-size: 145%;}
-h4 {font-size: 130%;}
-h5 {font-size: 120%;}
-h6 {font-size: 105%;}
+h1 {font-size: 160%;}
+h2 {font-size: 145%;}
+h3 {font-size: 130%;}
+h4 {font-size: 120%;}
+h5 {font-size: 105%;}
 
 
 
@@ -61,15 +60,16 @@ h6 {font-size: 105%;}
 
 
 #main {
-margin:0 auto;
-width:600px;
+    margin:0 auto;
+    width:600px;
 }
 
 
 /* Forms
 ----------------------------------------------------------*/
 
-input[type="text"], #password {
+input[type="text"], 
+input[type="password"] {
     border:1px solid #DDDEDF;
     display: block;
 }
@@ -80,30 +80,50 @@ form {
 	background:transparent url(images/backgroundVines.gif) no-repeat right bottom;
 }
 
+form h2 {
+    font-size: 105%;
+	margin:20px 20px 0;
+}
+
+fieldset.data {
+    margin-bottom:16px;
+}
+
 fieldset div {
 	margin:20px 20px 32px 20px;
 }
+fieldset.data div {
+	margin:10px 20px 16px 20px;
+}
     
 legend {
-	font-size: 110%;
+	font-size: 105%;
 	font-weight:500;
 	border:none;
-	margin:0 20px;
-	}
+	padding:10px 20px 0;
+}
+fieldset.data legend {
+    padding-bottom:10px;
+}
 
 label {
     display:block;
-    }
+}
 
 label.forcheckbox {
     display:inline;
-    }
+}
 
-input[type="text"], #password {
+fieldset.data span label {
+    margin-top:8px;
+}
+
+input[type="text"],
+input[type="password"] {
     border-color:#ccc;
     padding:4px;
     width:98%;
-    }
+}
     
 button, .button, .button:visited {
 	font-size: 102%;
@@ -125,3 +145,7 @@ button:focus, .button:focus {
     color:#fff;
     text-decoration:none;
 }
+
+html.dyn fieldset.data div span {
+    display:none;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
index 36ade10cd..7883ab83b 100644
--- a/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/SafeMode/Views/Layout.ascx
@@ -1,7 +1,10 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BaseViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
-<%  //todo: (heskew) this should really be using the IResourceManager if it's to be a theme
+<%  //todo: (heskew) this should really be using the IResourceManager if it's to be a theme especially for the jquery dep (w/out needing to copy into this theme...)
+    var jquery = ResolveUrl("~/Core/Themes/Scripts/jquery-1.4.1.js");
+    Model.Zones.AddAction("head:scripts", html =>
+      html.ViewContext.Writer.Write(@"<script type=""text/javascript"" src="""+jquery+@"""></script>"));
     var siteCss = ResolveUrl("../Styles/site.css");
     Model.Zones.AddAction("head:styles", html =>
       html.ViewContext.Writer.Write(@"<link rel=""stylesheet"" type=""text/css"" href="""+siteCss+@"""/>")); %>