diff --git a/deluge/ui/web/js/deluge-all/.build b/deluge/ui/web/js/deluge-all/.build
index 0887ff2ed..f40c64251 100644
--- a/deluge/ui/web/js/deluge-all/.build
+++ b/deluge/ui/web/js/deluge-all/.build
@@ -32,7 +32,6 @@ add_file "Deluge.Preferences.Other.js"
 add_file "Deluge.Preferences.Daemon.js"
 add_file "Deluge.Preferences.Queue.js"
 add_file "Deluge.Preferences.Proxy.js"
-add_file "Deluge.Preferences.Notification.js"
 add_file "Deluge.Preferences.Cache.js"
 add_file "Deluge.Preferences.Plugins.js"
 add_file "Deluge.Remove.js"
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js b/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
index 2887995d1..302a8d687 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
@@ -77,7 +77,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 		 */
 		this.fieldsets.bandwidth = this.add({
 			xtype: 'fieldset',
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			bodyStyle: 'padding: 5px',
 			
 			layout: 'table',
@@ -228,7 +228,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 		});
 		
 		this.fields.stop_ratio = this.fieldsets.queue.add({
-			xtype: 'uxspinner',
+			xtype: 'spinnerfield',
 			id: 'stop_ratio',
 			name: 'stop_ratio',
 			disabled: true,
@@ -271,7 +271,7 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 			border: false,
 			autoHeight: true,
 			style: 'margin-left: 5px',
-			width: 200
+			width: 210
 		});
 		
 		this.fieldsets.general = this.rightColumn.add({
@@ -306,24 +306,15 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 		 * Buttons
 		 */
 		this.buttonPanel = this.rightColumn.add({
-			layout: 'column',
+			layout: 'hbox',
 			xtype: 'panel',
 			border: false
 		});
 		
-		// The buttons below are required to be added to a panel
-		// first as simply adding them to the column layout throws an
-		// error c.getSize() does not exist. This could be intentional
-		// or it may possible be a bug in ext-js. Take care when upgrading
-		// to ext-js 3.0.
-		
 		/*
 		 * Edit Trackers button
 		 */
 		this.buttonPanel.add({
-			xtype: 'panel',
-			border: false
-		}).add({
 			id: 'edit_trackers',
 			xtype: 'button',
 			text: _('Edit Trackers'),
@@ -339,9 +330,6 @@ Ext.deluge.details.OptionsTab = Ext.extend(Ext.form.FormPanel, {
 		 * Apply button
 		 */
 		this.buttonPanel.add({
-			xtype: 'panel',
-			border: false
-		}).add({
 			id: 'apply',
 			xtype: 'button',
 			text: _('Apply'),
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
index e3b265609..f3f28f96e 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
@@ -52,7 +52,7 @@ Ext.deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
 			border: false,
 			title: _('Global Bandwidth Usage'),
 			labelWidth: 200,
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			style: 'margin-bottom: 0px; padding-bottom: 0px;',
 			autoHeight: true
 		});
@@ -157,7 +157,7 @@ Ext.deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
 			border: false,
 			title: _('Per Torrent Bandwidth Usage'),
 			style: 'margin-bottom: 0px; padding-bottom: 0px;',
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			labelWidth: 200,
 			autoHeight: true
 		});
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
index a974bf6f2..a6185ff83 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
@@ -53,7 +53,7 @@ Ext.deluge.preferences.Cache = Ext.extend(Ext.form.FormPanel, {
 			title: _('Settings'),
 			autoHeight: true,
 			labelWidth: 180,
-			defaultType: 'uxspinner'
+			defaultType: 'spinnerfield'
 		});
 		optMan.bind('cache_size', fieldset.add({
 			fieldLabel: _('Cache Size (16 KiB Blocks)'),
@@ -81,4 +81,4 @@ Ext.deluge.preferences.Cache = Ext.extend(Ext.form.FormPanel, {
 		}));
 	}
 });
-Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache());
\ No newline at end of file
+Deluge.Preferences.addPage(new Ext.deluge.preferences.Cache());
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
index 03a76a0c3..d39b06cfd 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
@@ -52,7 +52,7 @@ Ext.deluge.preferences.Daemon = Ext.extend(Ext.form.FormPanel, {
 			border: false,
 			title: _('Port'),
 			autoHeight: true,
-			defaultType: 'uxspinner'
+			defaultType: 'spinnerfield'
 		});
 		optMan.bind('daemon_port', fieldset.add({
 			fieldLabel: _('Daemon port'),
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
index fc9b12543..d517a1057 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
@@ -99,12 +99,13 @@ Ext.deluge.preferences.Downloads = Ext.extend(Ext.FormPanel, {
 			labelWidth: 1,
 			defaultType: 'radiogroup',
 			style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
-			width: 240
+			width: 240,
 		});
 		optMan.bind('compact_allocation', fieldset.add({
 			name: 'compact_allocation',
 			width: 200,
 			labelSeparator: '',
+			disabled: true,
 			defaults: {
 				width: 80,
 				height: 22,
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
index 8606e144f..44346b7aa 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
@@ -131,7 +131,7 @@ Ext.deluge.preferences.Interface = Ext.extend(Ext.form.FormPanel, {
 			style: 'margin-top: 0px; padding-top: 0px; margin-bottom: 0px; padding-bottom: 0px',
 			autoHeight: true,
 			labelWidth: 110,
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			defaults: {
 				width: 80,
 			}
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
deleted file mode 100644
index 2024d8dae..000000000
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Notification.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*Deluge.Preferences.addPage(_('Notification'), {
-	border: false,
-	xtype: 'form',
-	layout: 'form',
-	items: []
-});
-*/
\ No newline at end of file
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
index a60b558c4..bf75b3697 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
@@ -75,7 +75,7 @@ Ext.deluge.preferences.ProxyField = Ext.extend(Ext.form.FieldSet, {
 		});
 		
 		this.port = this.add({
-			xtype: 'uxspinner',
+			xtype: 'spinnerfield',
 			name: 'port',
 			fieldLabel: _('Port'),
 			width: 80,
@@ -230,4 +230,4 @@ Ext.deluge.preferences.Proxy = Ext.extend(Ext.form.FormPanel, {
 		this.fireEvent('change', this, newValues, oldValues);
 	}
 });
-Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy());
\ No newline at end of file
+Deluge.Preferences.addPage(new Ext.deluge.preferences.Proxy());
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
index 586c2ecbc..4c6c3bf24 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
@@ -70,7 +70,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
 			title: _('Active Torrents'),
 			autoHeight: true,
 			labelWidth: 150,
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			style: 'margin-bottom: 0px; padding-bottom: 0px;',
 		});
 		optMan.bind('max_active_limit', fieldset.add({
@@ -123,7 +123,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
 			title: _('Seeding'),
 			autoHeight: true,
 			labelWidth: 150,
-			defaultType: 'uxspinner',
+			defaultType: 'spinnerfield',
 			style: 'margin-bottom: 0px; padding-bottom: 0px; margin-top: 0; padding-top: 0;',
 		});
 		optMan.bind('share_ratio_limit', fieldset.add({
@@ -186,7 +186,7 @@ Ext.deluge.preferences.Queue = Ext.extend(Ext.form.FormPanel, {
 		optMan.bind('stop_seed_at_ratio', this.stopAtRatio);
 		
 		this.stopRatio = fieldset.add({
-			xtype: 'uxspinner',
+			xtype: 'spinnerfield',
 			name: 'stop_seed_ratio',
 			ctCls: 'x-deluge-indent-checkbox',
 			disabled: true,
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 471374f73..3af8d9485 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -352,25 +352,24 @@ class TopLevel(resource.Resource):
         "/js/deluge-all/Deluge.Details.Details.js",
         "/js/deluge-all/Deluge.Details.Files.js",
         "/js/deluge-all/Deluge.Details.Peers.js",
-        #"/js/deluge-all/Deluge.Details.Options.js",
+        "/js/deluge-all/Deluge.Details.Options.js",
         "/js/deluge-all/Deluge.EditTrackers.js",
         "/js/deluge-all/Deluge.Keys.js",
         "/js/deluge-all/Deluge.Login.js",
         "/js/deluge-all/Deluge.MoveStorage.js",
         "/js/deluge-all/Deluge.Plugin.js",
-        #"/js/deluge-all/Deluge.Preferences.js",
-        #"/js/deluge-all/Deluge.Preferences.Downloads.js",
+        "/js/deluge-all/Deluge.Preferences.js",
+        "/js/deluge-all/Deluge.Preferences.Downloads.js",
         #"/js/deluge-all/Deluge.Preferences.Network.js",
-        #"/js/deluge-all/Deluge.Preferences.Encryption.js",
-        #"/js/deluge-all/Deluge.Preferences.Bandwidth.js",
-        #"/js/deluge-all/Deluge.Preferences.Interface.js",
-        #"/js/deluge-all/Deluge.Preferences.Other.js",
-        #"/js/deluge-all/Deluge.Preferences.Daemon.js",
-        #"/js/deluge-all/Deluge.Preferences.Queue.js",
-        #"/js/deluge-all/Deluge.Preferences.Proxy.js",
-        #"/js/deluge-all/Deluge.Preferences.Notification.js",
-        #"/js/deluge-all/Deluge.Preferences.Cache.js",
-        #"/js/deluge-all/Deluge.Preferences.Plugins.js",
+        "/js/deluge-all/Deluge.Preferences.Encryption.js",
+        "/js/deluge-all/Deluge.Preferences.Bandwidth.js",
+        "/js/deluge-all/Deluge.Preferences.Interface.js",
+        "/js/deluge-all/Deluge.Preferences.Other.js",
+        "/js/deluge-all/Deluge.Preferences.Daemon.js",
+        "/js/deluge-all/Deluge.Preferences.Queue.js",
+        "/js/deluge-all/Deluge.Preferences.Proxy.js",
+        "/js/deluge-all/Deluge.Preferences.Cache.js",
+        "/js/deluge-all/Deluge.Preferences.Plugins.js",
         "/js/deluge-all/Deluge.Remove.js",
         "/js/deluge-all/Deluge.Sidebar.js",
         "/js/deluge-all/Deluge.Statusbar.js",