diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 0d8b1b634..6e3de936c 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         libt_version: ["2.0.11", "1.2.20"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["6.9.0"]
+        qt_version: ["6.9.1"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index 040844d0d..7a9b0910d 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -106,7 +106,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.9.0"
+          version: "6.9.1"
           arch: win64_msvc2022_64
           archives: qtbase qtsvg qttools
           cache: true
diff --git a/.github/workflows/coverity-scan.yaml b/.github/workflows/coverity-scan.yaml
index 22c5a7082..dc561ac4a 100644
--- a/.github/workflows/coverity-scan.yaml
+++ b/.github/workflows/coverity-scan.yaml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         libt_version: ["2.0.11"]
         qbt_gui: ["GUI=ON"]
-        qt_version: ["6.6.3"]
+        qt_version: ["6.9.1"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -39,7 +39,7 @@ jobs:
       - name: Install boost
         env:
           BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "86"
+          BOOST_MINOR_VERSION: "88"
           BOOST_PATCH_VERSION: "0"
         run: |
           boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
diff --git a/src/base/bittorrent/bencoderesumedatastorage.cpp b/src/base/bittorrent/bencoderesumedatastorage.cpp
index b217afcc6..87b349f14 100644
--- a/src/base/bittorrent/bencoderesumedatastorage.cpp
+++ b/src/base/bittorrent/bencoderesumedatastorage.cpp
@@ -189,8 +189,13 @@ void BitTorrent::BencodeResumeDataStorage::loadQueue(const Path &queueFilename)
         return;
     }
 
+    QHash<TorrentID, qsizetype> registeredTorrentsIndexes;
+    registeredTorrentsIndexes.reserve(m_registeredTorrents.length());
+    for (qsizetype i = 0; i < m_registeredTorrents.length(); ++i)
+        registeredTorrentsIndexes.insert(m_registeredTorrents.at(i), i);
+
     const QRegularExpression hashPattern {u"^([A-Fa-f0-9]{40})$"_s};
-    int start = 0;
+    qsizetype queuePos = 0;
     while (true)
     {
         const auto line = QString::fromLatin1(queueFile.readLine(lineMaxLength).trimmed());
@@ -201,11 +206,15 @@ void BitTorrent::BencodeResumeDataStorage::loadQueue(const Path &queueFilename)
         if (rxMatch.hasMatch())
         {
             const auto torrentID = BitTorrent::TorrentID::fromString(rxMatch.captured(1));
-            const int pos = m_registeredTorrents.indexOf(torrentID, start);
+            const qsizetype pos = registeredTorrentsIndexes.value(torrentID, -1);
             if (pos != -1)
             {
-                std::swap(m_registeredTorrents[start], m_registeredTorrents[pos]);
-                ++start;
+                if (pos != queuePos)
+                {
+                    m_registeredTorrents.swapItemsAt(pos, queuePos);
+                    registeredTorrentsIndexes.insert(m_registeredTorrents.at(pos), pos);
+                }
+                ++queuePos;
             }
         }
     }
diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html
index d8d176161..39510862f 100644
--- a/src/webui/www/private/addpeers.html
+++ b/src/webui/www/private/addpeers.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Add Peers)QBT_TR[CONTEXT=PeersAdditionDialog]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
index 5e30e49eb..c736af237 100644
--- a/src/webui/www/private/addtrackers.html
+++ b/src/webui/www/private/addtrackers.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Add trackers)QBT_TR[CONTEXT=TrackersAdditionDialog]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/addwebseeds.html b/src/webui/www/private/addwebseeds.html
index b978c15d8..8b02b08d7 100644
--- a/src/webui/www/private/addwebseeds.html
+++ b/src/webui/www/private/addwebseeds.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Add web seeds)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/confirmfeeddeletion.html b/src/webui/www/private/confirmfeeddeletion.html
index d0bbf2aa4..27103f860 100644
--- a/src/webui/www/private/confirmfeeddeletion.html
+++ b/src/webui/www/private/confirmfeeddeletion.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Deletion confirmation)QBT_TR[CONTEXT=RSSWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/confirmruleclear.html b/src/webui/www/private/confirmruleclear.html
index 9e1abf9d8..022e78eef 100644
--- a/src/webui/www/private/confirmruleclear.html
+++ b/src/webui/www/private/confirmruleclear.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Clear downloaded episodes)QBT_TR[CONTEXT=AutomatedRssDownloader]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/confirmruledeletion.html b/src/webui/www/private/confirmruledeletion.html
index 8440610c3..16c224829 100644
--- a/src/webui/www/private/confirmruledeletion.html
+++ b/src/webui/www/private/confirmruledeletion.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Rule deletion confirmation)QBT_TR[CONTEXT=AutomatedRssDownloader]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/confirmtrackerdeletion.html b/src/webui/www/private/confirmtrackerdeletion.html
index 8bda4c0bc..6a6950c5c 100644
--- a/src/webui/www/private/confirmtrackerdeletion.html
+++ b/src/webui/www/private/confirmtrackerdeletion.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Remove tracker)QBT_TR[CONTEXT=confirmDeletionDlg]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index 6375f8d8e..53921e64d 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -6,10 +6,41 @@
     <title>QBT_TR(Add Torrent Links)QBT_TR[CONTEXT=downloadFromURL]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
     <link rel="stylesheet" href="css/Window.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/download.js?v=${CACHEID}"></script>
