diff --git a/src/webui/prefjson.cpp b/src/webui/prefjson.cpp
index 783197d8d..be6c77003 100644
--- a/src/webui/prefjson.cpp
+++ b/src/webui/prefjson.cpp
@@ -50,12 +50,14 @@ QByteArray prefjson::getPreferences()
 {
     const Preferences* const pref = Preferences::instance();
     QVariantMap data;
-    // UI
-    data["locale"] = pref->getLocale();
+
     // Downloads
+    // Hard Disk
     data["save_path"] = Utils::Fs::toNativePath(pref->getSavePath());
     data["temp_path_enabled"] = pref->isTempPathEnabled();
     data["temp_path"] = Utils::Fs::toNativePath(pref->getTempPath());
+    data["preallocate_all"] = pref->preAllocateAllFiles();
+    data["incomplete_files_ext"] = pref->useIncompleteFilesExtension();
     QVariantList l;
     foreach (const QString& s, pref->getScanDirs()) {
         l << Utils::Fs::toNativePath(s);
@@ -70,6 +72,7 @@ QByteArray prefjson::getPreferences()
     data["export_dir"] = Utils::Fs::toNativePath(pref->getTorrentExportDir());
     data["export_dir_fin_enabled"] = pref->isFinishedTorrentExportEnabled();
     data["export_dir_fin"] = Utils::Fs::toNativePath(pref->getFinishedTorrentExportDir());
+    // Email notification upon download completion
     data["mail_notification_enabled"] = pref->isMailNotificationEnabled();
     data["mail_notification_email"] = pref->getMailNotificationEmail();
     data["mail_notification_smtp"] = pref->getMailNotificationSMTP();
@@ -77,48 +80,21 @@ QByteArray prefjson::getPreferences()
     data["mail_notification_auth_enabled"] = pref->getMailNotificationSMTPAuth();
     data["mail_notification_username"] = pref->getMailNotificationSMTPUsername();
     data["mail_notification_password"] = pref->getMailNotificationSMTPPassword();
+    // Run an external program on torrent completion
     data["autorun_enabled"] = pref->isAutoRunEnabled();
     data["autorun_program"] = Utils::Fs::toNativePath(pref->getAutoRunProgram());
-    data["preallocate_all"] = pref->preAllocateAllFiles();
-    data["queueing_enabled"] = pref->isQueueingSystemEnabled();
-    data["max_active_downloads"] = pref->getMaxActiveDownloads();
-    data["max_active_torrents"] = pref->getMaxActiveTorrents();
-    data["max_active_uploads"] = pref->getMaxActiveUploads();
-    data["max_ratio_enabled"] = (pref->getGlobalMaxRatio() >= 0.);
-    data["max_ratio"] = pref->getGlobalMaxRatio();
-    data["max_ratio_act"] = pref->getMaxRatioAction();
-    data["dont_count_slow_torrents"] = pref->ignoreSlowTorrentsForQueueing();
-    data["incomplete_files_ext"] = pref->useIncompleteFilesExtension();
+
     // Connection
+    // Listening Port
     data["listen_port"] = pref->getSessionPort();
     data["upnp"] = pref->isUPnPEnabled();
     data["random_port"] = pref->useRandomPort();
-    data["dl_limit"] = pref->getGlobalDownloadLimit();
-    data["up_limit"] = pref->getGlobalUploadLimit();
+    // Connections Limits
     data["max_connec"] = pref->getMaxConnecs();
     data["max_connec_per_torrent"] = pref->getMaxConnecsPerTorrent();
     data["max_uploads"] = pref->getMaxUploads();
     data["max_uploads_per_torrent"] = pref->getMaxUploadsPerTorrent();
-    data["enable_utp"] = pref->isuTPEnabled();
-    data["limit_utp_rate"] = pref->isuTPRateLimited();
-    data["limit_tcp_overhead"] = pref->includeOverheadInLimits();
-    data["alt_dl_limit"] = pref->getAltGlobalDownloadLimit();
-    data["alt_up_limit"] = pref->getAltGlobalUploadLimit();
-    data["scheduler_enabled"] = pref->isSchedulerEnabled();
-    const QTime start_time = pref->getSchedulerStartTime();
-    data["schedule_from_hour"] = start_time.hour();
-    data["schedule_from_min"] = start_time.minute();
-    const QTime end_time = pref->getSchedulerEndTime();
-    data["schedule_to_hour"] = end_time.hour();
-    data["schedule_to_min"] = end_time.minute();
-    data["scheduler_days"] = pref->getSchedulerDays();
-    // Bittorrent
-    data["dht"] = pref->isDHTEnabled();
-    data["pex"] = pref->isPeXEnabled();
-    data["lsd"] = pref->isLSDEnabled();
-    data["encryption"] = pref->getEncryptionSetting();
-    data["anonymous_mode"] = pref->isAnonymousModeEnabled();
-    // Proxy
+    // Proxy Server
     data["proxy_type"] = pref->getProxyType();
     data["proxy_ip"] = pref->getProxyIp();
     data["proxy_port"] = pref->getProxyPort();
@@ -129,19 +105,61 @@ QByteArray prefjson::getPreferences()
     data["proxy_auth_enabled"] = pref->isProxyAuthEnabled();
     data["proxy_username"] = pref->getProxyUsername();
     data["proxy_password"] = pref->getProxyPassword();
-    // IP Filter
+    // IP Filtering
     data["ip_filter_enabled"] = pref->isFilteringEnabled();
     data["ip_filter_path"] = Utils::Fs::toNativePath(pref->getFilter());
     data["ip_filter_trackers"] = pref->isFilteringTrackerEnabled();
+
+    // Speed
+    // Global Rate Limits
+    data["dl_limit"] = pref->getGlobalDownloadLimit();
+    data["up_limit"] = pref->getGlobalUploadLimit();
+    data["enable_utp"] = pref->isuTPEnabled();
+    data["limit_utp_rate"] = pref->isuTPRateLimited();
+    data["limit_tcp_overhead"] = pref->includeOverheadInLimits();
+    data["alt_dl_limit"] = pref->getAltGlobalDownloadLimit();
+    data["alt_up_limit"] = pref->getAltGlobalUploadLimit();
+    // Scheduling
+    data["scheduler_enabled"] = pref->isSchedulerEnabled();
+    const QTime start_time = pref->getSchedulerStartTime();
+    data["schedule_from_hour"] = start_time.hour();
+    data["schedule_from_min"] = start_time.minute();
+    const QTime end_time = pref->getSchedulerEndTime();
+    data["schedule_to_hour"] = end_time.hour();
+    data["schedule_to_min"] = end_time.minute();
+    data["scheduler_days"] = pref->getSchedulerDays();
+
+    // Bittorrent
+    // Privacy
+    data["dht"] = pref->isDHTEnabled();
+    data["pex"] = pref->isPeXEnabled();
+    data["lsd"] = pref->isLSDEnabled();
+    data["encryption"] = pref->getEncryptionSetting();
+    data["anonymous_mode"] = pref->isAnonymousModeEnabled();
+    // Torrent Queueing
+    data["queueing_enabled"] = pref->isQueueingSystemEnabled();
+    data["max_active_downloads"] = pref->getMaxActiveDownloads();
+    data["max_active_torrents"] = pref->getMaxActiveTorrents();
+    data["max_active_uploads"] = pref->getMaxActiveUploads();
+    data["dont_count_slow_torrents"] = pref->ignoreSlowTorrentsForQueueing();
+    // Share Ratio Limiting
+    data["max_ratio_enabled"] = (pref->getGlobalMaxRatio() >= 0.);
+    data["max_ratio"] = pref->getGlobalMaxRatio();
+    data["max_ratio_act"] = pref->getMaxRatioAction();
+
     // Web UI
+    // Language
+    data["locale"] = pref->getLocale();
+    // HTTP Server
     data["web_ui_port"] = pref->getWebUiPort();
-    data["web_ui_username"] = pref->getWebUiUsername();
-    data["web_ui_password"] = pref->getWebUiPassword();
-    data["bypass_local_auth"] = !pref->isWebUiLocalAuthEnabled();
     data["use_https"] = pref->isWebUiHttpsEnabled();
     data["ssl_key"] = QString::fromLatin1(pref->getWebUiHttpsKey());
     data["ssl_cert"] = QString::fromLatin1(pref->getWebUiHttpsCertificate());
-    // DynDns
+    // Authentication
+    data["web_ui_username"] = pref->getWebUiUsername();
+    data["web_ui_password"] = pref->getWebUiPassword();
+    data["bypass_local_auth"] = !pref->isWebUiLocalAuthEnabled();
+    // Update my dynamic domain name
     data["dyndns_enabled"] = pref->isDynDNSEnabled();
     data["dyndns_service"] = pref->getDynDNSService();
     data["dyndns_username"] = pref->getDynDNSUsername();
@@ -153,31 +171,21 @@ QByteArray prefjson::getPreferences()
 
 void prefjson::setPreferences(const QString& json)
 {
+    Preferences* const pref = Preferences::instance();
     const QVariantMap m = json::fromJson(json).toMap();
 
-    // UI
-    Preferences* const pref = Preferences::instance();
-    if (m.contains("locale")) {
-        QString locale = m["locale"].toString();
-        if (pref->getLocale() != locale) {
-            QTranslator *translator = new QTranslator;
-            if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
-                qDebug("%s locale recognized, using translation.", qPrintable(locale));
-            }else{
-                qDebug("%s locale unrecognized, using default (en).", qPrintable(locale));
-            }
-            qApp->installTranslator(translator);
-
-            pref->setLocale(locale);
-        }
-    }
     // Downloads
+    // Hard Disk
     if (m.contains("save_path"))
         pref->setSavePath(m["save_path"].toString());
     if (m.contains("temp_path_enabled"))
         pref->setTempPathEnabled(m["temp_path_enabled"].toBool());
     if (m.contains("temp_path"))
         pref->setTempPath(m["temp_path"].toString());
+    if (m.contains("preallocate_all"))
+        pref->preAllocateAllFiles(m["preallocate_all"].toBool());
+    if (m.contains("incomplete_files_ext"))
+        pref->useIncompleteFilesExtension(m["incomplete_files_ext"].toBool());
     if (m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) {
         QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList();
         QList<bool> download_at_path;
@@ -210,6 +218,7 @@ void prefjson::setPreferences(const QString& json)
         pref->setTorrentExportDir(m["export_dir"].toString());
     if (m.contains("export_dir_fin"))
         pref->setFinishedTorrentExportDir(m["export_dir_fin"].toString());
+    // Email notification upon download completion
     if (m.contains("mail_notification_enabled"))
         pref->setMailNotificationEnabled(m["mail_notification_enabled"].toBool());
     if (m.contains("mail_notification_email"))
@@ -224,41 +233,21 @@ void prefjson::setPreferences(const QString& json)
         pref->setMailNotificationSMTPUsername(m["mail_notification_username"].toString());
     if (m.contains("mail_notification_password"))
         pref->setMailNotificationSMTPPassword(m["mail_notification_password"].toString());
+    // Run an external program on torrent completion
     if (m.contains("autorun_enabled"))
         pref->setAutoRunEnabled(m["autorun_enabled"].toBool());
     if (m.contains("autorun_program"))
         pref->setAutoRunProgram(m["autorun_program"].toString());
-    if (m.contains("preallocate_all"))
-        pref->preAllocateAllFiles(m["preallocate_all"].toBool());
-    if (m.contains("queueing_enabled"))
-        pref->setQueueingSystemEnabled(m["queueing_enabled"].toBool());
-    if (m.contains("max_active_downloads"))
-        pref->setMaxActiveDownloads(m["max_active_downloads"].toInt());
-    if (m.contains("max_active_torrents"))
-        pref->setMaxActiveTorrents(m["max_active_torrents"].toInt());
-    if (m.contains("max_active_uploads"))
-        pref->setMaxActiveUploads(m["max_active_uploads"].toInt());
-    if (m.contains("max_ratio_enabled"))
-        pref->setGlobalMaxRatio(m["max_ratio"].toInt());
-    else
-        pref->setGlobalMaxRatio(-1);
-    if (m.contains("max_ratio_act"))
-        pref->setMaxRatioAction(m["max_ratio_act"].toInt());
-    if (m.contains("dont_count_slow_torrents"))
-        pref->setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool());
-    if (m.contains("incomplete_files_ext"))
-        pref->useIncompleteFilesExtension(m["incomplete_files_ext"].toBool());
+
     // Connection
+    // Listening Port
     if (m.contains("listen_port"))
         pref->setSessionPort(m["listen_port"].toInt());
     if (m.contains("upnp"))
         pref->setUPnPEnabled(m["upnp"].toBool());
     if (m.contains("random_port"))
         pref->setRandomPort(m["random_port"].toBool());
-    if (m.contains("dl_limit"))
-        pref->setGlobalDownloadLimit(m["dl_limit"].toInt());
-    if (m.contains("up_limit"))
-        pref->setGlobalUploadLimit(m["up_limit"].toInt());
+    // Connections Limits
     if (m.contains("max_connec"))
         pref->setMaxConnecs(m["max_connec"].toInt());
     if (m.contains("max_connec_per_torrent"))
@@ -267,41 +256,7 @@ void prefjson::setPreferences(const QString& json)
         pref->setMaxUploads(m["max_uploads"].toInt());
     if (m.contains("max_uploads_per_torrent"))
         pref->setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt());
-    if (m.contains("enable_utp"))
-        pref->setuTPEnabled(m["enable_utp"].toBool());
-    if (m.contains("limit_utp_rate"))
-        pref->setuTPRateLimited(m["limit_utp_rate"].toBool());
-    if (m.contains("limit_tcp_overhead"))
-        pref->includeOverheadInLimits(m["limit_tcp_overhead"].toBool());
-    if (m.contains("alt_dl_limit"))
-        pref->setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt());
-    if (m.contains("alt_up_limit"))
-        pref->setAltGlobalUploadLimit(m["alt_up_limit"].toInt());
-    if (m.contains("scheduler_enabled"))
-        pref->setSchedulerEnabled(m["scheduler_enabled"].toBool());
-    if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) {
-        pref->setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(),
-                                                                         m["schedule_from_min"].toInt()));
-    }
-    if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) {
-        pref->setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(),
-                                                                     m["schedule_to_min"].toInt()));
-    }
-    if (m.contains("scheduler_days"))
-        pref->setSchedulerDays(scheduler_days(m["scheduler_days"].toInt()));
-    // Bittorrent
-    if (m.contains("dht"))
-        pref->setDHTEnabled(m["dht"].toBool());
-    if (m.contains("pex"))
-        pref->setPeXEnabled(m["pex"].toBool());
-    qDebug("Pex support: %d", (int)m["pex"].toBool());
-    if (m.contains("lsd"))
-        pref->setLSDEnabled(m["lsd"].toBool());
-    if (m.contains("encryption"))
-        pref->setEncryptionSetting(m["encryption"].toInt());
-    if (m.contains("anonymous_mode"))
-        pref->enableAnonymousMode(m["anonymous_mode"].toBool());
-    // Proxy
+    // Proxy Server
     if (m.contains("proxy_type"))
         pref->setProxyType(m["proxy_type"].toInt());
     if (m.contains("proxy_ip"))
