diff --git a/NzbDrone.Web/Content/IndexerSettings.css b/NzbDrone.Web/Content/IndexerSettings.css
index f6032147f..688e89480 100644
--- a/NzbDrone.Web/Content/IndexerSettings.css
+++ b/NzbDrone.Web/Content/IndexerSettings.css
@@ -42,30 +42,36 @@
     padding: 3px;
 }
 
-.providerOptions label
-{
-    margin-top: 10px;
+.providerOptions label {
+    margin-top: 8px;
     margin-left: 3px;
-    margin-right: 25px;
     float: left;
     font-weight: bold;
     width: 50px;
 }
 
-.providerOptions input, .providerOptions select
-{
+.providerOptions input, .providerOptions select {
     font-size: 12px;
     padding: 4px 2px;
     border: solid 1px #aacfe4;
     width: 170px;
-    margin-right: 0px;
+    margin-right: 2px;
+    float: right;
 }
 
-.providerOptions select
-{
+.providerOptions select {
     width: 176px;
 }
 
+.providerOptions div {
+    overflow: hidden;
+    height: 35px;
+}
+
+.providerOptions input[type="checkbox"] {
+    margin-top: 10px;
+}
+
 .deleteProvider
 {
     position: absolute;
diff --git a/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml b/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml
index 4422dec90..573cb8743 100644
--- a/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml
+++ b/NzbDrone.Web/Views/Settings/NewznabProvider.cshtml
@@ -20,27 +20,34 @@
             }
         </div>
         <div class="providerOptions">
-            @Html.Label("Enabled")
-            @Html.CheckBoxFor(m => m.Enable)
-
-            @Html.LabelFor(x => x.Name)
-            @Html.TextBoxFor(x => x.Name, new {@class = "providerName_textbox"})
+            <div>
+                @Html.Label("Enabled")
+                @Html.CheckBoxFor(m => m.Enable)
+            </div>
             
-            @if(!Model.BuiltIn)
-            {
-                @Html.LabelFor(x => x.Url)
-                @Html.TextBoxFor(m => m.Url)
-            }
+            <div>
+                @Html.LabelFor(x => x.Name)
+                @Html.TextBoxFor(x => x.Name, new {@class = "providerName_textbox"})
+            </div>
+            <div>
+                @if(!Model.BuiltIn)
+                {
+                    @Html.LabelFor(x => x.Url)
+                    @Html.TextBoxFor(m => m.Url)
+                }
             
-            else
-            {
-                @Html.LabelFor(x => x.Url)
-                @Html.TextBox("DisabledIndexer", Model.Url, new { disabled = "disabled" })
-                @Html.HiddenFor(m => m.Url)
-            }
-
-            @Html.LabelFor(x => x.ApiKey)
-            @Html.TextBoxFor(m => m.ApiKey)
+                else
+                {
+                    @Html.LabelFor(x => x.Url)
+                    @Html.TextBox("DisabledIndexer", Model.Url, new { disabled = "disabled" })
+                    @Html.HiddenFor(m => m.Url)
+                }
+            </div>
+            
+            <div>
+                @Html.LabelFor(x => x.ApiKey)
+                @Html.TextBoxFor(m => m.ApiKey)
+            </div>
         </div>
 
         @Html.HiddenFor(x => x.Id, new {@class = "newznabProviderId"})