-    <script src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/download.js?v=${CACHEID}"></script>
+    <script defer src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script>
+        "use strict";
+
+        window.addEventListener("DOMContentLoaded", (event) => {
+            const encodedUrls = new URLSearchParams(window.location.search).get("urls");
+            if (encodedUrls !== null) {
+                const urls = encodedUrls.split("|").map(decodeURIComponent);
+                if (urls.length > 0)
+                    document.getElementById("urls").value = urls.join("\n");
+            }
+
+            let submitted = false;
+
+            document.getElementById("downloadForm").addEventListener("submit", (event) => {
+                document.getElementById("startTorrentHidden").value = document.getElementById("startTorrent").checked ? "false" : "true";
+
+                document.getElementById("dlLimitHidden").value = Number(document.getElementById("dlLimitText").value) * 1024;
+                document.getElementById("upLimitHidden").value = Number(document.getElementById("upLimitText").value) * 1024;
+
+                document.getElementById("download_spinner").style.display = "block";
+                submitted = true;
+            });
+
+            document.getElementById("download_frame").addEventListener("load", (event) => {
+                if (submitted)
+                    window.parent.qBittorrent.Client.closeFrameWindow(window);
+            });
+
+            window.qBittorrent.pathAutofill.attachPathAutofill();
+        });
+    </script>
 </head>
 
 <body>
@@ -156,36 +187,6 @@
         </div>
     </form>
     <div id="download_spinner" class="mochaSpinner"></div>
-
-    <script>
-        "use strict";
-
-        const encodedUrls = new URLSearchParams(window.location.search).get("urls");
-        if (encodedUrls !== null) {
-            const urls = encodedUrls.split("|").map(decodeURIComponent);
-            if (urls.length > 0)
-                document.getElementById("urls").value = urls.join("\n");
-        }
-
-        let submitted = false;
-
-        document.getElementById("downloadForm").addEventListener("submit", (event) => {
-            document.getElementById("startTorrentHidden").value = document.getElementById("startTorrent").checked ? "false" : "true";
-
-            document.getElementById("dlLimitHidden").value = Number(document.getElementById("dlLimitText").value) * 1024;
-            document.getElementById("upLimitHidden").value = Number(document.getElementById("upLimitText").value) * 1024;
-
-            document.getElementById("download_spinner").style.display = "block";
-            submitted = true;
-        });
-
-        document.getElementById("download_frame").addEventListener("load", (event) => {
-            if (submitted)
-                window.parent.qBittorrent.Client.closeFrameWindow(window);
-        });
-
-        window.qBittorrent.pathAutofill.attachPathAutofill();
-    </script>
 </body>
 
 </html>
