diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css
index d931b1fa6..f42128c96 100644
--- a/NzbDrone.Web/Content/Settings.css
+++ b/NzbDrone.Web/Content/Settings.css
@@ -9,17 +9,10 @@ p, h1, form, button{border:0; margin:0; padding:0;}
 
 .settingsForm
 {
-    /*margin:0 auto;*/
-    width: 600px;
+    width: 620px;
     padding: 14px;
 }
 
-#stylized
-{
-    /*border:solid 2px #b7ddf2;
-    background:#ebf4fb;*/
-}
-
 #stylized h1
 {
     font-size:20px;
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index c3e7e4c86..09628042c 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -7,26 +7,6 @@
         .indexerPanel
         {
             overflow: auto;
-            padding-top: 20px;
-        }
-        
-        .additionalInfo
-        {
-            float: right;
-            margin-top: 20px;
-            margin-right: 40px;
-            font-size: 120%;
-            font-weight: bold;
-        }
-        
-        #stylized .indexerPanel .labelClass
-        {
-            width: 320px;
-        }
-        
-        #stylized .indexerPanel .small
-        {
-            width: 320px;
         }
     </style>
 }
diff --git a/NzbDrone.Web/Views/Settings/Notifications.cshtml b/NzbDrone.Web/Views/Settings/Notifications.cshtml
index 445dbc8eb..af147d686 100644
--- a/NzbDrone.Web/Views/Settings/Notifications.cshtml
+++ b/NzbDrone.Web/Views/Settings/Notifications.cshtml
@@ -7,9 +7,6 @@
     <style>
         .notifier
         {
-            width: 560px;
-            padding: 5px;
-            margin-left: -8px;
             overflow: auto;
         }
         
@@ -21,18 +18,16 @@
             padding-top: 3px;
         }
         
-        .notifierLine
+        #save_button
         {
-            font-size:11px;
-            color:#666666;
-            margin-bottom:20px;
-            border-bottom:solid 1px #CCCCCD;
-            padding-bottom:10px;
+            margin-top: 10px;
         }
-        
-        #save_button
+
+        #smtpTest
         {
             margin-top: 10px;
+            margin-bottom: 10px;
+            margin-left: 220px;
         }
     </style>
 }