@@ -320,22 +275,94 @@ void prefjson::setPreferences(const QString& json)
         pref->setProxyUsername(m["proxy_username"].toString());
     if (m.contains("proxy_password"))
         pref->setProxyPassword(m["proxy_password"].toString());
-    // IP Filter
+    // IP Filtering
     if (m.contains("ip_filter_enabled"))
         pref->setFilteringEnabled(m["ip_filter_enabled"].toBool());
     if (m.contains("ip_filter_path"))
         pref->setFilter(m["ip_filter_path"].toString());
     if (m.contains("ip_filter_trackers"))
         pref->setFilteringTrackerEnabled(m["ip_filter_trackers"].toBool());
+
+    // Speed
+    // Global Rate Limits
+    if (m.contains("dl_limit"))
+        pref->setGlobalDownloadLimit(m["dl_limit"].toInt());
+    if (m.contains("up_limit"))
+        pref->setGlobalUploadLimit(m["up_limit"].toInt());
+    if (m.contains("enable_utp"))
+        pref->setuTPEnabled(m["enable_utp"].toBool());
+    if (m.contains("limit_utp_rate"))
+        pref->setuTPRateLimited(m["limit_utp_rate"].toBool());
+    if (m.contains("limit_tcp_overhead"))
+        pref->includeOverheadInLimits(m["limit_tcp_overhead"].toBool());
+    if (m.contains("alt_dl_limit"))
+        pref->setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt());
+    if (m.contains("alt_up_limit"))
+        pref->setAltGlobalUploadLimit(m["alt_up_limit"].toInt());
+    // Scheduling
+    if (m.contains("scheduler_enabled"))
+        pref->setSchedulerEnabled(m["scheduler_enabled"].toBool());
+    if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) {
+        pref->setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(),
+                                                                         m["schedule_from_min"].toInt()));
+    }
+    if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) {
+        pref->setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(),
+                                                                     m["schedule_to_min"].toInt()));
+    }
+    if (m.contains("scheduler_days"))
+        pref->setSchedulerDays(scheduler_days(m["scheduler_days"].toInt()));
+
+    // Bittorrent
+    // Privacy
+    if (m.contains("dht"))
+        pref->setDHTEnabled(m["dht"].toBool());
+    if (m.contains("pex"))
+        pref->setPeXEnabled(m["pex"].toBool());
+    if (m.contains("lsd"))
+        pref->setLSDEnabled(m["lsd"].toBool());
+    if (m.contains("encryption"))
+        pref->setEncryptionSetting(m["encryption"].toInt());
+    if (m.contains("anonymous_mode"))
+        pref->enableAnonymousMode(m["anonymous_mode"].toBool());
+    // Torrent Queueing
+    if (m.contains("queueing_enabled"))
+        pref->setQueueingSystemEnabled(m["queueing_enabled"].toBool());
+    if (m.contains("max_active_downloads"))
+        pref->setMaxActiveDownloads(m["max_active_downloads"].toInt());
+    if (m.contains("max_active_torrents"))
+        pref->setMaxActiveTorrents(m["max_active_torrents"].toInt());
+    if (m.contains("max_active_uploads"))
+        pref->setMaxActiveUploads(m["max_active_uploads"].toInt());
+    if (m.contains("dont_count_slow_torrents"))
+        pref->setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool());
+    // Share Ratio Limiting
+    if (m.contains("max_ratio_enabled"))
+        pref->setGlobalMaxRatio(m["max_ratio"].toInt());
+    else
+        pref->setGlobalMaxRatio(-1);
+    if (m.contains("max_ratio_act"))
+        pref->setMaxRatioAction(m["max_ratio_act"].toInt());
+
     // Web UI