diff --git a/src/webui/www/private/editfeedurl.html b/src/webui/www/private/editfeedurl.html
index 9d87b5176..c1bd69c9a 100644
--- a/src/webui/www/private/editfeedurl.html
+++ b/src/webui/www/private/editfeedurl.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Please type a RSS feed URL)QBT_TR[CONTEXT=RSSWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html
index 4cb53c992..b5aff329d 100644
--- a/src/webui/www/private/edittracker.html
+++ b/src/webui/www/private/edittracker.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Tracker editing)QBT_TR[CONTEXT=TrackerListWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/editwebseed.html b/src/webui/www/private/editwebseed.html
index 245c42a78..b15e09bb6 100644
--- a/src/webui/www/private/editwebseed.html
+++ b/src/webui/www/private/editwebseed.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Edit web seed)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 86fe8fdf5..3abdc6f2a 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -5,10 +5,10 @@
     <meta charset="UTF-8">
     <title>QBT_TR(New Category)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
-    <script src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
+    <script defer src="scripts/pathAutofill.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/newfeed.html b/src/webui/www/private/newfeed.html
index 44bbdb359..743cb2f9d 100644
--- a/src/webui/www/private/newfeed.html
+++ b/src/webui/www/private/newfeed.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Please type a RSS feed URL)QBT_TR[CONTEXT=RSSWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/newfolder.html b/src/webui/www/private/newfolder.html
index 7f1ea3caa..ce774b9d2 100644
--- a/src/webui/www/private/newfolder.html
+++ b/src/webui/www/private/newfolder.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Please choose a folder name)QBT_TR[CONTEXT=RSSWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/newrule.html b/src/webui/www/private/newrule.html
index cfda12745..c52fd4e3b 100644
--- a/src/webui/www/private/newrule.html
+++ b/src/webui/www/private/newrule.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(New rule name)QBT_TR[CONTEXT=AutomatedRssDownloader]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/newtag.html b/src/webui/www/private/newtag.html
index debfaf999..3d50b2d65 100644
--- a/src/webui/www/private/newtag.html
+++ b/src/webui/www/private/newtag.html
@@ -5,9 +5,9 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Add tags)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 8ee4ffdb9..ff920ba3e 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Rename)QBT_TR[CONTEXT=TransferListWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/rename_feed.html b/src/webui/www/private/rename_feed.html
index 7a26c07fc..dc2ce7b63 100644
--- a/src/webui/www/private/rename_feed.html
+++ b/src/webui/www/private/rename_feed.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Please choose a new name for this RSS feed)QBT_TR[CONTEXT=RSSWidget]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/rename_file.html b/src/webui/www/private/rename_file.html
index 5e4fade6d..6ce3d80d6 100644
--- a/src/webui/www/private/rename_file.html
+++ b/src/webui/www/private/rename_file.html
@@ -5,9 +5,9 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Renaming)QBT_TR[CONTEXT=TorrentContentTreeView]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/filesystem.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/filesystem.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/rename_files.html b/src/webui/www/private/rename_files.html
index bdfc46e75..9406c3f5a 100644
--- a/src/webui/www/private/rename_files.html
+++ b/src/webui/www/private/rename_files.html
@@ -4,11 +4,11 @@
 <head>
     <meta charset="UTF-8">
     <title>QBT_TR(Renaming)QBT_TR[CONTEXT=TorrentContentTreeView]</title>
