diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs
index cedb4db46..499ae1b9f 100644
--- a/NzbDrone.Web/Controllers/SharedController.cs
+++ b/NzbDrone.Web/Controllers/SharedController.cs
@@ -27,11 +27,5 @@ namespace NzbDrone.Web.Controllers
 
             return PartialView(new FooterModel { BuildTime = _enviromentProvider.BuildDateTime, Version = _enviromentProvider.Version });
         }
-
-        [ChildActionOnly]
-        public ActionResult LocalSearch()
-        {
-            return PartialView();
-        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
index 26bf5e8f2..bcb95299a 100644
--- a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
+++ b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
@@ -15,7 +15,7 @@
 }
 
 @section TitleContent{
-    Settings
+    Settings > Naming
 }
 
 @section ActionMenu{
@@ -27,10 +27,6 @@
     @using (Html.BeginForm("SaveEpisodeSorting", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
     {
         @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
-
-        <h1>Episode Sorting</h1>
-        <p></p>
-    
         <label class="labelClass">@Html.LabelFor(m => m.SeriesName)
         <span class="small">@Html.DescriptionFor(m => m.SeriesName)</span>
         </label>
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index 3fabdd09b..c3e7e4c86 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -31,7 +31,7 @@
     </style>
 }
 @section TitleContent{
-Settings
+Settings > Indexers
 }
 @section ActionMenu{
     @{Html.RenderPartial("SubMenu");}
@@ -42,11 +42,6 @@ Settings
     <div id="stylized">
         @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
         {
-            <h1>
-                Indexers</h1>
-            <p>
-            </p>
-
             @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
             <div id="accordion">
                 <h3>
@@ -120,9 +115,10 @@ Settings
                         Enable <span class="small">@Html.DescriptionFor(m => m.NewznabEnabled)</span>
                     </label>
                     @Html.CheckBoxFor(m => m.NewznabEnabled, new { @class = "inputClass checkClass" })
-                    <br/>
-                    <br/>
-                    <p></p>
+                    <br />
+                    <br />
+                    <p>
+                    </p>
                     <a id="addItem" href="@Url.Action("AddNewznabProvider", "Settings")">
                         <img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px"
                             height="20px" />
diff --git a/NzbDrone.Web/Views/Settings/Notifications.cshtml b/NzbDrone.Web/Views/Settings/Notifications.cshtml
index 2f559d1a8..445dbc8eb 100644
--- a/NzbDrone.Web/Views/Settings/Notifications.cshtml
+++ b/NzbDrone.Web/Views/Settings/Notifications.cshtml
@@ -38,7 +38,7 @@
 }
 
 @section TitleContent{
-    Settings
+    Settings > Notifications
 }
 
 @section ActionMenu{
@@ -48,10 +48,7 @@
 @section MainContent{
     <div id="stylized">
         @using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
-        {
-            <h1>Notifications</h1>
-            <p></p>
-            
+        {           
             <div id="tabs">
 	            <ul>
 		            <li><a href="#tabs-xbmc">XBMC</a></li>
diff --git a/NzbDrone.Web/Views/Settings/Quality.cshtml b/NzbDrone.Web/Views/Settings/Quality.cshtml
index c586e1f14..5d69c5322 100644
--- a/NzbDrone.Web/Views/Settings/Quality.cshtml
+++ b/NzbDrone.Web/Views/Settings/Quality.cshtml
@@ -5,7 +5,7 @@
     <link href="../../Content/QualitySettings.css" rel="stylesheet" type="text/css" />
 }
 @section TitleContent{
-Settings
+Settings > Quality
 }
 @section ActionMenu{
     @{Html.RenderPartial("SubMenu");}
@@ -15,10 +15,6 @@ Settings
         @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
         {
             <div id="top" class="settingsForm">
-                <h1>
-                    Quality</h1>
-                <p>
-                </p>
                 <label class="labelClass">@Html.LabelFor(m => m.DefaultQualityProfileId)
                     <span class="small">@Html.DescriptionFor(m => m.DefaultQualityProfileId)</span>
                 </label>
diff --git a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
index 2894f7e78..40f10931c 100644
--- a/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
+++ b/NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
@@ -6,7 +6,7 @@
 }
 
 @section TitleContent{
-    Settings
+    Settings > Sabnzbd
 }
 
 @section ActionMenu{
@@ -18,9 +18,6 @@
     
     @using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
     {
-        <h1>SABnzbd</h1>
-        <p></p>
-    
         <label class="labelClass">Auto-Configure
         <span class="small">If access to SABnzbd doesn't require a username + password and is on the same system as NzbDrone, you can auto-configure it</span>
         </label>
diff --git a/NzbDrone.Web/Views/Settings/SubMenu.cshtml b/NzbDrone.Web/Views/Settings/SubMenu.cshtml
index 55860bb7e..48ffe01ac 100644
--- a/NzbDrone.Web/Views/Settings/SubMenu.cshtml
+++ b/NzbDrone.Web/Views/Settings/SubMenu.cshtml
@@ -1,10 +1,10 @@
 <ul class="sub-menu">
-        <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
-        <li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
-        <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
-        <li>@Html.ActionLink("Episode Sorting", "EpisodeSorting", "Settings")</li>
-        <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
-        <li>@Html.ActionLink("System", "System", "Settings")</li>
-    </ul>
-
-<div style="margin-bottom: 10px"></div>
\ No newline at end of file
+    <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
+    <li>@Html.ActionLink("Naming", "EpisodeSorting", "Settings")</li>
+    <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
+    <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
+    <li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
+    <li>@Html.ActionLink("System", "System", "Settings")</li>
+</ul>
+<div style="margin-bottom: 10px">
+</div>
diff --git a/NzbDrone.Web/Views/Settings/System.cshtml b/NzbDrone.Web/Views/Settings/System.cshtml
index 903ccc282..1c4ce6b99 100644
--- a/NzbDrone.Web/Views/Settings/System.cshtml
+++ b/NzbDrone.Web/Views/Settings/System.cshtml
@@ -6,7 +6,7 @@
 }
 
 @section TitleContent{
-    Settings
+    Settings > System
 }
 
 @section ActionMenu{
@@ -18,10 +18,6 @@
     @using (Html.BeginForm("SaveSystem", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
     {
         @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
-
-        <h1>System</h1>
-        <p></p>
-    
         <label class="labelClass">@Html.LabelFor(m => m.LaunchBrowser)
         <span class="small">@Html.DescriptionFor(m => m.LaunchBrowser)</span>
         </label>