diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index 481074ae0..4e33e4a12 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -1,11 +1,8 @@
 @using NzbDrone.Web.Helpers
 @model NzbDrone.Web.Models.IndexerSettingsModel
-
 @section HeaderContent{
     <link rel="stylesheet" type="text/css" href="../../Content/Settings.css" />
-    <link rel="stylesheet" type="text/css" href="../../Content/IndexerSettings.css" />
-
-    <style>
+  <style>
         .indexerPanel
         {
             padding-top: 20px;
@@ -21,155 +18,118 @@
         }
     </style>
 }
-
 @section TitleContent{
-    Settings
+Settings
 }
-
 @section ActionMenu{
     @{Html.RenderPartial("SubMenu");}
 }
-
 @section MainContent{
     <div id="stylized">
-
-    <div class="additionalInfo">
-        NzbDrone checks all Indexers every 15 minutes
-    </div>
-    
-
+        <div class="additionalInfo">
+            NzbDrone checks all Indexers every 15 minutes
+        </div>
         @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
         {
-            <h1>Indexers</h1>
-                <p></p>
+            <h1>
+                Indexers</h1>
+            <p>
+            </p>
 
             @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
-            @{ Html.Telerik().PanelBar()
-            .Name("PanelBar")
-                   //.HtmlAttributes(new { style = "width: 500px; margin: 10px;" })
-            .ExpandMode(PanelBarExpandMode.Single)
-            .SelectedIndex(0)
-            .Items(indexerItem =>
-            {
-                indexerItem.Add()
-                    .Text("NZBs.org")
-                    .ImageUrl("~/Content/Images/Indexers/Nzbs.org.png")
-                    .Content(@<text>
-                        <div class="indexerPanel clearfix">
-                            <label class="labelClass">Enable
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsOrgEnabled)</span>
-                            </label>
-                            @Html.CheckBoxFor(m => m.NzbsOrgEnabled, new { @class = "inputClass checkClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbsOrgUId)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsOrgUId)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbsOrgUId, new { @class = "inputClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbsOrgHash)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsOrgHash)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbsOrgHash, new { @class = "inputClass" })
-                        </div>
-                    </text>);
-                indexerItem.Add()
-                    .Text("NZB Matrix")
-                    .ImageUrl("~/Content/Images/Indexers/NzbMatrix.png")
-                    .Content(@<text>
-                        <div class="indexerPanel clearfix">
-                            <label class="labelClass">Enable
-                            <span class="small">@Html.DescriptionFor(m => m.NzbMatrixEnabled)</span>
-                            </label>
-                            @Html.CheckBoxFor(m => m.NzbMatrixEnabled, new { @class = "inputClass checkClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbMatrixUsername)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbMatrixUsername)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbMatrixUsername, new { @class = "inputClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbMatrixApiKey)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbMatrixApiKey)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbMatrixApiKey, new { @class = "inputClass" })
-                        </div>
-                    </text>);
-                indexerItem.Add()
-                    .Text("NZBsRus")
-                    .ImageUrl("~/Content/Images/Indexers/NzbsRus.png")
-                    .Content(@<text>
-                        <div class="indexerPanel clearfix">
-                            <label class="labelClass">Enable
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsRUsEnabled)</span>
-                            </label>
-                            @Html.CheckBoxFor(m => m.NzbsRUsEnabled, new { @class = "inputClass checkClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbsrusUId)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsrusUId)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbsrusUId, new { @class = "inputClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NzbsrusHash)
-                            <span class="small">@Html.DescriptionFor(m => m.NzbsrusHash)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NzbsrusHash, new { @class = "inputClass" })
-                        </div>
-                    </text>);
-                indexerItem.Add()
-                    .Text("Newzbin")
-                    .ImageUrl("~/Content/Images/Indexers/Newzbin.png")
-                    .Content(@<text>
-                        <div class="indexerPanel clearfix">
-                            <label class="labelClass">Enable
-                            <span class="small">@Html.DescriptionFor(m => m.NewzbinEnabled)</span>
-                            </label>
-                            @Html.CheckBoxFor(m => m.NewzbinEnabled, new { @class = "inputClass checkClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NewzbinUsername)
-                            <span class="small">@Html.DescriptionFor(m => m.NewzbinUsername)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NewzbinUsername, new { @class = "inputClass" })
-
-                            <label class="labelClass">@Html.LabelFor(m => m.NewzbinPassword)
-                            <span class="small">@Html.DescriptionFor(m => m.NewzbinPassword)</span>
-                            </label>
-                            @Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass" })
-                        </div>
-                    </text>);
-                indexerItem.Add()
-                    .Text("Newznzb")
-                    .ImageUrl("~/Content/Images/Indexers/Newznab.png")
-                    .Content(@<text>
-                        <div class="indexerPanel clearfix">
-                            <label class="labelClass">Enable
-                            <span class="small">@Html.DescriptionFor(m => m.NewznabEnabled)</span>
-                            </label>
-                            @Html.CheckBoxFor(m => m.NewznabEnabled, new { @class = "inputClass checkClass" })
-                        </div>
-                        <p></p>
-                        <a id="addItem" href="@Url.Action("AddNewznabProvider", "Settings")">
-                            <img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px" height="20px" />
-                            Add Newznab Provider</a>
-                        <div id="newznabProviders">
-                            @foreach (var provider in Model.NewznabDefinitions)
-                            {
-                                Html.RenderAction("GetNewznabProviderView", provider);
-                            }
-                        </div>
-                    </text>);
-            }).Render(); 
+            <div id="accordion">
+                <h3>
+                    <a href="#">First header</a></h3>
+                <div class="indexerPanel clearfix">
+                    <label class="labelClass">
+                        Enable <span class="small">@Html.DescriptionFor(m => m.NzbsOrgEnabled)</span>
+                    </label>
+                    @Html.CheckBoxFor(m => m.NzbsOrgEnabled, new { @class = "inputClass checkClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbsOrgUId)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbsOrgUId)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbsOrgUId, new { @class = "inputClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbsOrgHash)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbsOrgHash)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbsOrgHash, new { @class = "inputClass" })
+                </div>
+                <h3>
+                    <a href="#">First header</a></h3>
+                <div class="indexerPanel clearfix">
+                    <label class="labelClass">
+                        Enable <span class="small">@Html.DescriptionFor(m => m.NzbMatrixEnabled)</span>
+                    </label>
+                    @Html.CheckBoxFor(m => m.NzbMatrixEnabled, new { @class = "inputClass checkClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbMatrixUsername)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbMatrixUsername)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbMatrixUsername, new { @class = "inputClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbMatrixApiKey)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbMatrixApiKey)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbMatrixApiKey, new { @class = "inputClass" })
+                </div>
+                <h3>
+                    <a href="#">First header</a></h3>
+                <div class="indexerPanel clearfix">
+                    <label class="labelClass">
+                        Enable <span class="small">@Html.DescriptionFor(m => m.NzbsRUsEnabled)</span>
+                    </label>
+                    @Html.CheckBoxFor(m => m.NzbsRUsEnabled, new { @class = "inputClass checkClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbsrusUId)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbsrusUId)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbsrusUId, new { @class = "inputClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NzbsrusHash)
+                        <span class="small">@Html.DescriptionFor(m => m.NzbsrusHash)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NzbsrusHash, new { @class = "inputClass" })
+                </div>
+                <h3>
+                    <a href="#">First header</a></h3>
+                <div class="indexerPanel clearfix">
+                    <label class="labelClass">
+                        Enable <span class="small">@Html.DescriptionFor(m => m.NewzbinEnabled)</span>
+                    </label>
+                    @Html.CheckBoxFor(m => m.NewzbinEnabled, new { @class = "inputClass checkClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NewzbinUsername)
+                        <span class="small">@Html.DescriptionFor(m => m.NewzbinUsername)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NewzbinUsername, new { @class = "inputClass" })
+                    <label class="labelClass">@Html.LabelFor(m => m.NewzbinPassword)
+                        <span class="small">@Html.DescriptionFor(m => m.NewzbinPassword)</span>
+                    </label>
+                    @Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass" })
+                </div>
+                <h3><a href="#">First header</a></h3>
+                <div class="indexerPanel clearfix">
+                    <label class="labelClass">
+                        Enable <span class="small">@Html.DescriptionFor(m => m.NewznabEnabled)</span>
+                    </label>
+                    @Html.CheckBoxFor(m => m.NewznabEnabled, new { @class = "inputClass checkClass" })
+                    <p>
+                    </p>
+                    <a id="addItem" href="@Url.Action("AddNewznabProvider", "Settings")">
+                        <img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px"
+                            height="20px" />
+                        Add Newznab Provider</a>
+                    <div id="newznabProviders">
+                        @foreach (var provider in Model.NewznabDefinitions)
+                        {
+                            Html.RenderAction("GetNewznabProviderView", provider);
+                        }
+                    </div>
+                </div>
+            </div>
+            <br />
+            <button type="submit" id="save_button" disabled="disabled">
+                Save</button>
         }
-</div>
-            <br/>
-            <button type="submit" id="save_button" disabled="disabled">Save</button>
-        }
-
     </div>
 }
-
 @section Scripts{
     <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         $("#addItem").live('click', function () {
             $.ajax({
@@ -182,6 +142,13 @@
             return false;
         });
 
+        $(function () {
+            $("#accordion").accordion({
+                autoHeight: false            });
+        });
+
+
+
         var deleteNewznabProviderUrl = '@Url.Action("DeleteNewznabProvider", "Settings")';
 
         function deleteProvider(id) {
@@ -216,4 +183,4 @@
         }).keyup();
         
     </script>
-}
\ No newline at end of file
+}
diff --git a/NzbDrone.Web/Views/Settings/Notifications.cshtml b/NzbDrone.Web/Views/Settings/Notifications.cshtml
index 9df9297cd..f779f0869 100644
--- a/NzbDrone.Web/Views/Settings/Notifications.cshtml
+++ b/NzbDrone.Web/Views/Settings/Notifications.cshtml
@@ -85,7 +85,7 @@
 @section Scripts{
     <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
 
-    <script>
+    <script type="text/javascript">
         $(function () {
             $("#tabs").tabs();
         });