diff --git a/deluge/ui/web/js/deluge-all/add/AddWindow.js b/deluge/ui/web/js/deluge-all/add/AddWindow.js
index cf32b5c37..2996ace5e 100644
--- a/deluge/ui/web/js/deluge-all/add/AddWindow.js
+++ b/deluge/ui/web/js/deluge-all/add/AddWindow.js
@@ -96,7 +96,7 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
         this.add({
             region: 'center',
             items: [this.list],
-            margins: '5 5 5 5',
+            border: false,
             bbar: new Ext.Toolbar({
                 items: [{
                     id: 'fileUploadForm',
diff --git a/deluge/ui/web/js/deluge-all/add/OptionsPanel.js b/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
index 811911240..8cb19273d 100644
--- a/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
+++ b/deluge/ui/web/js/deluge-all/add/OptionsPanel.js
@@ -15,7 +15,7 @@ Deluge.add.OptionsPanel = Ext.extend(Ext.TabPanel, {
 
     // layout options
     region: 'south',
-    margins: '5 5 5 5',
+    border: false,
     activeTab: 0,
     height: 265,
 
diff --git a/deluge/ui/web/js/deluge-all/add/OptionsTab.js b/deluge/ui/web/js/deluge-all/add/OptionsTab.js
index 9d2e8d854..c111bc98a 100644
--- a/deluge/ui/web/js/deluge-all/add/OptionsTab.js
+++ b/deluge/ui/web/js/deluge-all/add/OptionsTab.js
@@ -15,12 +15,11 @@ Ext.ns('Deluge.add');
  */
 Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 
-    title:  _('Options'),
+    title: _('Options'),
     height: 170,
-
-    border:     false,
-    bodyStyle:  'padding: 5px',
-    disabled:   true,
+    border: false,
+    bodyStyle: 'padding: 5px',
+    disabled: true,
     labelWidth: 1,
 
     initComponent: function() {
@@ -36,7 +35,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
             defaultType: 'textfield',
             labelWidth: 1,
             fieldLabel: '',
-            style: 'padding-bottom: 5px; margin-bottom: 0px;'
+            style: 'padding: 5px 0; margin-bottom: 0;'
         });
         this.optionsManager.bind('download_location', fieldset.add({
             fieldLabel: '',
@@ -52,7 +51,7 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
             defaultType: 'togglefield',
             labelWidth: 1,
             fieldLabel: '',
-            style: 'padding-bottom: 5px; margin-bottom: 0px;'
+            style: 'padding: 5px 0; margin-bottom: 0;'
         });
         var field = fieldset.add({
             fieldLabel: '',
@@ -72,10 +71,11 @@ Deluge.add.OptionsTab = Ext.extend(Ext.form.FormPanel, {
             title: _('Bandwidth'),
             border: false,
             autoHeight: true,
-            bodyStyle: 'margin-left: 7px',
+            bodyStyle: 'padding: 2px 5px',
             labelWidth: 105,
             width: 200,
-            defaultType: 'spinnerfield'
+            defaultType: 'spinnerfield',
+            style: 'padding-right: 10px;'
         });
         this.optionsManager.bind('max_download_speed', fieldset.add({
             fieldLabel: _('Max Down Speed'),