-    <script src="scripts/filesystem.js?v=${CACHEID}"></script>
-    <script src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
-    <script src="scripts/file-tree.js?v=${CACHEID}"></script>
-    <script src="scripts/dynamicTable.js?locale=${LANG}&v=${CACHEID}"></script>
-    <script src="scripts/rename-files.js?v=${CACHEID}"></script>
+    <script defer src="scripts/filesystem.js?v=${CACHEID}"></script>
+    <script defer src="scripts/misc.js?locale=${LANG}&v=${CACHEID}"></script>
+    <script defer src="scripts/file-tree.js?v=${CACHEID}"></script>
+    <script defer src="scripts/dynamicTable.js?locale=${LANG}&v=${CACHEID}"></script>
+    <script defer src="scripts/rename-files.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/rename_rule.html b/src/webui/www/private/rename_rule.html
index ac05aa923..2dfb66087 100644
--- a/src/webui/www/private/rename_rule.html
+++ b/src/webui/www/private/rename_rule.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Rule renaming)QBT_TR[CONTEXT=AutomatedRssDownloader]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
index 5f0e417e6..f0f20c48b 100644
--- a/src/webui/www/private/scripts/dynamicTable.js
+++ b/src/webui/www/private/scripts/dynamicTable.js
@@ -861,42 +861,49 @@ window.qBittorrent.DynamicTable ??= (() => {
             }
             else {
                 const trs = [...this.getTrs()];
+                const trMap = new Map(trs.map(tr => [tr.rowId, tr]));
 
                 for (let rowPos = 0; rowPos < rows.length; ++rowPos) {
                     const rowId = rows[rowPos].rowId;
-                    let tr_found = false;
-                    for (let j = rowPos; j < trs.length; ++j) {
-                        if (trs[j].rowId === rowId) {
-                            tr_found = true;
-                            if (rowPos === j)
-                                break;
-                            trs[j].inject(trs[rowPos], "before");
-                            const tmpTr = trs[j];
-                            trs.splice(j, 1);
-                            trs.splice(rowPos, 0, tmpTr);
-                            break;
-                        }
+                    const existingTr = trMap.get(rowId);
+                    if (existingTr !== undefined) {
+                        this.updateRow(existingTr, fullUpdate);
                     }
-                    if (tr_found) { // row already exists in the table
-                        this.updateRow(trs[rowPos], fullUpdate);
-                    }
-                    else { // else create a new row in the table
+                    else {
                         const tr = this.createRowElement(rows[rowPos]);
 
-                        // Insert
-                        if (rowPos >= trs.length) {
-                            tr.inject(this.tableBody);
-                            trs.push(tr);
-                        }
-                        else {
-                            tr.inject(trs[rowPos], "before");
-                            trs.splice(rowPos, 0, tr);
-                        }
+                        // TODO look into using DocumentFragment or appending all trs at once for add'l performance gains
+                        // add to end of table - we'll move into the proper order later
+                        this.tableBody.appendChild(tr);
+                        trMap.set(rowId, tr);
 
                         this.updateRow(tr, true);
                     }
                 }
 
+                // reorder table rows
+                let prevTr = null;
+                for (let rowPos = 0; rowPos < rows.length; ++rowPos) {
+                    const { rowId } = rows[rowPos];
+                    const tr = trMap.get(rowId);
+
+                    const isInCorrectLocation = rowId === trs[rowPos]?.rowId;
+                    if (!isInCorrectLocation) {
+                        // move row into correct location
+                        if (prevTr === null) {
+                            // insert as first row in table
+                            if (trs.length === 0)
+                                this.tableBody.append(tr);
+                            else
+                                trs[0].before(tr);
+                        }
+                        else {
+                            prevTr.after(tr);
+                        }
+                    }
+                    prevTr = tr;
+                }
+
                 const rowPos = rows.length;
 
                 while ((rowPos < trs.length) && (trs.length > 0))
@@ -914,8 +921,8 @@ window.qBittorrent.DynamicTable ??= (() => {
 
             if (this.renderedHeight === 0)
                 return;
-            // show extra 6 rows at top/bottom to reduce flickering
-            const extraRowCount = 6;
+            // show extra rows at top/bottom to reduce flickering
+            const extraRowCount = 20;
             // how many rows can be shown in the visible area
             const visibleRowCount = Math.ceil(this.renderedHeight / this.rowHeight) + (extraRowCount * 2);
             // start position of visible rows, offsetted by renderedOffset
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index f888cdc6d..e03ca04cb 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -5,9 +5,9 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Set location)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/pathAutofill.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/shareratio.html b/src/webui/www/private/shareratio.html
index f1482ef6f..1a4db9554 100644
--- a/src/webui/www/private/shareratio.html
+++ b/src/webui/www/private/shareratio.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Torrent Upload/Download Ratio Limiting)QBT_TR[CONTEXT=UpDownRatioDialog]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
     <script>
         "use strict";
 
diff --git a/src/webui/www/private/speedlimit.html b/src/webui/www/private/speedlimit.html
index 5bfd5840f..95434e188 100644
--- a/src/webui/www/private/speedlimit.html
+++ b/src/webui/www/private/speedlimit.html
@@ -5,8 +5,144 @@
     <meta charset="UTF-8">
     <title>QBT_TR(Speed limit)QBT_TR[CONTEXT=SpeedLimit]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script>
+        "use strict";
+
+        window.addEventListener("DOMContentLoaded", (event) => {
+            const applyButton = document.getElementById("applyButton");
+
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        applyButton.click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
+            const params = new URLSearchParams(window.location.search);
+            const type = params.get("type");
+            const hashes = params.get("hashes").split("|");
+
+            const isGlobal = (hashes[0] === "global");
+            // Otherwise it's download limit
+            const isUpload = (type === "upload");
+
+            const getLimitMethod = isUpload ? "uploadLimit" : "downloadLimit";
+            const setLimitMethod = isUpload ? "setUploadLimit" : "setDownloadLimit";
+
+            const limitUpdateValue = document.getElementById("limitUpdateValue");
+            const limitUnit = document.getElementById("limitUnit");
+
+            const setLimitUpdateValue = (value) => {
+                if (value === 0) {
+                    limitUpdateValue.value = "∞";
+                    limitUnit.style.visibility = "hidden";
+                }
+                else {
+                    limitUpdateValue.value = value;
+                    limitUnit.style.visibility = "visible";
+                }
+            };
+
+            const setupSlider = (limit, maximum) => {
+                const input = document.getElementById("limitSliderInput");
+                input.max = maximum;
+                input.value = limit;
+                input.addEventListener("input", (event) => {
+                    setLimitUpdateValue(Number(event.target.value));
+                });
+                // Set default value
+                setLimitUpdateValue(limit);
+            };
+
+            applyButton.addEventListener("click", (event) => {
+                const limit = Number(limitUpdateValue.value) * 1024;
+                if (isGlobal) {
+                    fetch(`api/v2/transfer/${setLimitMethod}`, {
+                            method: "POST",
+                            body: new URLSearchParams({
+                                limit: limit
+                            })
+                        })
+                        .then((response) => {
+                            if (!response.ok)
+                                return;
+
+                            window.parent.updateMainData();
+                            window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        });
+                }
+                else {
+                    fetch(`api/v2/torrents/${setLimitMethod}`, {
+                            method: "POST",
+                            body: new URLSearchParams({
+                                hashes: hashes.join("|"),
+                                limit: limit
+                            })
+                        })
+                        .then((response) => {
+                            if (!response.ok)
+                                return;
+
+                            window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        });
+                }
+            });
+
+            document.getElementById("limitUpdateLabel").textContent =
+                isUpload
+                ? `QBT_TR(Upload limit:)QBT_TR[CONTEXT=SpeedLimit]`
+                : `QBT_TR(Download limit:)QBT_TR[CONTEXT=SpeedLimit]`;
+
+            fetch(`api/v2/transfer/${getLimitMethod}`, {
+                    method: "GET",
+                    cache: "no-store"
+                })
+                .then(async (response) => {
+                    if (!response.ok)
+                        return;
+
+                    const data = await response.text();
+
+                    const globalLimit = Math.max((Number(data) / 1024), 0);
+
+                    // Get torrents download limit
+                    // And create slider
+                    if (isGlobal) {
+                        setupSlider(globalLimit, 10000);
+                    }
+                    else {
+                        fetch(`api/v2/torrents/${getLimitMethod}`, {
+                                method: "POST",
+                                body: new URLSearchParams({
+                                    hashes: hashes.join("|")
+                                })
+                            })
+                            .then(async (response) => {
+                                if (!response.ok)
+                                    return;
+
+                                const data = await response.json();
+
+                                const firstLimit = Math.max(data[hashes[0]], 0);
+                                const isAllFirstLimit = Object.values(data).every(value => value === firstLimit);
+                                const limit = isAllFirstLimit ? Math.round(firstLimit / 1024) : 0;
+
+                                setupSlider(limit, ((globalLimit > 0) ? globalLimit : 1000));
+                            });
+                    }
+                });
+
+            limitUpdateValue.focus();
+        });
+    </script>
 </head>
 
 <body>
@@ -19,141 +155,8 @@
             </div>
             <input type="range" id="limitSliderInput" min="0" value="0" style="width: 100%;" aria-label="QBT_TR(Speed limit)QBT_TR[CONTEXT=SpeedLimit]">
         </div>
-        <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="saveLimit()">
+        <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]">
     </div>
-
-    <script>
-        "use strict";
-
-        window.addEventListener("keydown", (event) => {
-            switch (event.key) {
-                case "Enter":
-                    event.preventDefault();
-                    document.getElementById("applyButton").click();
-                    break;
-                case "Escape":
-                    event.preventDefault();
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    break;
-            }
-        });
-
-        const params = new URLSearchParams(window.location.search);
-        const type = params.get("type");
-        const hashes = params.get("hashes").split("|");
-
-        const isGlobal = (hashes[0] === "global");
-        // Otherwise it's download limit
-        const isUpload = (type === "upload");
-
-        const getLimitMethod = isUpload ? "uploadLimit" : "downloadLimit";
-        const setLimitMethod = isUpload ? "setUploadLimit" : "setDownloadLimit";
-
-        const limitUpdateValue = document.getElementById("limitUpdateValue");
-        const limitUnit = document.getElementById("limitUnit");
-
-        const setLimitUpdateValue = (value) => {
-            if (value === 0) {
-                limitUpdateValue.value = "∞";
-                limitUnit.style.visibility = "hidden";
-            }
-            else {
-                limitUpdateValue.value = value;
-                limitUnit.style.visibility = "visible";
-            }
-        };
-
-        const setupSlider = (limit, maximum) => {
-            const input = document.getElementById("limitSliderInput");
-            input.max = maximum;
-            input.value = limit;
-            input.addEventListener("input", (event) => {
-                setLimitUpdateValue(Number(event.target.value));
-            });
-            // Set default value
-            setLimitUpdateValue(limit);
-        };
-
-        const saveLimit = () => {
-            const limit = Number(limitUpdateValue.value) * 1024;
-            if (isGlobal) {
-                fetch(`api/v2/transfer/${setLimitMethod}`, {
-                        method: "POST",
-                        body: new URLSearchParams({
-                            limit: limit
-                        })
-                    })
-                    .then((response) => {
-                        if (!response.ok)
-                            return;
-
-                        window.parent.updateMainData();
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    });
-            }
-            else {
-                fetch(`api/v2/torrents/${setLimitMethod}`, {
-                        method: "POST",
-                        body: new URLSearchParams({
-                            hashes: hashes.join("|"),
-                            limit: limit
-                        })
-                    })
-                    .then((response) => {
-                        if (!response.ok)
-                            return;
-
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    });
-            }
-        };
-
-        document.getElementById("limitUpdateLabel").textContent =
-            isUpload
-            ? `QBT_TR(Upload limit:)QBT_TR[CONTEXT=SpeedLimit]`
-            : `QBT_TR(Download limit:)QBT_TR[CONTEXT=SpeedLimit]`;
-
-        fetch(`api/v2/transfer/${getLimitMethod}`, {
-                method: "GET",
-                cache: "no-store"
-            })
-            .then(async (response) => {
-                if (!response.ok)
-                    return;
-
-                const data = await response.text();
-
-                const globalLimit = Math.max((Number(data) / 1024), 0);
-
-                // Get torrents download limit
-                // And create slider
-                if (isGlobal) {
-                    setupSlider(globalLimit, 10000);
-                }
-                else {
-                    fetch(`api/v2/torrents/${getLimitMethod}`, {
-                            method: "POST",
-                            body: new URLSearchParams({
-                                hashes: hashes.join("|")
-                            })
-                        })
-                        .then(async (response) => {
-                            if (!response.ok)
-                                return;
-
-                            const data = await response.json();
-
-                            const firstLimit = Math.max(data[hashes[0]], 0);
-                            const isAllFirstLimit = Object.values(data).every(value => value === firstLimit);
-                            const limit = isAllFirstLimit ? Math.round(firstLimit / 1024) : 0;
-
-                            setupSlider(limit, ((globalLimit > 0) ? globalLimit : 1000));
-                        });
-                }
-            });
-
-        limitUpdateValue.focus();
-    </script>
 </body>
 
 </html>
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index ab2410627..1a89cffe1 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -6,10 +6,38 @@
     <title>QBT_TR(Upload local torrent)QBT_TR[CONTEXT=HttpServer]</title>
     <link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css">
     <link rel="stylesheet" href="css/Window.css?v=${CACHEID}" type="text/css">
-    <script src="scripts/localpreferences.js?v=${CACHEID}"></script>
-    <script src="scripts/color-scheme.js?v=${CACHEID}"></script>
-    <script src="scripts/download.js?v=${CACHEID}"></script>
-    <script src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script defer src="scripts/localpreferences.js?v=${CACHEID}"></script>
+    <script defer src="scripts/color-scheme.js?v=${CACHEID}"></script>
+    <script defer src="scripts/download.js?v=${CACHEID}"></script>
+    <script defer src="scripts/pathAutofill.js?v=${CACHEID}"></script>
+    <script>
+        "use strict";
+
+        window.addEventListener("DOMContentLoaded", (event) => {
+            let submitted = false;
+
+            document.getElementById("uploadForm").addEventListener("submit", (event) => {
+                document.getElementById("startTorrentHidden").value = document.getElementById("startTorrent").checked ? "false" : "true";
+
+                document.getElementById("dlLimitHidden").value = Number(document.getElementById("dlLimitText").value) * 1024;
+                document.getElementById("upLimitHidden").value = Number(document.getElementById("upLimitText").value) * 1024;
+
+                document.getElementById("upload_spinner").style.display = "block";
+                submitted = true;
+            });
+
+            document.getElementById("upload_frame").addEventListener("load", (event) => {
+                if (submitted)
+                    window.parent.qBittorrent.Client.closeFrameWindow(window);
+            });
+
+            const userAgent = (navigator.userAgentData?.platform ?? navigator.platform).toLowerCase();
+            if (userAgent.includes("ipad") || userAgent.includes("iphone") || (userAgent.includes("mac") && (navigator.maxTouchPoints > 1)))
+                document.getElementById("fileselect").accept = ".torrent";
+
+            window.qBittorrent.pathAutofill.attachPathAutofill();
+        });
+    </script>
 </head>
 
 <body>
@@ -153,33 +181,6 @@
         </fieldset>
     </form>
     <div id="upload_spinner" class="mochaSpinner"></div>
-
-    <script>
-        "use strict";
-
-        let submitted = false;
-
-        document.getElementById("uploadForm").addEventListener("submit", (event) => {
-            document.getElementById("startTorrentHidden").value = document.getElementById("startTorrent").checked ? "false" : "true";
-
-            document.getElementById("dlLimitHidden").value = Number(document.getElementById("dlLimitText").value) * 1024;
-            document.getElementById("upLimitHidden").value = Number(document.getElementById("upLimitText").value) * 1024;
-
-            document.getElementById("upload_spinner").style.display = "block";
-            submitted = true;
-        });
-
-        document.getElementById("upload_frame").addEventListener("load", (event) => {
-            if (submitted)
-                window.parent.qBittorrent.Client.closeFrameWindow(window);
-        });
-
-        const userAgent = (navigator.userAgentData?.platform ?? navigator.platform).toLowerCase();
-        if (userAgent.includes("ipad") || userAgent.includes("iphone") || (userAgent.includes("mac") && (navigator.maxTouchPoints > 1)))
-            document.getElementById("fileselect").accept = ".torrent";
-
-        window.qBittorrent.pathAutofill.attachPathAutofill();
-    </script>
 </body>
 
 </html>