diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
index a38263af2..d8a8e74ce 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
@@ -9,6 +9,5 @@
     <%using (Html.BeginForm()) { %>
         <%= Html.ValidationSummary() %>
         <%= Html.EditorForModel() %>
-        <fieldset><input class="button" type="submit" value="Create" /></fieldset>
     <% } %>
 <% Html.Include("Foot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx
index 6dc642730..b27024a80 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Index.aspx
@@ -1,13 +1,12 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsIndexViewModel>" %>
+<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<TagsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
-    <div class="yui-g">
-						<h2 class="separator">Tags</h2>
-						<%=Html.ValidationSummary() %>
-                        <% foreach (var tag in Model.Tags) { %>
-                            <%=Html.ActionLink(tag.TagName, "Search", new {tagName = tag.TagName}, new {@class="floatRight topSpacer"}) %>
-                            &nbsp;
-                        <% } %>
-	</div>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<%-- todo: (heskew) make master-less when we get into theming --%>
+<asp:Content ContentPlaceHolderID="MainContent" runat="server">
+    <h2>Tags</h2>
+    <%=Html.ValidationSummary() %>
+    <% foreach (var tag in Model.Tags) { %>
+        <%=Html.ActionLink(tag.TagName, "Search", new {tagName = tag.TagName}, new {@class="floatRight topSpacer"}) %>
+        &nbsp;
+    <% } %>
+</asp:Content>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx
index b142d7e14..a118bb04d 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Home/Search.aspx
@@ -1,16 +1,11 @@
-<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<TagsSearchViewModel>" %>
+<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<TagsSearchViewModel>" %>
 <%@ Import Namespace="Orchard.Models"%>
 <%@ Import Namespace="Orchard.Tags.ViewModels"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
-<% Html.Include("Header"); %>
-    <% Html.BeginForm(); %>
-    <div class="yui-g">
-						<h2 class="separator">List of contents tagged with <%= Model.TagName %></h2>
-						<%=Html.ValidationSummary() %>
-			                <% foreach (var contentItem in Model.Contents) { %>
-			                <%=Html.ItemDisplayLink(contentItem)%>
-			                &nbsp;
-                            <% } %>
-	</div>
-	<% Html.EndForm(); %>
-<% Html.Include("Footer"); %>
\ No newline at end of file
+<%-- todo: (heskew) make master-less when we get into theming --%>
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
+    <h2>List of contents tagged with <%= Model.TagName %></h2><%
+    foreach (var contentItem in Model.Contents) { %>
+    <%=Html.ItemDisplayLink(contentItem)%><%
+    } %>
+</asp:Content>
\ No newline at end of file