@@ -48,30 +43,22 @@
 @section MainContent{
     <div id="stylized">
         @using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
-        {           
-            <div id="tabs">
-	            <ul>
-		            <li><a href="#tabs-xbmc">XBMC</a></li>
-		            <li><a href="#tabs-smtp">SMTP</a></li>
-                    <li><a href="#tabs-twitter">Twitter</a></li>
-                    <li><a href="#tabs-growl">Growl</a></li>
-                    <li><a href="#tabs-prowl">Prowl</a></li>
-	            </ul>
-	            <div id="tabs-xbmc">
-                    @{Html.RenderPartial("Xbmc", Model);}
-	            </div>
-	            <div id="tabs-smtp">
-		            @{Html.RenderPartial("Smtp", Model);}
-	            </div>
-                <div id="tabs-twitter">
-                    @{Html.RenderPartial("Twitter", Model);}
-	            </div>
-                <div id="tabs-growl">
-                    @{Html.RenderPartial("Growl", Model);}
-	            </div>
-                <div id="tabs-prowl">
-                    @{Html.RenderPartial("Prowl", Model);}
-	            </div>
+        {
+            <div id="accordion">
+                <h3><a href="#">XBMC</a></h3>
+                @{Html.RenderPartial("Xbmc", Model);}
+
+                <h3><a href="#">SMTP</a></h3>
+                @{Html.RenderPartial("Smtp", Model);}
+
+                <h3><a href="#">Twitter</a></h3>
+                @{Html.RenderPartial("Twitter", Model);}
+
+                <h3><a href="#">Growl</a></h3>
+                @{Html.RenderPartial("Growl", Model);}
+
+                <h3><a href="#">Prowl</a></h3>
+                @{Html.RenderPartial("Prowl", Model);}
             </div>
             
             <button type="submit" id="save_button" disabled="disabled">Save</button>
@@ -84,7 +71,76 @@
 
     <script type="text/javascript">
         $(function () {
-            $("#tabs").tabs();
+            $("#accordion").accordion({
+                autoHeight: false
+            });
         });
-	</script>
+        
+        //Twitter
+        getAuthorizationUrl = '../Command/GetTwitterAuthorization';
+        verifyAuthorizationUrl = '../Command/VerifyTwitterAuthorization';
+
+        function requestTwitterAuthorization() {
+            $.ajax({
+                    type: "GET",
+                    url: getAuthorizationUrl,
+                    error: function(req, status, error) {
+                        alert("Sorry! We could get Twitter Authorization at this time. " + error);
+                    },
+                    success: function(data, textStatus, jqXHR) {
+                        if (data.IsMessage)
+                            return false;
+
+                        $('#authorizationRequestToken').val(data.Token);
+                        window.open(data.Url);
+                    }
+                });
+        }
+
+        function verifyTwitterAuthorization() {
+            var token = $('#authorizationRequestToken').val();
+            var verifier = $('#twitterVerification').val();
+
+            $.ajax({
+                    type: "GET",
+                    url: verifyAuthorizationUrl,
+                    data: jQuery.param({ token: token, verifier: verifier }),
+                    error: function(req, status, error) {
+                        alert("Sorry! We could verify Twitter Authorization at this time. " + error);
+                    }
+                });
+            }
+
+            //SMTP
+            function testSmtpSettings() {
+                //Get the variables
+                var server = $('#SmtpServer').val();
+                var port = $('#SmtpPort').val();
+                var ssl = $('#SmtpUseSsl').val();
+                var username = $('#SmtpUsername').val();
+                var password = $('#SmtpPassword').val();
+                var fromAddress = $('#SmtpFromAddress').val();
+                var toAddresses = $('#SmtpToAddresses').val();
+
+                //Send the data!
+                $.ajax({
+                    type: "POST",
+                    url: '../Command/SendTestEmail',
+                    data: jQuery.param({
+                        server: server,
+                        port: port,
+                        ssl: ssl,
+                        username: username,
+                        password: password,
+                        fromAddress: fromAddress,
+                        toAddresses: toAddresses
+                    }),
+                    error: function (req, status, error) {
+                        alert("Sorry! We could send a test email at this time. " + error);
+                    }
+                });
+
+                return false;
+            }
+</script>
 }
diff --git a/NzbDrone.Web/Views/Settings/Smtp.cshtml b/NzbDrone.Web/Views/Settings/Smtp.cshtml
index 72bbda310..533643d2b 100644
--- a/NzbDrone.Web/Views/Settings/Smtp.cshtml
+++ b/NzbDrone.Web/Views/Settings/Smtp.cshtml
@@ -55,49 +55,6 @@
     <span class="small">@Html.DescriptionFor(m => m.SmtpToAddresses)</span>
     </label>
     @Html.TextBoxFor(m => m.SmtpToAddresses, new { @class = "inputClass" })
-</div>
 
-<input type="button" onclick="testSmtpSettings();" value="Test SMTP" id="smtpTest"/>
-
-@*Move this somewhere better*@
-<style>
-    #smtpTest
-    {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        margin-left: 220px;
-    }
-</style>
-
-<script type="text/javascript">
-    function testSmtpSettings() {
-        //Get the variables
-        var server = $('#SmtpServer').val();
-        var port = $('#SmtpPort').val();
-        var ssl = $('#SmtpUseSsl').val();
-        var username = $('#SmtpUsername').val();
-        var password = $('#SmtpPassword').val();
-        var fromAddress = $('#SmtpFromAddress').val();
-        var toAddresses = $('#SmtpToAddresses').val();
-
-        //Send the data!
-        $.ajax({
-            type: "POST",
-            url: '../Command/SendTestEmail',
-            data: jQuery.param({
-                server: server,
-                port: port,
-                ssl: ssl,
-                username: username,
-                password: password,
-                fromAddress: fromAddress,
-                toAddresses: toAddresses
-            }),
-            error: function (req, status, error) {
-                alert("Sorry! We could send a test email at this time. " + error);
-            }
-        });
-
-        return false;
-    }
-</script>
\ No newline at end of file
+    <input type="button" onclick="testSmtpSettings();" value="Test SMTP" id="smtpTest"/>
+</div>
\ No newline at end of file
diff --git a/NzbDrone.Web/Views/Settings/SubMenu.cshtml b/NzbDrone.Web/Views/Settings/SubMenu.cshtml
index f55d5bb49..c46ac03b7 100644
--- a/NzbDrone.Web/Views/Settings/SubMenu.cshtml
+++ b/NzbDrone.Web/Views/Settings/SubMenu.cshtml
@@ -1,8 +1,8 @@
 <ul class="sub-menu">
+    <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
     <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
     <li>@Html.ActionLink("Naming", "Naming", "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>
diff --git a/NzbDrone.Web/Views/Settings/Twitter.cshtml b/NzbDrone.Web/Views/Settings/Twitter.cshtml
index 51079af87..dac35b055 100644
--- a/NzbDrone.Web/Views/Settings/Twitter.cshtml
+++ b/NzbDrone.Web/Views/Settings/Twitter.cshtml
@@ -37,40 +37,4 @@
     <input type="button" onclick="verifyTwitterAuthorization();" value="Test Authorization" class="inputClass"/>
 
     @Html.Hidden("authorizationRequestToken")
-</div>
-
-<script type="text/javascript">
-    getAuthorizationUrl = '../Command/GetTwitterAuthorization';
-    verifyAuthorizationUrl = '../Command/VerifyTwitterAuthorization';
-
-    function requestTwitterAuthorization() {
-        $.ajax({
-                type: "GET",
-                url: getAuthorizationUrl,
-                error: function(req, status, error) {
-                    alert("Sorry! We could get Twitter Authorization at this time. " + error);
-                },
-                success: function(data, textStatus, jqXHR) {
-                    if (data.IsMessage)
-                        return false;
-
-                    $('#authorizationRequestToken').val(data.Token);
-                    window.open(data.Url);
-                }
-            });
-    }
-
-    function verifyTwitterAuthorization() {
-        var token = $('#authorizationRequestToken').val();
-        var verifier = $('#twitterVerification').val();
-
-        $.ajax({
-                type: "GET",
-                url: verifyAuthorizationUrl,
-                data: jQuery.param({ token: token, verifier: verifier }),
-                error: function(req, status, error) {
-                    alert("Sorry! We could verify Twitter Authorization at this time. " + error);
-                }
-            });
-    }
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file