+    // Language
+    if (m.contains("locale")) {
+        QString locale = m["locale"].toString();
+        if (pref->getLocale() != locale) {
+            QTranslator *translator = new QTranslator;
+            if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
+                qDebug("%s locale recognized, using translation.", qPrintable(locale));
+            }else{
+                qDebug("%s locale unrecognized, using default (en).", qPrintable(locale));
+            }
+            qApp->installTranslator(translator);
+
+            pref->setLocale(locale);
+        }
+    }
+    // HTTP Server
     if (m.contains("web_ui_port"))
         pref->setWebUiPort(m["web_ui_port"].toUInt());
-    if (m.contains("web_ui_username"))
-        pref->setWebUiUsername(m["web_ui_username"].toString());
-    if (m.contains("web_ui_password"))
-        pref->setWebUiPassword(m["web_ui_password"].toString());
-    if (m.contains("bypass_local_auth"))
-        pref->setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool());
     if (m.contains("use_https"))
         pref->setWebUiHttpsEnabled(m["use_https"].toBool());
 #ifndef QT_NO_OPENSSL
@@ -350,7 +377,14 @@ void prefjson::setPreferences(const QString& json)
             pref->setWebUiHttpsCertificate(raw_cert);
     }
 #endif
-    // Dyndns
+    // Authentication
+    if (m.contains("web_ui_username"))
+        pref->setWebUiUsername(m["web_ui_username"].toString());
+    if (m.contains("web_ui_password"))
+        pref->setWebUiPassword(m["web_ui_password"].toString());
+    if (m.contains("bypass_local_auth"))
+        pref->setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool());
+    // Update my dynamic domain name
     if (m.contains("dyndns_enabled"))
         pref->setDynDNSEnabled(m["dyndns_enabled"].toBool());
     if (m.contains("dyndns_service"))
@@ -361,6 +395,7 @@ void prefjson::setPreferences(const QString& json)
         pref->setDynDNSPassword(m["dyndns_password"].toString());
     if (m.contains("dyndns_domain"))
         pref->setDynDomainName(m["dyndns_domain"].toString());
+
     // Save preferences
     pref->apply();
 }
diff --git a/src/webui/www/public/preferences_content.html b/src/webui/www/public/preferences_content.html
index 6ccd6c208..b297b7a1c 100644
--- a/src/webui/www/public/preferences_content.html
+++ b/src/webui/www/public/preferences_content.html
@@ -209,7 +209,7 @@
   <td><input type="text" id="alt_dl_limit_value" style="width: 4em;"/>&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR</td>
   </tr>
   </table>
-  
+
   <fieldset class="settings">
   <legend><input type="checkbox" id="limit_sheduling_checkbox" onClick="updateSchedulingEnabled();"/>
   <label for="limit_sheduling_checkbox">QBT_TR(Schedule the use of alternative rate limits)QBT_TR</label></legend>
@@ -394,98 +394,9 @@
 <center><input type="button" value="QBT_TR(Save)QBT_TR" onclick="applyPreferences();"/></center>
 
 <script type="text/javascript">
+// Downloads tab
 var WatchedFoldersTable = new HtmlTable($("watched_folders_tab"));
 
