diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css
index a127d0b38..7acaebe11 100644
--- a/src/Orchard.Web/Content/Admin/css/base.css
+++ b/src/Orchard.Web/Content/Admin/css/base.css
@@ -149,7 +149,7 @@ h2 { font-size:2.4em; } /* 24px */
 h3 { font-size:2.1em; } /* 21px */
 h4 { font-size:1.8em; } /* 18px */
 h5 { font-size:1.6em; } /* 16px */
-h6, p, label, input, select, th, td { font-size:1.5em; } /* 15px */
+h6, p, label, input, .button, .cancel, select, th, td { font-size:1.5em; } /* 15px */
 
 /* ---------- Links ---------- */
 a, a:link {
@@ -300,7 +300,7 @@ div.confirmation, div.warning, div.critical {
 
 fieldset.bulk.actions {
     display:inline;
-    margin:.4em 1.4em -.8em 0;
+    margin:0 1.4em -.7em 0;
 }
 
 label {
@@ -325,7 +325,7 @@ input.large.text, textarea, fieldset {
     clear:both;
 }
 fieldset {
-    margin:.7em 0 .2em;
+    margin:.7em 0 .4em;
 }
 textarea {
     min-height:8em;
@@ -370,10 +370,13 @@ button:focus, .button:focus {
 .button {
     line-height:26px;
 }
+.cancel {
+    margin:0 0 0 .93em;
+}
 #main .manage {
     float:right;
     overflow:hidden;
-    margin:4px 0 4px 4px;
+    margin:3px 0 6px 4px;
 }
 .manage a.button {
     float:right;
@@ -498,11 +501,16 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho
 /* Miscellaneous;
 ----------------------------------------------------------*/
 
-.templateThumbnail{
- width: 124px;
- height: 144px;
- border:1px solid #000;
- margin: 4px 4px 20px 16px;
+/* CMSPages */
+.templates p {
+    overflow:hidden;
+}
+.templates p img {
+    border:1px solid #000;
+    float:left;
+    height:144px;
+    margin:.27em .93em .93em .54em;
+    width:124px;
 }
 
 .previewImage {
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj b/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
index d94eded91..a891228f4 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
@@ -127,11 +127,11 @@
     <Content Include="Views\Admin\BulkDeleteConfirm.aspx" />
     <Content Include="Views\Admin\BulkPublishLater.aspx" />
     <Content Include="Views\Admin\EditorTemplates\inputTextPermalink.ascx" />
+    <Content Include="Views\Admin\EditorTemplates\TemplateDescriptor.ascx" />
     <Content Include="Views\Admin\Export.aspx" />
     <Content Include="Views\Admin\Edit.aspx" />
     <Content Include="Views\Admin\Create.aspx" />
     <Content Include="Views\Admin\EditorTemplates\PageCreateViewModel.ascx" />
-    <Content Include="Views\Admin\EditorTemplates\inputTextArea.ascx" />
     <Content Include="Views\Admin\EditorTemplates\inputTextLarge.ascx" />
     <Content Include="Views\Templates\ExtraUserControl.ascx" />
     <Content Include="Views\Templates\ThreeColumns.aspx" />
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
index e19fe43ff..2c9a2b962 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx
@@ -2,40 +2,23 @@
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates"%>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <% Html.Include("Head"); %>
-    <div class="yui-u">
-        <h2>Change Template</h2>
-        <p class="bottomSpacer">
-            Select your layout from one of the templates below.</p>
-    </div>
-    
-    <div class="yui-u">
-        <%using (Html.BeginForm()) { %>
-        <%= Html.ValidationSummary() %>
-        
-
-<div class="yui-u first">
-
-<ol>
-        <% foreach (TemplateDescriptor template in Model.Templates) {%>
-            <li>
-            <ul>
-            <li class="clearLayout">
-            <h3><%=Html.Encode(template.DisplayName)%></h3>
-            </li>
-            <li>
-            <label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
-            <%=Html.RadioButton("TemplateName", template.Name, Model.TemplateName == template.Name, new{id="TemplateName_" + template.Name})%>
-            Select this template</label>
-            </li>
-            <li class="floatLeft"><img src="<%=Html.Encode(template.Name)%>.gif" alt="<%=Html.Encode(template.DisplayName)%>" class="templateThumbnail" /></li>
-            <li class="floatLeft"><p><%=Html.Encode(template.Description)%></p></li>
-            </ul>
-            </li>
-        <% } %>
-        <li class="clearLayout"><input class="button" type="submit" value="Save Template Change" /><%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "linkButton" })%></li>
-        </ol>
-</div>
-
-        <%}/*EndForm*/%>
-    </div>
+    <h2>Change Template</h2>
+    <p>Select your layout from one of the templates below.</p>    
+    <% using (Html.BeginForm()) {
+        %><%= Html.ValidationSummary() %>
+        <fieldset>
+            <ol class="templates">
+                <% foreach (var template in Model.Templates) {
+                      var t = template; %>
+                    <li>
+                        <%=Html.EditorFor(m => t) %>
+                    </li>
+                <% } %>
+            </ol>
+        </fieldset>
+        <div>
+            <input class="button" type="submit" value="Save Template Change" />
+            <%=Html.ActionLink("Cancel", "Edit", new { Id = ViewContext.RouteData.GetRequiredString("id") }, new { @class = "cancel" })%>
+        </div><%
+       } %>
 <% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
index 93f78f85c..a7734fd6f 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx
@@ -1,15 +1,10 @@
 <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <% Html.Include("Head"); %>
-    <div class="yui-u">
-        <h2>Add a Page</h2>
-        <p class="bottomSpacer">
-            Select your layout from one of the templates below.</p>
-    </div>
-    <div class="yui-u">
-        <%using (Html.BeginForm()) { %>
-        <%= Html.ValidationSummary() %>
-        <%= Html.EditorForModel() %>
-        <%}/*EndForm*/%>
-    </div>
+    <h2>Add a Page</h2>
+    <p>Select your layout from one of the templates below.</p>
+    <%using (Html.BeginForm()) { %>
+        <%=Html.ValidationSummary() %>
+        <%=Html.EditorForModel() %>
+    <% } %>
 <% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
index b7cd526fe..61df9d4c5 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx
@@ -1,32 +1,15 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Orchard.CmsPages.ViewModels.PageCreateViewModel>" %>
+<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PageCreateViewModel>" %>
 <%@ Import Namespace="Orchard.CmsPages.Services.Templates" %>
 <%@ Import Namespace="Orchard.CmsPages.ViewModels" %>
 <%@ Import Namespace="Orchard.Utility" %>
-<%--
-<ol>
-    <%=Html.EditorFor(m=>m.Title, "inputTextLarge") %>
-    <%=Html.EditorFor(m=>m.Slug, "inputTextLarge") %>
-</ol>--%>
-
-<div class="yui-u first">
-        <ol>
-        <% foreach (TemplateDescriptor template in Model.Templates) {%>
+<fieldset>
+    <ol class="templates">
+        <% foreach (var template in Model.Templates) {
+              var t = template; %>
             <li>
-            <ul>
-            <li class="clearLayout">
-            <h3><%=Html.Encode(template.DisplayName)%></h3>
-            </li>
-            <li>
-            <label title="<%=Html.Encode(template.DisplayName)%>" for="TemplateName_<%=template.Name%>">
-            <%=Html.RadioButton("TemplateName", template.Name, Model.TemplateName == template.Name, new{id="TemplateName_" + template.Name})%>
-            Select this template</label>
-            </li>
-            <li class="floatLeft"><img src="<%=Html.Encode(template.Name)%>.gif" alt="<%=Html.Encode(template.DisplayName)%>" class="templateThumbnail" /></li>
-            <li class="floatLeft"><p><%=Html.Encode(template.Description)%></p></li>
-            </ul>
+                <%=Html.EditorFor(m => t) %>
             </li>
         <% } %>
-        <li class="clearLayout"><input class="button" type="submit" value="Create" /></li>
-        </ol>
-
-</div>
+    </ol>
+</fieldset>
+<div><input class="button" type="submit" value="Create" /></div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextArea.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextArea.ascx
deleted file mode 100644
index 67272864f..000000000
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextArea.ascx
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
-<li>
-    <%=Html.LabelForModel() %>
-    <%=Html.TextArea("",Model) %>
-    <%=Html.ValidationMessage("","*") %>
-</li>
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx
index 45259dc97..c418f606f 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
 <fieldset>
     <label class="sub" for="permalink">Permalink: <span>http://localhost/</span></label>
-    <span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> <span class="helperText smallText clearLayout"> &laquo; How to write a permalink. &raquo; </span></span>
+    <span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> <span> &laquo; How to write a permalink. &raquo; </span></span>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
index 3edf9bb9c..b1b9dbcab 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx
@@ -1,19 +1,19 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Collections.Generic.IEnumerable<Orchard.CmsPages.Models.Page>>" %>
+<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Orchard.CmsPages.Models.Page>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html" %>
 <% Html.Include("Head"); %>
-    <div class="yui-g">
-        <h2>Export</h2>
-        <p class="bottomSpacer">
-            Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur
-            adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris
-            et neque eget justo suscipit blandit.</p>
-            <ol><%foreach (var page in Model) { %><li>
-            Page Id <%=page.Id %> 
-            <ol><%foreach (var revision in page.Revisions) { %>
-            <li>Revision <%=revision.Number %> <b><%=revision.Title %></b> ~/<%=revision.Slug %>
-            <br />Modified:<%=revision.ModifiedDate %> 
-            <br />Published:<%=revision.PublishedDate %></li>
-            <%} %></ol>
-            </li><%} %></ol>
-    </div>
+    <h2>Export</h2>
+    <p>Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.</p>
+        <ol>
+            <% foreach (var page in Model) {
+                %><li>Page Id <%=page.Id %> 
+                <ol>
+                    <% foreach (var revision in page.Revisions) {
+                       %><li>Revision <%=revision.Number %> <strong><%=revision.Title %></strong> ~/<%=revision.Slug %>
+                        <br />Modified: <%=revision.ModifiedDate %> 
+                        <br />Published: <%=revision.PublishedDate %></li><%
+                       } %>
+                </ol>
+            </li><%
+               } %>
+        </ol>
 <% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
index ffb23ebc6..4cfdde330 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx
@@ -29,7 +29,7 @@
             </select>
             <input class="button" type="submit" name="submit.Filter" value="Apply"/>
         </fieldset>
-        <p class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %></p>
+        <div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button" }) %></div>
         <fieldset>
             <table summary="This is a table of the PageEntries currently available for use in your application.">
                 <colgroup>
@@ -95,6 +95,6 @@
             }%>
             </table>
         </fieldset>
-        <p class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></p>
+        <div class="manage"><%=Html.ActionLink("Add a page", "Create", new {}, new { @class = "button"}) %></div>
     <% } %>
 <% Html.Include("Foot"); %>
\ No newline at end of file