diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index b2975a1ad..15975cdd1 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -204,7 +204,6 @@
     <Content Include="Themes\Views\Admin\Install.aspx" />
     <Content Include="Themes\Views\Header.ascx" />
     <Content Include="Themes\Views\Document.aspx" />
-    <Content Include="Themes\Views\EditorTemplates\Parts\Themes.SiteSettings.ascx" />
     <Content Include="Themes\Views\HeadPreload.ascx" />
     <Content Include="Themes\Views\Layout.ascx" />
     <Content Include="Themes\Views\Messages.ascx" />
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
index ca17cb51e..92deb3ffa 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
@@ -1,22 +1,22 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<SettingsIndexViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
-<h1><%=Html.TitleForPage(T("Edit Settings").ToString())%></h1>
+<h1><%=Html.TitleForPage(T("Manage Settings").ToString())%></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
 <%= Html.ValidationSummary() %>
 <fieldset>
     <legend><%=_Encoded("Global Settings")%></legend>
     <div>
-        <%=Html.LabelFor(x=>x.SiteName) %>
-        <%=Html.EditorFor(x=>x.SiteName) %>
+        <label for="SiteName"><%=_Encoded("Site name") %></label>
+        <%=Html.EditorFor(m => m.SiteName) %>
         <%=Html.ValidationMessage("SiteName", "*") %>
     </div>
     <div>
-        <%=Html.LabelFor(x => x.PageTitleSeparator) %>
+        <label for="PageTitleSeparator"><%=_Encoded("Page title separator") %></label>
         <%=Html.EditorFor(x => x.PageTitleSeparator)%>
         <%=Html.ValidationMessage("PageTitleSeparator", "*")%>
     </div>
     <div>
-        <%=Html.LabelFor(x => x.SuperUser) %>
+        <label for="SuperUser"><%=_Encoded("Super user") %></label>
         <%=Html.EditorFor(x=>x.SuperUser) %>
         <%=Html.ValidationMessage("SuperUser", "*") %>
     </div>
diff --git a/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs b/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs
index 0b71ec127..eaa0d6626 100644
--- a/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs
+++ b/src/Orchard.Web/Core/Themes/Models/ThemeSiteSettingsHandler.cs
@@ -10,7 +10,6 @@ namespace Orchard.Core.Themes.Models {
             _themeSiteSettingsRepository = repository;
             Filters.Add(new ActivatingFilter<ThemeSiteSettings>("site"));
             Filters.Add(StorageFilter.For(_themeSiteSettingsRepository));
-            Filters.Add(new TemplateFilterForRecord<ThemeSiteSettingsRecord>("ThemeSiteSettings", "Parts/Themes.SiteSettings"));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx b/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
deleted file mode 100644
index eee660137..000000000
--- a/src/Orchard.Web/Core/Themes/Views/EditorTemplates/Parts/Themes.SiteSettings.ascx
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ThemeSiteSettingsRecord>" %>
-<%@ Import Namespace="Orchard.Core.Themes.Records"%>
-<fieldset>
-    <legend><%=_Encoded("Themes")%></legend>
-    <div>
-        <%= Html.LabelFor(x=>x.CurrentThemeName) %>
-        <%= Html.EditorFor(x=>x.CurrentThemeName) %>
-        <%= Html.ValidationMessage("CurrentThemeName", "*")%>
-    </div>
-</fieldset>
\ No newline at end of file