-updateUpLimitEnabled = function() {
-  if($('up_limit_checkbox').getProperty('checked')) {
-    $('up_limit_value').setProperty('disabled', false);
-  } else {
-    $('up_limit_value').setProperty('disabled', true);
-  }
-}
-
-updateDlLimitEnabled = function() {
-  if($('dl_limit_checkbox').getProperty('checked')) {
-    $('dl_limit_value').setProperty('disabled', false);
-  } else {
-    $('dl_limit_value').setProperty('disabled', true);
-  }
-}
-
-updateAltUpLimitEnabled = function() {
-  if($('alt_up_limit_checkbox').getProperty('checked')) {
-    $('alt_up_limit_value').setProperty('disabled', false);
-  } else {
-    $('alt_up_limit_value').setProperty('disabled', true);
-  }
-}
-
-updateAltDlLimitEnabled = function() {
-  if($('alt_dl_limit_checkbox').getProperty('checked')) {
-    $('alt_dl_limit_value').setProperty('disabled', false);
-  } else {
-    $('alt_dl_limit_value').setProperty('disabled', true);
-  }
-}
-
-updateSchedulingEnabled = function() {
-  if($('limit_sheduling_checkbox').getProperty('checked')) {
-    $('schedule_from_hour').setProperty('disabled', false);
-    $('schedule_from_min').setProperty('disabled', false);
-    $('schedule_to_hour').setProperty('disabled', false);
-    $('schedule_to_min').setProperty('disabled', false);
-    $('schedule_freq_select').setProperty('disabled', false);
-  } else {
-    $('schedule_from_hour').setProperty('disabled', true);
-    $('schedule_from_min').setProperty('disabled', true);
-    $('schedule_to_hour').setProperty('disabled', true);
-    $('schedule_to_min').setProperty('disabled', true);
-    $('schedule_freq_select').setProperty('disabled', true);
-  }
-}
-
-setuTPSettingsVisible = function(visible) {
-  if(visible) {
-    $('enable_utp_checkbox').removeClass('invisible');
-    $('limit_utp_rate_checkbox').removeClass('invisible');
-  } else {
-    $('enable_utp_checkbox').addClass('invisible');
-    $('limit_utp_rate_checkbox').addClass('invisible');
-  }
-}
-
-updateMaxConnecEnabled = function() {
-  if($('max_connec_checkbox').getProperty('checked')) {
-    $('max_connec_value').setProperty('disabled', false);
-  } else {
-    $('max_connec_value').setProperty('disabled', true);
-  }
-}
-
-updateMaxConnecPerTorrentEnabled = function() {
-  if($('max_connec_per_torrent_checkbox').getProperty('checked')) {
-    $('max_connec_per_torrent_value').setProperty('disabled', false);
-  } else {
-    $('max_connec_per_torrent_value').setProperty('disabled', true);
-  }
-}
-
-updateMaxUploadsEnabled = function() {
-  if($('max_uploads_checkbox').getProperty('checked')) {
-    $('max_uploads_value').setProperty('disabled', false);
-  } else {
-    $('max_uploads_value').setProperty('disabled', true);
-  }
-}
-
-updateMaxUploadsPerTorrentEnabled = function() {
-  if($('max_uploads_per_torrent_checkbox').getProperty('checked')) {
-    $('max_uploads_per_torrent_value').setProperty('disabled', false);
-  } else {
-    $('max_uploads_per_torrent_value').setProperty('disabled', true);
-  }
-}
-
 updateTempDirEnabled = function() {
   if($('temppath_checkbox').getProperty('checked')) {
     $('temppath_text').setProperty('disabled', false);
@@ -494,14 +405,40 @@ updateTempDirEnabled = function() {
   }
 }
 
-updateHttpsSettings = function() {
-  if($('use_https_checkbox').getProperty('checked')) {
-    $('ssl_key_textarea').setProperty('disabled', false);
-    $('ssl_cert_textarea').setProperty('disabled', false);
-  } else {
-    $('ssl_key_textarea').setProperty('disabled', true);
-    $('ssl_cert_textarea').setProperty('disabled', true);
+addWatchFolder = function() {
+  var new_folder = $('new_watch_folder_txt').getProperty('value').trim();
+  if(new_folder.length <= 0) return;
+
+  var checked = "";
+  if ($('new_watch_folder_dl').getProperty('checked') == true)
+      checked = "checked";
+  var i = $('watched_folders_tab').getChildren('tbody')[0].getChildren('tr').length;
+
+  var myinput = "<input id='text_watch_"+ i +"' type='text' value='" + new_folder + "'>";
+  var mycb = "<input id='cb_watch_"+ i +"' type='checkbox' " + checked + ">";
+  WatchedFoldersTable.push([myinput, mycb]);
+
+  // Clear fields
+  $('new_watch_folder_txt').setProperty('value', '');
+  $('new_watch_folder_dl').setProperty('checked', false);
+}
+
+getWatchedFolders = function() {
+  var nb_folders = $("watched_folders_tab").getChildren("tbody")[0].getChildren("tr").length;
+  var folders = Array();
+  var download_in_place = Array();
+  for(var i=0; i<nb_folders; i+=1) {
+    var folder_path = $('text_watch_'+i).getProperty('value').trim();
+    if(folder_path.length > 0) {
+      folders[folders.length] = folder_path;
+      if($("cb_watch_"+i).getProperty('checked')) {
+        download_in_place[download_in_place.length] = 1;
+      } else {
+        download_in_place[download_in_place.length] = 0;
+      }
+    }
   }
+  return [folders, download_in_place];
 }
 
 updateExportDirEnabled = function() {
@@ -520,30 +457,6 @@ updateExportDirFinEnabled = function() {
   }
 }
 
-updateQueueingSystem = function() {
-  if($('queueing_checkbox').getProperty('checked')) {
-    $('max_active_dl_value').setProperty('disabled', false);
-    $('max_active_up_value').setProperty('disabled', false);
-    $('max_active_to_value').setProperty('disabled', false);
-    $('dont_count_slow_torrents_checkbox').setProperty('disabled', false);
-  } else {
-    $('max_active_dl_value').setProperty('disabled', true);
-    $('max_active_up_value').setProperty('disabled', true);
-    $('max_active_to_value').setProperty('disabled', true);
-    $('dont_count_slow_torrents_checkbox').setProperty('disabled', true);
-  }
-}
-
-updateMaxRatioEnabled = function() {
-  if($('max_ratio_checkbox').getProperty('checked')) {
-    $('max_ratio_value').setProperty('disabled', false);
-    $('max_ratio_act').setProperty('disabled', false);
-  } else {
-    $('max_ratio_value').setProperty('disabled', true);
-    $('max_ratio_act').setProperty('disabled', true);
-  }
-}
-
 updateMailNotification = function() {
   if($('mail_notification_checkbox').getProperty('checked')) {
     $('dest_email_txt').setProperty('disabled', false);
@@ -578,13 +491,36 @@ updateAutoRun = function() {
   }
 }
 
-updateFilterSettings = function() {
-  if($('ipfilter_enabled_checkbox').getProperty('checked')) {
-    $('ipfilter_text').setProperty('disabled', false);
-    $('ipfilter_trackers_checkbox').setProperty('disabled', false);
+// Connection tab
+updateMaxConnecEnabled = function() {
+  if($('max_connec_checkbox').getProperty('checked')) {
+    $('max_connec_value').setProperty('disabled', false);
   } else {
-    $('ipfilter_text').setProperty('disabled', true);
-    $('ipfilter_trackers_checkbox').setProperty('disabled', true);
+    $('max_connec_value').setProperty('disabled', true);
+  }
+}
+
+updateMaxConnecPerTorrentEnabled = function() {
+  if($('max_connec_per_torrent_checkbox').getProperty('checked')) {
+    $('max_connec_per_torrent_value').setProperty('disabled', false);
+  } else {
+    $('max_connec_per_torrent_value').setProperty('disabled', true);
+  }
+}
+
+updateMaxUploadsEnabled = function() {
+  if($('max_uploads_checkbox').getProperty('checked')) {
+    $('max_uploads_value').setProperty('disabled', false);
+  } else {
+    $('max_uploads_value').setProperty('disabled', true);
+  }
+}
+
+updateMaxUploadsPerTorrentEnabled = function() {
+  if($('max_uploads_per_torrent_checkbox').getProperty('checked')) {
+    $('max_uploads_per_torrent_value').setProperty('disabled', false);
+  } else {
+    $('max_uploads_per_torrent_value').setProperty('disabled', true);
   }
 }
 
@@ -622,6 +558,111 @@ updatePeerProxyAuthSettings = function() {
   }
 }
 
+updateFilterSettings = function() {
+  if($('ipfilter_enabled_checkbox').getProperty('checked')) {
+    $('ipfilter_text').setProperty('disabled', false);
+    $('ipfilter_trackers_checkbox').setProperty('disabled', false);
+  } else {
+    $('ipfilter_text').setProperty('disabled', true);
+    $('ipfilter_trackers_checkbox').setProperty('disabled', true);
+  }
+}
+
+// Speed tab
+updateUpLimitEnabled = function() {
+  if($('up_limit_checkbox').getProperty('checked')) {
+    $('up_limit_value').setProperty('disabled', false);
+  } else {
+    $('up_limit_value').setProperty('disabled', true);
+  }
+}
+
+updateDlLimitEnabled = function() {
+  if($('dl_limit_checkbox').getProperty('checked')) {
+    $('dl_limit_value').setProperty('disabled', false);
+  } else {
+    $('dl_limit_value').setProperty('disabled', true);
+  }
+}
+
+setuTPSettingsVisible = function(visible) {
+  if(visible) {
+    $('enable_utp_checkbox').removeClass('invisible');
+    $('limit_utp_rate_checkbox').removeClass('invisible');
+  } else {
+    $('enable_utp_checkbox').addClass('invisible');
+    $('limit_utp_rate_checkbox').addClass('invisible');
+  }
+}
+
+updateAltUpLimitEnabled = function() {
+  if($('alt_up_limit_checkbox').getProperty('checked')) {
+    $('alt_up_limit_value').setProperty('disabled', false);
+  } else {
+    $('alt_up_limit_value').setProperty('disabled', true);
+  }
+}
+
+updateAltDlLimitEnabled = function() {
+  if($('alt_dl_limit_checkbox').getProperty('checked')) {
+    $('alt_dl_limit_value').setProperty('disabled', false);
+  } else {
+    $('alt_dl_limit_value').setProperty('disabled', true);
+  }
+}
+
+updateSchedulingEnabled = function() {
+  if($('limit_sheduling_checkbox').getProperty('checked')) {
+    $('schedule_from_hour').setProperty('disabled', false);
+    $('schedule_from_min').setProperty('disabled', false);
+    $('schedule_to_hour').setProperty('disabled', false);
+    $('schedule_to_min').setProperty('disabled', false);
+    $('schedule_freq_select').setProperty('disabled', false);
+  } else {
+    $('schedule_from_hour').setProperty('disabled', true);
+    $('schedule_from_min').setProperty('disabled', true);
+    $('schedule_to_hour').setProperty('disabled', true);
+    $('schedule_to_min').setProperty('disabled', true);
+    $('schedule_freq_select').setProperty('disabled', true);
+  }
+}
+
+// Bittorrent tab
+updateQueueingSystem = function() {
+  if($('queueing_checkbox').getProperty('checked')) {
+    $('max_active_dl_value').setProperty('disabled', false);
+    $('max_active_up_value').setProperty('disabled', false);
+    $('max_active_to_value').setProperty('disabled', false);
+    $('dont_count_slow_torrents_checkbox').setProperty('disabled', false);
+  } else {
+    $('max_active_dl_value').setProperty('disabled', true);
+    $('max_active_up_value').setProperty('disabled', true);
+    $('max_active_to_value').setProperty('disabled', true);
+    $('dont_count_slow_torrents_checkbox').setProperty('disabled', true);
+  }
+}
+
+updateMaxRatioEnabled = function() {
+  if($('max_ratio_checkbox').getProperty('checked')) {
+    $('max_ratio_value').setProperty('disabled', false);
+    $('max_ratio_act').setProperty('disabled', false);
+  } else {
+    $('max_ratio_value').setProperty('disabled', true);
+    $('max_ratio_act').setProperty('disabled', true);
+  }
+}
+
+// Web UI tab
+updateHttpsSettings = function() {
+  if($('use_https_checkbox').getProperty('checked')) {
+    $('ssl_key_textarea').setProperty('disabled', false);
+    $('ssl_cert_textarea').setProperty('disabled', false);
+  } else {
+    $('ssl_key_textarea').setProperty('disabled', true);
+    $('ssl_cert_textarea').setProperty('disabled', true);
+  }
+}
+
 updateDynDnsSettings = function() {
   if($('use_dyndns_checkbox').getProperty('checked')) {
     $('dyndns_select').setProperty('disabled', false);
@@ -644,42 +685,6 @@ registerDynDns = function() {
   }
 }
 
-getWatchedFolders = function() {
-  var nb_folders = $("watched_folders_tab").getChildren("tbody")[0].getChildren("tr").length;
-  var folders = Array();
-  var download_in_place = Array();
-  for(var i=0; i<nb_folders; i+=1) {
-    var folder_path = $('text_watch_'+i).getProperty('value').trim();
-    if(folder_path.length > 0) {
-      folders[folders.length] = folder_path;
-      if($("cb_watch_"+i).getProperty('checked')) {
-        download_in_place[download_in_place.length] = 1;
-      } else {
-        download_in_place[download_in_place.length] = 0;
-      }
-    }
-  }
-  return [folders, download_in_place];
-}
-
-addWatchFolder = function() {
-  var new_folder = $('new_watch_folder_txt').getProperty('value').trim();
-  if(new_folder.length <= 0) return;
-
-  var checked = "";
-  if ($('new_watch_folder_dl').getProperty('checked') == true)
-      checked = "checked";
-  var i = $('watched_folders_tab').getChildren('tbody')[0].getChildren('tr').length;
-  
-  var myinput = "<input id='text_watch_"+ i +"' type='text' value='" + new_folder + "'>";
-  var mycb = "<input id='cb_watch_"+ i +"' type='checkbox' " + checked + ">";
-  WatchedFoldersTable.push([myinput, mycb]);
-  
-  // Clear fields
-  $('new_watch_folder_txt').setProperty('value', '');
-  $('new_watch_folder_dl').setProperty('checked', false);
-}
-
 time_padding = function(val) {
   ret = val.toString();
   if(ret.length == 1)
@@ -698,60 +703,64 @@ loadPreferences = function() {
           },
           onSuccess: function(pref) {
                   if(pref){
-                    // Connection
+                    // Downloads tab
+                    // Hard Disk
+                    $('savepath_text').setProperty('value', pref.save_path);
+                    $('temppath_checkbox').setProperty('checked', pref.temp_path_enabled);
+                    $('temppath_text').setProperty('value', pref.temp_path);
+                    updateTempDirEnabled();
+                    $('preallocateall_checkbox').setProperty('checked', pref.preallocate_all);
+                    if($defined(pref.incomplete_files_ext)) {
+                      $('appendexttr').removeClass('invisible');
+                      $('appendext_checkbox').setProperty('checked', pref.incomplete_files_ext);
+                    } else {
+                      $('appendexttr').addClass('invisible');
+                    }
+                    var i;
+                    for(i=0; i<pref.scan_dirs.length; i+=1) {
+                      var myinput = "<input id='text_watch_"+ i +"' type='text' value='" + pref.scan_dirs[i] + "'>";
+                      var checked = "";
+                      if (pref.download_in_scan_dirs[i])
+                          checked = "checked";
+                      var mycb = "<input id='cb_watch_"+ i +"' type='checkbox' " + checked + ">";
+                      WatchedFoldersTable.push([myinput, mycb]);
+                    }
+                    $('exportdir_checkbox').setProperty('checked', pref.export_dir_enabled);
+                    if(pref.export_dir_enabled)
+                      $('exportdir_text').setProperty('value', pref.export_dir);
+                    else
+                      $('exportdir_text').setProperty('value', '');
+                    updateExportDirEnabled();
+                    $('exportdirfin_checkbox').setProperty('checked', pref.export_dir_fin_enabled);
+                    if(pref.export_dir_fin_enabled)
+                      $('exportdirfin_text').setProperty('value', pref.export_dir_fin);
+                    else
+                      $('exportdirfin_text').setProperty('value', '');
+                    updateExportDirFinEnabled();
+
+                    // Email notification upon download completion
+                    $('mail_notification_checkbox').setProperty('checked', pref.mail_notification_enabled);
+                    $('dest_email_txt').setProperty('value', pref.mail_notification_email);
+                    $('smtp_server_txt').setProperty('value', pref.mail_notification_smtp);
+                    $('mail_ssl_checkbox').setProperty('checked', pref.mail_notification_ssl_enabled);
+                    $('mail_auth_checkbox').setProperty('checked', pref.mail_notification_auth_enabled);
+                    $('mail_username_text').setProperty('value', pref.mail_notification_username);
+                    $('mail_password_text').setProperty('value', pref.mail_notification_password);
+                    updateMailNotification();
+                    updateMailAuthSettings();
+
+                    // Run an external program on torrent completion
+                    $('autorun_checkbox').setProperty('checked', pref.autorun_enabled);
+                    $('autorunProg_txt').setProperty('value', pref.autorun_program);
+                    updateAutoRun();
+
+                    // Connection tab
+                    // Listening Port
                     $('port_value').setProperty('value', pref.listen_port.toInt());
                     $('upnp_checkbox').setProperty('checked', pref.upnp);
                     $('random_port_checkbox').setProperty('checked', pref.random_port);
-                    // Global rate limits
-                    var up_limit = pref.up_limit.toInt();
-                    if(up_limit <= 0) {
-                      $('up_limit_checkbox').setProperty('checked', false);
-                    } else {
-                      $('up_limit_checkbox').setProperty('checked', true);
-                      $('up_limit_value').setProperty('value', up_limit);
-                    }
-                    updateUpLimitEnabled();
-                    var dl_limit = pref.dl_limit.toInt();
-                    if(dl_limit <= 0) {
-                      $('dl_limit_checkbox').setProperty('checked', false);
-                    } else {
-                      $('dl_limit_checkbox').setProperty('checked', true);
-                      $('dl_limit_value').setProperty('value', dl_limit);
-                    }
-                    updateDlLimitEnabled();
-                    // Alternative limits
-                    var alt_up_limit = pref.alt_up_limit.toInt();
-                    if(alt_up_limit <= 0) {
-                      $('alt_up_limit_checkbox').setProperty('checked', false);
-                    } else {
-                      $('alt_up_limit_checkbox').setProperty('checked', true);
-                      $('alt_up_limit_value').setProperty('value', alt_up_limit);
-                    }
-                    updateAltUpLimitEnabled();
-                    var alt_dl_limit = pref.alt_dl_limit.toInt();
-                    if(alt_dl_limit <= 0) {
-                      $('alt_dl_limit_checkbox').setProperty('checked', false);
-                    } else {
-                      $('alt_dl_limit_checkbox').setProperty('checked', true);
-                      $('alt_dl_limit_value').setProperty('value', alt_dl_limit);
-                    }
-                    updateAltDlLimitEnabled();
-                    // Scheduling
-                    $('limit_sheduling_checkbox').setProperty('checked', pref.scheduler_enabled);
-                    $('schedule_from_hour').setProperty('value', time_padding(pref.schedule_from_hour));
-                    $('schedule_from_min').setProperty('value', time_padding(pref.schedule_from_min));
-                    $('schedule_to_hour').setProperty('value', time_padding(pref.schedule_to_hour));
-                    $('schedule_to_min').setProperty('value', time_padding(pref.schedule_to_min));
-                    $('schedule_freq_select').setProperty('value', pref.scheduler_days);
-                    updateSchedulingEnabled();
-                    // uTP
-                    utp_supported = $defined(pref.enable_utp);
-                    setuTPSettingsVisible(utp_supported);
-                    if(utp_supported) {
-                      $('enable_utp_checkbox').setProperty('checked', pref.enable_utp);
-                      $('limit_utp_rate_checkbox').setProperty('checked', pref.limit_utp_rate);
-                    }
-                    $('limit_tcp_overhead_checkbox').setProperty('checked', pref.limit_tcp_overhead);
+
+                    // Connections Limits
                     var max_connec = pref.max_connec.toInt();
                     if(max_connec <= 0) {
                       $('max_connec_checkbox').setProperty('checked', false);
@@ -788,82 +797,8 @@ loadPreferences = function() {
                       $('max_uploads_per_torrent_value').setProperty('value', max_uploads_per_torrent);
                     }
                     updateMaxUploadsPerTorrentEnabled();
-                    // Bittorrent
-                    $('dht_checkbox').setProperty('checked', pref.dht);
-                    $('pex_checkbox').setProperty('checked', pref.pex);
-                    $('lsd_checkbox').setProperty('checked', pref.lsd);
-                    var encryption = pref.encryption.toInt();
-                    $('encryption_select').getChildren('option')[encryption].setAttribute('selected', '');
-	            	    if($defined(pref.anonymous_mode)) {
-		                  $('anonymous_mode_checkbox').setProperty('checked', pref.anonymous_mode);
-		                } else {
-                      $('anonymous_mode_checkbox').addClass('invisible');
-                    }
-                    // Downloads
-                    $("savepath_text").setProperty('value', pref.save_path);
-                    $('temppath_checkbox').setProperty('checked', pref.temp_path_enabled);
-                    $('temppath_text').setProperty('value', pref.temp_path);
-                    updateTempDirEnabled();
-                    var i;
-                    for(i=0; i<pref.scan_dirs.length; i+=1) {
-                      var myinput = "<input id='text_watch_"+ i +"' type='text' value='" + pref.scan_dirs[i] + "'>";
-                      var checked = "";
-                      if (pref.download_in_scan_dirs[i])
-                          checked = "checked";
-                      var mycb = "<input id='cb_watch_"+ i +"' type='checkbox' " + checked + ">";
-                      WatchedFoldersTable.push([myinput, mycb]);
-                    }
-                    $('exportdir_checkbox').setProperty('checked', pref.export_dir_enabled);
-                    if(pref.export_dir_enabled)
-                      $('exportdir_text').setProperty('value', pref.export_dir);
-                    else
-                      $('exportdir_text').setProperty('value', '');
-                    updateExportDirEnabled();
-                    $('exportdirfin_checkbox').setProperty('checked', pref.export_dir_fin_enabled);
-                    if(pref.export_dir_fin_enabled)
-                      $('exportdirfin_text').setProperty('value', pref.export_dir_fin);
-                    else
-                      $('exportdirfin_text').setProperty('value', '');
-                    updateExportDirFinEnabled();
-                    $('mail_notification_checkbox').setProperty('checked', pref.mail_notification_enabled);
-                    $('dest_email_txt').setProperty('value', pref.mail_notification_email);
-                    $('smtp_server_txt').setProperty('value', pref.mail_notification_smtp);
-                    $('mail_ssl_checkbox').setProperty('checked', pref.mail_notification_ssl_enabled);
-                    $('mail_auth_checkbox').setProperty('checked', pref.mail_notification_auth_enabled);
-                    $('mail_username_text').setProperty('value', pref.mail_notification_username);
-                    $('mail_password_text').setProperty('value', pref.mail_notification_password);
-                    updateMailNotification();
-                    updateMailAuthSettings();
-                    $('autorun_checkbox').setProperty('checked', pref.autorun_enabled);
-                    $('autorunProg_txt').setProperty('value', pref.autorun_program);
-                    updateAutoRun();
-                    $('preallocateall_checkbox').setProperty('checked', pref.preallocate_all);
-                    if($defined(pref.incomplete_files_ext)) {
-                      $('appendexttr').removeClass('invisible');
-                      $('appendext_checkbox').setProperty('checked', pref.incomplete_files_ext);
-                    } else {
-                      $('appendexttr').addClass('invisible');
-                    }
-                    $('queueing_checkbox').setProperty('checked', pref.queueing_enabled);
-                    $('max_active_dl_value').setProperty('value', pref.max_active_downloads.toInt());
-                    $('max_active_up_value').setProperty('value', pref.max_active_uploads.toInt());
-                    $('max_active_to_value').setProperty('value', pref.max_active_torrents.toInt());
-                    $('dont_count_slow_torrents_checkbox').setProperty('checked', pref.dont_count_slow_torrents);
-                    updateQueueingSystem();
-                    $('max_ratio_checkbox').setProperty('checked', pref.max_ratio_enabled);
-                    if (pref.max_ratio_enabled)
-                        $('max_ratio_value').setProperty('value', pref.max_ratio.toInt());
-                    else
-                        $('max_ratio_value').setProperty('value', 1);
-                    var max_ratio_act = pref.max_ratio_act.toInt();
-                    $('max_ratio_act').getChildren('option')[max_ratio_act].setAttribute('selected', '');
-                    updateMaxRatioEnabled();
-                    // IP Filter
-                    $('ipfilter_enabled_checkbox').setProperty('checked', pref.ip_filter_enabled);
-                    $('ipfilter_text').setProperty('value', pref.ip_filter_path);
-                    $('ipfilter_trackers_checkbox').setProperty('checked', pref.ip_filter_trackers);
-                    updateFilterSettings();
-                    // PEER Proxy
+
+                    // Proxy Server
                     switch(pref.proxy_type.toInt()) {
                       case 5: //SOCKS4
                         $('peer_proxy_type_select').setProperty('value', 'socks4');
@@ -888,23 +823,120 @@ loadPreferences = function() {
                     updatePeerProxyAuthSettings();
                     $('peer_proxy_username_text').setProperty('value', pref.proxy_username);
                     $('peer_proxy_password_text').setProperty('value', pref.proxy_password);
-                    // Web UI
+
+                    // IP Filtering
+                    $('ipfilter_enabled_checkbox').setProperty('checked', pref.ip_filter_enabled);
+                    $('ipfilter_text').setProperty('value', pref.ip_filter_path);
+                    $('ipfilter_trackers_checkbox').setProperty('checked', pref.ip_filter_trackers);
+                    updateFilterSettings();
+
+                    // Speed tab
+                    // Global Rate Limits
+                    var up_limit = pref.up_limit.toInt();
+                    if(up_limit <= 0) {
+                      $('up_limit_checkbox').setProperty('checked', false);
+                    } else {
+                      $('up_limit_checkbox').setProperty('checked', true);
+                      $('up_limit_value').setProperty('value', up_limit);
+                    }
+                    updateUpLimitEnabled();
+                    var dl_limit = pref.dl_limit.toInt();
+                    if(dl_limit <= 0) {
+                      $('dl_limit_checkbox').setProperty('checked', false);
+                    } else {
+                      $('dl_limit_checkbox').setProperty('checked', true);
+                      $('dl_limit_value').setProperty('value', dl_limit);
+                    }
+                    updateDlLimitEnabled();
+                    utp_supported = $defined(pref.enable_utp);
+                    setuTPSettingsVisible(utp_supported);
+                    if(utp_supported) {
+                      $('enable_utp_checkbox').setProperty('checked', pref.enable_utp);
+                      $('limit_utp_rate_checkbox').setProperty('checked', pref.limit_utp_rate);
+                    }
+                    $('limit_tcp_overhead_checkbox').setProperty('checked', pref.limit_tcp_overhead);
+
+                    // Alternative Global Rate Limits
+                    var alt_up_limit = pref.alt_up_limit.toInt();
+                    if(alt_up_limit <= 0) {
+                      $('alt_up_limit_checkbox').setProperty('checked', false);
+                    } else {
+                      $('alt_up_limit_checkbox').setProperty('checked', true);
+                      $('alt_up_limit_value').setProperty('value', alt_up_limit);
+                    }
+                    updateAltUpLimitEnabled();
+                    var alt_dl_limit = pref.alt_dl_limit.toInt();
+                    if(alt_dl_limit <= 0) {
+                      $('alt_dl_limit_checkbox').setProperty('checked', false);
+                    } else {
+                      $('alt_dl_limit_checkbox').setProperty('checked', true);
+                      $('alt_dl_limit_value').setProperty('value', alt_dl_limit);
+                    }
+                    updateAltDlLimitEnabled();
+
+                    // Scheduling
+                    $('limit_sheduling_checkbox').setProperty('checked', pref.scheduler_enabled);
+                    $('schedule_from_hour').setProperty('value', time_padding(pref.schedule_from_hour));
+                    $('schedule_from_min').setProperty('value', time_padding(pref.schedule_from_min));
+                    $('schedule_to_hour').setProperty('value', time_padding(pref.schedule_to_hour));
+                    $('schedule_to_min').setProperty('value', time_padding(pref.schedule_to_min));
+                    $('schedule_freq_select').setProperty('value', pref.scheduler_days);
+                    updateSchedulingEnabled();
+
+                    // Bittorrent tab
+                    // Privacy
+                    $('dht_checkbox').setProperty('checked', pref.dht);
+                    $('pex_checkbox').setProperty('checked', pref.pex);
+                    $('lsd_checkbox').setProperty('checked', pref.lsd);
+                    var encryption = pref.encryption.toInt();
+                    $('encryption_select').getChildren('option')[encryption].setAttribute('selected', '');
+                        if($defined(pref.anonymous_mode)) {
+		                  $('anonymous_mode_checkbox').setProperty('checked', pref.anonymous_mode);
+		                } else {
+                      $('anonymous_mode_checkbox').addClass('invisible');
+                    }
+
+                    // Torrent Queueing
+                    $('queueing_checkbox').setProperty('checked', pref.queueing_enabled);
+                    $('max_active_dl_value').setProperty('value', pref.max_active_downloads.toInt());
+                    $('max_active_up_value').setProperty('value', pref.max_active_uploads.toInt());
+                    $('max_active_to_value').setProperty('value', pref.max_active_torrents.toInt());
+                    $('dont_count_slow_torrents_checkbox').setProperty('checked', pref.dont_count_slow_torrents);
+                    updateQueueingSystem();
+
+                    // Share Ratio Limiting
+                    $('max_ratio_checkbox').setProperty('checked', pref.max_ratio_enabled);
+                    if (pref.max_ratio_enabled)
+                        $('max_ratio_value').setProperty('value', pref.max_ratio.toInt());
+                    else
+                        $('max_ratio_value').setProperty('value', 1);
+                    var max_ratio_act = pref.max_ratio_act.toInt();
+                    $('max_ratio_act').getChildren('option')[max_ratio_act].setAttribute('selected', '');
+                    updateMaxRatioEnabled();
+
+                    // Web UI tab
+                    // Language
+                    $('locale_select').setProperty('value', pref.locale);
+
+                    // HTTP Server
                     $('webui_port_value').setProperty('value', pref.web_ui_port);
+                    $('use_https_checkbox').setProperty('checked', pref.use_https);
+                    $('ssl_key_textarea').setProperty('value', pref.ssl_key);
+                    $('ssl_cert_textarea').setProperty('value', pref.ssl_cert);
+                    updateHttpsSettings();
+
+                    // Authentication
                     $('webui_username_text').setProperty('value', pref.web_ui_username);
                     $('webui_password_text').setProperty('value', pref.web_ui_password);
                     $('bypass_local_auth_checkbox').setProperty('checked', pref.bypass_local_auth);
-                    $('use_https_checkbox').setProperty('checked', pref.use_https);
-                    updateHttpsSettings();
-                    $('ssl_key_textarea').setProperty('value', pref.ssl_key);
-                    $('ssl_cert_textarea').setProperty('value', pref.ssl_cert);
-                    $('locale_select').setProperty('value', pref.locale);
-		                // Dyndns
-		                $('use_dyndns_checkbox').setProperty('checked', pref.dyndns_enabled);
-		                updateDynDnsSettings();
-		                $('dyndns_select').setProperty('value', pref.dyndns_service);
-		                $('dyndns_domain_text').setProperty('value', pref.dyndns_domain);
-		                $('dyndns_username_text').setProperty('value', pref.dyndns_username);
-		                $('dyndns_password_text').setProperty('value', pref.dyndns_password);
+
+                    // Update my dynamic domain name
+                    $('use_dyndns_checkbox').setProperty('checked', pref.dyndns_enabled);
+                    $('dyndns_select').setProperty('value', pref.dyndns_service);
+                    $('dyndns_domain_text').setProperty('value', pref.dyndns_domain);
+                    $('dyndns_username_text').setProperty('value', pref.dyndns_username);
+                    $('dyndns_password_text').setProperty('value', pref.dyndns_password);
+                    updateDynDnsSettings();
                   }
           }
   }).send();
@@ -913,7 +945,42 @@ loadPreferences = function() {
 applyPreferences = function() {
   var settings = new Hash();
   // Validate form data
-  // Connection
+  // Downloads tab
+  // Hard Disk
+  settings.set('save_path', $('savepath_text').getProperty('value'));
+  settings.set('temp_path_enabled', $('temppath_checkbox').getProperty('checked'));
+  settings.set('temp_path', $('temppath_text').getProperty('value'));
+  settings.set('preallocate_all', $('preallocateall_checkbox').getProperty('checked'));
+  if(!$('appendexttr').hasClass('invisible')) {
+    settings.set('incomplete_files_ext', $('appendext_checkbox').getProperty('checked'));
+  }
+  var watched_folders = getWatchedFolders();
+  settings.set('scan_dirs', watched_folders[0]);
+  settings.set('download_in_scan_dirs', watched_folders[1]);
+  if($('exportdir_checkbox').getProperty('checked'))
+    settings.set('export_dir', $('exportdir_text').getProperty('value'));
+  else
+    settings.set('export_dir', '');
+  if($('exportdirfin_checkbox').getProperty('checked'))
+    settings.set('export_dir_fin', $('exportdirfin_text').getProperty('value'));
+  else
+    settings.set('export_dir_fin', '');
+
+  // Email notification upon download completion
+  settings.set('mail_notification_enabled', $('mail_notification_checkbox').getProperty('checked'));
+  settings.set('mail_notification_email', $('dest_email_txt').getProperty('value'));
+  settings.set('mail_notification_smtp', $('smtp_server_txt').getProperty('value'));
+  settings.set('mail_notification_ssl_enabled', $('mail_ssl_checkbox').getProperty('checked'));
+  settings.set('mail_notification_auth_enabled', $('mail_auth_checkbox').getProperty('checked'));
+  settings.set('mail_notification_username', $('mail_username_text').getProperty('value'));
+  settings.set('mail_notification_password', $('mail_password_text').getProperty('value'));
+
+  // Run an external program on torrent completion
+  settings.set('autorun_enabled', $('autorun_checkbox').getProperty('checked'));
+  settings.set('autorun_program', $('autorunProg_txt').getProperty('value'));
+
+  // Connection tab
+  // Listening Port
   var listen_port = $('port_value').getProperty('value').toInt();
   if(listen_port <= 1024 || listen_port > 65535) {
     alert("QBT_TR(The port used for incoming connections must be greater than 1024 and less than 65535.)QBT_TR");
@@ -923,53 +990,7 @@ applyPreferences = function() {
   settings.set('upnp', $('upnp_checkbox').getProperty('checked'));
   settings.set('random_port', $('random_port_checkbox').getProperty('checked'));
 
-  // Global rate limits
-  var up_limit = -1;
-  if($('up_limit_checkbox').getProperty('checked')) {
-    up_limit = $('up_limit_value').getProperty('value').toInt();
-    if(isNaN(up_limit) || up_limit <= 0) {
-      alert("QBT_TR(Global upload rate limit must be greater than 0 or disabled.)QBT_TR");
-      return;
-    }
-  }
-  settings.set('up_limit', up_limit);
-  var dl_limit = -1;
-  if($('dl_limit_checkbox').getProperty('checked')) {
-    dl_limit = $('dl_limit_value').getProperty('value').toInt();
-    if(isNaN(dl_limit) || dl_limit <= 0) {
-      alert("QBT_TR(Global download rate limit must be greater than 0 or disabled.)QBT_TR");
-      return;
-    }
-  }
-  settings.set('dl_limit', dl_limit);
-
-  // Alternative limits
-  var alt_up_limit = -1;
-  if($('alt_up_limit_checkbox').getProperty('checked')) {
-    alt_up_limit = $('alt_up_limit_value').getProperty('value').toInt();
-    if(isNaN(alt_up_limit) || alt_up_limit <= 0) {
-      alert("QBT_TR(Alternative upload rate limit must be greater than 0 or disabled.)QBT_TR");
-      return;
-    }
-  }
-  settings.set('alt_up_limit', alt_up_limit);
-  var alt_dl_limit = -1;
-  if($('alt_dl_limit_checkbox').getProperty('checked')) {
-    alt_dl_limit = $('alt_dl_limit_value').getProperty('value').toInt();
-    if(isNaN(alt_dl_limit) || alt_dl_limit <= 0) {
-      alert("QBT_TR(Alternative download rate limit must be greater than 0 or disabled.)QBT_TR");
-      return;
-    }
-  }
-  settings.set('alt_dl_limit', alt_dl_limit);
-
-  if(!$('enable_utp_checkbox').hasClass('invisible')) {
-    settings.set('enable_utp', $('enable_utp_checkbox').getProperty('checked'));
-    settings.set('limit_utp_rate', $('limit_utp_rate_checkbox').getProperty('checked'));
-  }
-  
-  settings.set('limit_tcp_overhead', $('limit_tcp_overhead_checkbox').getProperty('checked'));
-  
+  // Connections Limits
   var max_connec = -1;
   if($('max_connec_checkbox').getProperty('checked')) {
     max_connec = $('max_connec_value').getProperty('value').toInt();
@@ -979,7 +1000,6 @@ applyPreferences = function() {
     }
   }
   settings.set('max_connec', max_connec);
-  
   var max_connec_per_torrent = -1;
   if($('max_connec_per_torrent_checkbox').getProperty('checked')) {
     max_connec_per_torrent = $('max_connec_per_torrent_value').getProperty('value').toInt();
@@ -989,7 +1009,6 @@ applyPreferences = function() {
     }
   }
   settings.set('max_connec_per_torrent', max_connec_per_torrent);
-  
   var max_uploads = -1;
   if($('max_uploads_checkbox').getProperty('checked')) {
     max_uploads = $('max_uploads_value').getProperty('value').toInt();
@@ -999,7 +1018,6 @@ applyPreferences = function() {
     }
   }
   settings.set('max_uploads', max_uploads);
-
   var max_uploads_per_torrent = -1;
   if($('max_uploads_per_torrent_checkbox').getProperty('checked')) {
     max_uploads_per_torrent = $('max_uploads_per_torrent_value').getProperty('value').toInt();
@@ -1010,82 +1028,7 @@ applyPreferences = function() {
   }
   settings.set('max_uploads_per_torrent', max_uploads_per_torrent);
 
-  // Scheduler
-  var scheduling_enabled = $('limit_sheduling_checkbox').getProperty('checked');
-  settings.set('scheduler_enabled', scheduling_enabled);
-  if (scheduling_enabled) {
-    settings.set('schedule_from_hour', $('schedule_from_hour').getProperty('value').toInt());
-    settings.set('schedule_from_min', $('schedule_from_min').getProperty('value').toInt());
-    settings.set('schedule_to_hour', $('schedule_to_hour').getProperty('value').toInt());
-    settings.set('schedule_to_min', $('schedule_to_min').getProperty('value').toInt());
-    settings.set('scheduler_days', $('schedule_freq_select').getProperty('value').toInt());
-  }
-  // Bittorrent
-  settings.set('dht', $('dht_checkbox').getProperty('checked'));
-  settings.set('pex', $('pex_checkbox').getProperty('checked'));
-  settings.set('lsd', $('lsd_checkbox').getProperty('checked'));
-  settings.set('encryption', $('encryption_select').getSelected()[0].getProperty('value'));
-  if(!$('anonymous_mode_checkbox').hasClass('invisible')) {
-    settings.set('anonymous_mode', $('anonymous_mode_checkbox').getProperty('checked'));
-  }
-  
-  // Downloads
-  settings.set('save_path', $('savepath_text').getProperty('value'));
-  settings.set('temp_path_enabled', $('temppath_checkbox').getProperty('checked'));
-  settings.set('temp_path', $('temppath_text').getProperty('value'));
-  
-  var watched_folders = getWatchedFolders();
-  settings.set('scan_dirs', watched_folders[0]);
-  settings.set('download_in_scan_dirs', watched_folders[1]);
-
-  if($('exportdir_checkbox').getProperty('checked'))
-    settings.set('export_dir', $('exportdir_text').getProperty('value'));
-  else
-    settings.set('export_dir', '');
-  if($('exportdirfin_checkbox').getProperty('checked'))
-    settings.set('export_dir_fin', $('exportdirfin_text').getProperty('value'));
-  else
-    settings.set('export_dir_fin', '');
-
-  settings.set('preallocate_all', $('preallocateall_checkbox').getProperty('checked'));
-  if(!$('appendexttr').hasClass('invisible')) {
-    settings.set('incomplete_files_ext', $('appendext_checkbox').getProperty('checked'));
-  }
-  settings.set('queueing_enabled', $('queueing_checkbox').getProperty('checked'));
-  settings.set('max_active_downloads', $('max_active_dl_value').getProperty('value').toInt());
-  settings.set('max_active_uploads', $('max_active_up_value').getProperty('value').toInt());
-  settings.set('max_active_torrents', $('max_active_to_value').getProperty('value').toInt());
-  settings.set('dont_count_slow_torrents', $('dont_count_slow_torrents_checkbox').getProperty('checked'));
- 
-  var max_ratio = -1;
-  if($('max_ratio_checkbox').getProperty('checked')) {
-    max_ratio = $('max_ratio_value').getProperty('value').toInt();
-    if(max_ratio < 0 || max_ratio > 9998) {
-      alert("QBT_TR(Share ratio limit must be between 0 and 9998.)QBT_TR");
-      return;
-    }
-  }
-  settings.set('max_ratio_enabled', $('max_ratio_checkbox').getProperty('checked'));
-  settings.set('max_ratio', max_ratio);
-  settings.set('max_ratio_act', $('max_ratio_act').getProperty('value').toInt());
- 
-  settings.set('mail_notification_enabled', $('mail_notification_checkbox').getProperty('checked'));
-  settings.set('mail_notification_email', $('dest_email_txt').getProperty('value'));
-  settings.set('mail_notification_smtp', $('smtp_server_txt').getProperty('value'));
-  settings.set('mail_notification_ssl_enabled', $('mail_ssl_checkbox').getProperty('checked'));
-  settings.set('mail_notification_auth_enabled', $('mail_auth_checkbox').getProperty('checked'));
-  settings.set('mail_notification_username', $('mail_username_text').getProperty('value'));
-  settings.set('mail_notification_password', $('mail_password_text').getProperty('value'));
-  
-  settings.set('autorun_enabled', $('autorun_checkbox').getProperty('checked'));
-  settings.set('autorun_program', $('autorunProg_txt').getProperty('value'));
-  
-  // IP Filter
-  settings.set('ip_filter_enabled', $('ipfilter_enabled_checkbox').getProperty('checked'));
-  settings.set('ip_filter_path', $('ipfilter_text').getProperty('value'));
-  settings.set('ip_filter_trackers', $('ipfilter_trackers_checkbox').getProperty('checked'));
-
-  // Peer Proxy
+  // Proxy Server
   var proxy_type_str = $('peer_proxy_type_select').getProperty('value');
   var proxy_type = -1;
   var proxy_auth_enabled = false;
@@ -1118,15 +1061,115 @@ applyPreferences = function() {
   settings.set('force_proxy', $('force_proxy_checkbox').getProperty('checked'));
   settings.set('proxy_username', $('peer_proxy_username_text').getProperty('value'));
   settings.set('proxy_password', $('peer_proxy_password_text').getProperty('value'));
-  
-  // Web UI
+
+  // IP Filtering
+  settings.set('ip_filter_enabled', $('ipfilter_enabled_checkbox').getProperty('checked'));
+  settings.set('ip_filter_path', $('ipfilter_text').getProperty('value'));
+  settings.set('ip_filter_trackers', $('ipfilter_trackers_checkbox').getProperty('checked'));
+
+  // Speed tab
+  // Global Rate Limits
+  var up_limit = -1;
+  if($('up_limit_checkbox').getProperty('checked')) {
+    up_limit = $('up_limit_value').getProperty('value').toInt();
+    if(isNaN(up_limit) || up_limit <= 0) {
+      alert("QBT_TR(Global upload rate limit must be greater than 0 or disabled.)QBT_TR");
+      return;
+    }
+  }
+  settings.set('up_limit', up_limit);
+  var dl_limit = -1;
+  if($('dl_limit_checkbox').getProperty('checked')) {
+    dl_limit = $('dl_limit_value').getProperty('value').toInt();
+    if(isNaN(dl_limit) || dl_limit <= 0) {
+      alert("QBT_TR(Global download rate limit must be greater than 0 or disabled.)QBT_TR");
+      return;
+    }
+  }
+  settings.set('dl_limit', dl_limit);
+  if(!$('enable_utp_checkbox').hasClass('invisible')) {
+    settings.set('enable_utp', $('enable_utp_checkbox').getProperty('checked'));
+    settings.set('limit_utp_rate', $('limit_utp_rate_checkbox').getProperty('checked'));
+  }
+  settings.set('limit_tcp_overhead', $('limit_tcp_overhead_checkbox').getProperty('checked'));
+
+  // Alternative Global Rate Limits
+  var alt_up_limit = -1;
+  if($('alt_up_limit_checkbox').getProperty('checked')) {
+    alt_up_limit = $('alt_up_limit_value').getProperty('value').toInt();
+    if(isNaN(alt_up_limit) || alt_up_limit <= 0) {
+      alert("QBT_TR(Alternative upload rate limit must be greater than 0 or disabled.)QBT_TR");
+      return;
+    }
+  }
+  settings.set('alt_up_limit', alt_up_limit);
+  var alt_dl_limit = -1;
+  if($('alt_dl_limit_checkbox').getProperty('checked')) {
+    alt_dl_limit = $('alt_dl_limit_value').getProperty('value').toInt();
+    if(isNaN(alt_dl_limit) || alt_dl_limit <= 0) {
+      alert("QBT_TR(Alternative download rate limit must be greater than 0 or disabled.)QBT_TR");
+      return;
+    }
+  }
+  settings.set('alt_dl_limit', alt_dl_limit);
+
+  // Scheduler
+  var scheduling_enabled = $('limit_sheduling_checkbox').getProperty('checked');
+  settings.set('scheduler_enabled', scheduling_enabled);
+  if (scheduling_enabled) {
+    settings.set('schedule_from_hour', $('schedule_from_hour').getProperty('value').toInt());
+    settings.set('schedule_from_min', $('schedule_from_min').getProperty('value').toInt());
+    settings.set('schedule_to_hour', $('schedule_to_hour').getProperty('value').toInt());
+    settings.set('schedule_to_min', $('schedule_to_min').getProperty('value').toInt());
+    settings.set('scheduler_days', $('schedule_freq_select').getProperty('value').toInt());
+  }
+
+  // Bittorrent tab
+  // Privacy
+  settings.set('dht', $('dht_checkbox').getProperty('checked'));
+  settings.set('pex', $('pex_checkbox').getProperty('checked'));
+  settings.set('lsd', $('lsd_checkbox').getProperty('checked'));
+  settings.set('encryption', $('encryption_select').getSelected()[0].getProperty('value'));
+  if(!$('anonymous_mode_checkbox').hasClass('invisible')) {
+    settings.set('anonymous_mode', $('anonymous_mode_checkbox').getProperty('checked'));
+  }
+
+  // Torrent Queueing
+  settings.set('queueing_enabled', $('queueing_checkbox').getProperty('checked'));
+  settings.set('max_active_downloads', $('max_active_dl_value').getProperty('value').toInt());
+  settings.set('max_active_uploads', $('max_active_up_value').getProperty('value').toInt());
+  settings.set('max_active_torrents', $('max_active_to_value').getProperty('value').toInt());
+  settings.set('dont_count_slow_torrents', $('dont_count_slow_torrents_checkbox').getProperty('checked'));
+
+  // Share Ratio Limiting
+  var max_ratio = -1;
+  if($('max_ratio_checkbox').getProperty('checked')) {
+    max_ratio = $('max_ratio_value').getProperty('value').toInt();
+    if(max_ratio < 0 || max_ratio > 9998) {
+      alert("QBT_TR(Share ratio limit must be between 0 and 9998.)QBT_TR");
+      return;
+    }
+  }
+  settings.set('max_ratio_enabled', $('max_ratio_checkbox').getProperty('checked'));
+  settings.set('max_ratio', max_ratio);
+  settings.set('max_ratio_act', $('max_ratio_act').getProperty('value').toInt());
+
+  // Web UI tab
+  // Language
+  settings.set('locale', $('locale_select').getProperty('value'));
+
+  // HTTP Server
   var web_ui_port = $('webui_port_value').getProperty('value').toInt();
   if(web_ui_port <= 1024 || web_ui_port > 65535) {
     alert("QBT_TR(The port used for the Web UI must be greater than 1024 and less than 65535.)QBT_TR");
     return;
   }
   settings.set('web_ui_port', web_ui_port);
-  
+  settings.set('use_https', $('use_https_checkbox').getProperty('checked'));
+  settings.set('ssl_key', $('ssl_key_textarea').getProperty('value'));
+  settings.set('ssl_cert', $('ssl_cert_textarea').getProperty('value'));
+
+  // Authentication
   var web_ui_username = $('webui_username_text').getProperty('value');
   var web_ui_password = $('webui_password_text').getProperty('value');
     // Add some username/password length checking
@@ -1140,22 +1183,15 @@ applyPreferences = function() {
   }
   settings.set('web_ui_username', web_ui_username);
   settings.set('web_ui_password', web_ui_password);
-  
   settings.set('bypass_local_auth', $('bypass_local_auth_checkbox').getProperty('checked'));
-  settings.set('use_https', $('use_https_checkbox').getProperty('checked'));
-  settings.set('ssl_key', $('ssl_key_textarea').getProperty('value'));
-  settings.set('ssl_cert', $('ssl_cert_textarea').getProperty('value'));
-  
-  // Dyndns
+
+  // Update my dynamic domain name
   settings.set('dyndns_enabled', $('use_dyndns_checkbox').getProperty('checked'));
   settings.set('dyndns_service', $('dyndns_select').getProperty('value'));
   settings.set('dyndns_domain', $('dyndns_domain_text').getProperty('value'));
   settings.set('dyndns_username', $('dyndns_username_text').getProperty('value'));
   settings.set('dyndns_password', $('dyndns_password_text').getProperty('value'));
-  
-  // Locale
-  settings.set('locale', $('locale_select').getProperty('value'));
-  
+
   // Send it to qBT
   var json_str = JSON.encode(settings);