diff --git a/src/webui/www/.htmlvalidate.json b/src/webui/www/.htmlvalidate.json
index d07cc98d3..e923fc76d 100644
--- a/src/webui/www/.htmlvalidate.json
+++ b/src/webui/www/.htmlvalidate.json
@@ -8,7 +8,6 @@
     "no-conditional-comment": "off",
     "no-inline-style": "off",
     "prefer-button": "off",
-    "prefer-tbody": "off",
     "text-content": "off",
     "void-style": "off",
     "wcag/h63": "off",
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html
index 3d343dce3..7be8e6e96 100644
--- a/src/webui/www/private/download.html
+++ b/src/webui/www/private/download.html
@@ -23,137 +23,139 @@
             <p>QBT_TR(Only one link per line)QBT_TR[CONTEXT=HttpServer]</p>
             <fieldset class="settings" style="border: 0; text-align: left; margin-top: 6px;">
                 <table style="margin: auto;">
-                    <tr>
-                        <td>
-                            <label for="autoTMM">QBT_TR(Torrent Management Mode:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <select id="autoTMM" name="autoTMM" onchange="qBittorrent.Download.changeTMM(this)">
-                                <option selected value="false">QBT_TR(Manual)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                                <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="savepath">QBT_TR(Save files to location:)QBT_TR[CONTEXT=HttpServer]</label>
-                        </td>
-                        <td>
-                            <input type="text" id="savepath" name="savepath" class="pathDirectory" style="width: 16em;" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="cookie">QBT_TR(Cookie:)QBT_TR[CONTEXT=HttpServer]</label>
-                        </td>
-                        <td>
-                            <input type="text" id="cookie" name="cookie" style="width: 16em;" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="rename">QBT_TR(Rename torrent)QBT_TR[CONTEXT=HttpServer]</label>
-                        </td>
-                        <td>
-                            <input type="text" id="rename" name="rename" style="width: 16em;" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="category">QBT_TR(Category:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <div class="select-watched-folder-editable">
-                                <select id="categorySelect" onchange="qBittorrent.Download.changeCategorySelect(this)">
-                                    <option selected value="\other"></option>
+                    <tbody>
+                        <tr>
+                            <td>
+                                <label for="autoTMM">QBT_TR(Torrent Management Mode:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <select id="autoTMM" name="autoTMM" onchange="qBittorrent.Download.changeTMM(this)">
+                                    <option selected value="false">QBT_TR(Manual)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                    <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
                                 </select>
-                                <input name="category" type="text" />
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <input type="hidden" id="startTorrentHidden" name="stopped" />
-                            <input type="checkbox" id="startTorrent" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="addToTopOfQueue">QBT_TR(Add to top of queue)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <input type="checkbox" id="addToTopOfQueue" name="addToTopOfQueue" value="true" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="stopCondition">QBT_TR(Stop condition:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <select id="stopCondition" name="stopCondition">
-                                <option selected value="None">QBT_TR(None)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                                <option value="MetadataReceived">QBT_TR(Metadata received)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                                <option value="FilesChecked">QBT_TR(Files checked)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="skip_checking">QBT_TR(Skip hash check)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <input type="checkbox" id="skip_checking" name="skip_checking" value="true" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="contentLayout">QBT_TR(Content layout:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                        </td>
-                        <td>
-                            <select id="contentLayout" name="contentLayout">
-                                <option selected value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                                <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                                <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="sequentialDownload">QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]</label>
-                        </td>
-                        <td>
-                            <input type="checkbox" id="sequentialDownload" name="sequentialDownload" value="true" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="firstLastPiecePrio">QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</label>
-                        </td>
-                        <td>
-                            <input type="checkbox" id="firstLastPiecePrio" name="firstLastPiecePrio" value="true" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="dlLimitText">QBT_TR(Limit download rate)QBT_TR[CONTEXT=HttpServer]</label>
-                        </td>
-                        <td>
-                            <input type="hidden" id="dlLimitHidden" name="dlLimit" />
-                            <input type="text" id="dlLimitText" style="width: 16em;" placeholder="KiB/s" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <label for="upLimitText">QBT_TR(Limit upload rate)QBT_TR[CONTEXT=HttpServer]</label>
-                        </td>
-                        <td>
-                            <input type="hidden" id="upLimitHidden" name="upLimit" />
-                            <input type="text" id="upLimitText" style="width: 16em;" placeholder="KiB/s" />
-                        </td>
-                    </tr>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="savepath">QBT_TR(Save files to location:)QBT_TR[CONTEXT=HttpServer]</label>
+                            </td>
+                            <td>
+                                <input type="text" id="savepath" name="savepath" class="pathDirectory" style="width: 16em;" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="cookie">QBT_TR(Cookie:)QBT_TR[CONTEXT=HttpServer]</label>
+                            </td>
+                            <td>
+                                <input type="text" id="cookie" name="cookie" style="width: 16em;" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="rename">QBT_TR(Rename torrent)QBT_TR[CONTEXT=HttpServer]</label>
+                            </td>
+                            <td>
+                                <input type="text" id="rename" name="rename" style="width: 16em;" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="category">QBT_TR(Category:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <div class="select-watched-folder-editable">
+                                    <select id="categorySelect" onchange="qBittorrent.Download.changeCategorySelect(this)">
+                                        <option selected value="\other"></option>
+                                    </select>
+                                    <input name="category" type="text" />
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <input type="hidden" id="startTorrentHidden" name="stopped" />
+                                <input type="checkbox" id="startTorrent" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="addToTopOfQueue">QBT_TR(Add to top of queue)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <input type="checkbox" id="addToTopOfQueue" name="addToTopOfQueue" value="true" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="stopCondition">QBT_TR(Stop condition:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <select id="stopCondition" name="stopCondition">
+                                    <option selected value="None">QBT_TR(None)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                    <option value="MetadataReceived">QBT_TR(Metadata received)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                    <option value="FilesChecked">QBT_TR(Files checked)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="skip_checking">QBT_TR(Skip hash check)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <input type="checkbox" id="skip_checking" name="skip_checking" value="true" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="contentLayout">QBT_TR(Content layout:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                            </td>
+                            <td>
+                                <select id="contentLayout" name="contentLayout">
+                                    <option selected value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                    <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                    <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="sequentialDownload">QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]</label>
+                            </td>
+                            <td>
+                                <input type="checkbox" id="sequentialDownload" name="sequentialDownload" value="true" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="firstLastPiecePrio">QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</label>
+                            </td>
+                            <td>
+                                <input type="checkbox" id="firstLastPiecePrio" name="firstLastPiecePrio" value="true" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="dlLimitText">QBT_TR(Limit download rate)QBT_TR[CONTEXT=HttpServer]</label>
+                            </td>
+                            <td>
+                                <input type="hidden" id="dlLimitHidden" name="dlLimit" />
+                                <input type="text" id="dlLimitText" style="width: 16em;" placeholder="KiB/s" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="upLimitText">QBT_TR(Limit upload rate)QBT_TR[CONTEXT=HttpServer]</label>
+                            </td>
+                            <td>
+                                <input type="hidden" id="upLimitHidden" name="upLimit" />
+                                <input type="text" id="upLimitText" style="width: 16em;" placeholder="KiB/s" />
+                            </td>
+                        </tr>
+                    </tbody>
                 </table>
                 <div id="submitbutton" style="margin-top: 12px; text-align: center;">
                     <button type="submit" id="submitButton">QBT_TR(Download)QBT_TR[CONTEXT=downloadFromURL]</button>
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 224c92e7f..c60105d98 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -249,19 +249,21 @@
         <div id="desktopFooter">
             <span id="error_div"></span>
             <table style="position: absolute; right: 5px;">
-                <tr>
-                    <td id="freeSpaceOnDisk"></td>
-                    <td class="statusBarSeparator"></td>
-                    <td id="DHTNodes"></td>
-                    <td class="statusBarSeparator"></td>
-                    <td><img id="connectionStatus" alt="QBT_TR(Connection status: Firewalled)QBT_TR[CONTEXT=MainWindow]" title="QBT_TR(Connection status: Firewalled)QBT_TR[CONTEXT=MainWindow]" src="images/firewalled.svg" style="height: 1.5em;" /></td>
-                    <td class="statusBarSeparator"></td>
-                    <td style="cursor:pointer;"><img id="alternativeSpeedLimits" alt="QBT_TR(Alternative speed limits: Off)QBT_TR[CONTEXT=MainWindow]" title="QBT_TR(Alternative speed limits: Off)QBT_TR[CONTEXT=MainWindow]" src="images/slow_off.svg" style="height: 1.5em;" /></td>
-                    <td class="statusBarSeparator"></td>
-                    <td class="speedLabel"><img src="images/downloading.svg" alt="QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow]" style="height: 1.5em; padding-right: 5px; margin-bottom: -4px;"><span id="DlInfos"></span></td>
-                    <td class="statusBarSeparator"></td>
-                    <td class="speedLabel"><img src="images/upload.svg" alt="QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow]" style="height: 1.5em; padding-right: 5px; margin-bottom: -4px;"><span id="UpInfos"></span></td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td id="freeSpaceOnDisk"></td>
+                        <td class="statusBarSeparator"></td>
+                        <td id="DHTNodes"></td>
+                        <td class="statusBarSeparator"></td>
+                        <td><img id="connectionStatus" alt="QBT_TR(Connection status: Firewalled)QBT_TR[CONTEXT=MainWindow]" title="QBT_TR(Connection status: Firewalled)QBT_TR[CONTEXT=MainWindow]" src="images/firewalled.svg" style="height: 1.5em;" /></td>
+                        <td class="statusBarSeparator"></td>
+                        <td style="cursor:pointer;"><img id="alternativeSpeedLimits" alt="QBT_TR(Alternative speed limits: Off)QBT_TR[CONTEXT=MainWindow]" title="QBT_TR(Alternative speed limits: Off)QBT_TR[CONTEXT=MainWindow]" src="images/slow_off.svg" style="height: 1.5em;" /></td>
+                        <td class="statusBarSeparator"></td>
+                        <td class="speedLabel"><img src="images/downloading.svg" alt="QBT_TR(Download speed icon)QBT_TR[CONTEXT=MainWindow]" style="height: 1.5em; padding-right: 5px; margin-bottom: -4px;"><span id="DlInfos"></span></td>
+                        <td class="statusBarSeparator"></td>
+                        <td class="speedLabel"><img src="images/upload.svg" alt="QBT_TR(Upload speed icon)QBT_TR[CONTEXT=MainWindow]" style="height: 1.5em; padding-right: 5px; margin-bottom: -4px;"><span id="UpInfos"></span></td>
+                    </tr>
+                </tbody>
             </table>
         </div>
     </div>
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index 2be87ba9e..71e65d23a 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -19,129 +19,131 @@
         </div>
         <fieldset class="settings" style="border: 0; text-align: left; margin-top: 12px;">
             <table style="margin: auto;">
-                <tr>
-                    <td>
-                        <label for="autoTMM">QBT_TR(Torrent Management Mode:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <select id="autoTMM" name="autoTMM" onchange="qBittorrent.Download.changeTMM(this)">
-                            <option selected value="false">QBT_TR(Manual)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="savepath">QBT_TR(Save files to location:)QBT_TR[CONTEXT=HttpServer]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="savepath" name="savepath" class="pathDirectory" style="width: 16em;" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="rename">QBT_TR(Rename torrent)QBT_TR[CONTEXT=HttpServer]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="rename" name="rename" style="width: 16em;" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="category">QBT_TR(Category:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <div class="select-watched-folder-editable">
-                            <select id="categorySelect" onchange="qBittorrent.Download.changeCategorySelect(this)">
-                                <option selected value="\other"></option>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="autoTMM">QBT_TR(Torrent Management Mode:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <select id="autoTMM" name="autoTMM" onchange="qBittorrent.Download.changeTMM(this)">
+                                <option selected value="false">QBT_TR(Manual)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
                             </select>
-                            <input name="category" type="text" />
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <input type="hidden" id="startTorrentHidden" name="stopped" />
-                        <input type="checkbox" id="startTorrent" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="addToTopOfQueue">QBT_TR(Add to top of queue)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <input type="checkbox" id="addToTopOfQueue" name="addToTopOfQueue" value="true" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="stopCondition">QBT_TR(Stop condition:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <select id="stopCondition" name="stopCondition">
-                            <option selected value="None">QBT_TR(None)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            <option value="MetadataReceived">QBT_TR(Metadata received)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            <option value="FilesChecked">QBT_TR(Files checked)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="skip_checking">QBT_TR(Skip hash check)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <input type="checkbox" id="skip_checking" name="skip_checking" value="true" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="contentLayout">QBT_TR(Content layout:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
-                    </td>
-                    <td>
-                        <select id="contentLayout" name="contentLayout">
-                            <option selected value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                            <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="sequentialDownload">QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]</label>
-                    </td>
-                    <td>
-                        <input type="checkbox" id="sequentialDownload" name="sequentialDownload" value="true" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="firstLastPiecePrio">QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</label>
-                    </td>
-                    <td>
-                        <input type="checkbox" id="firstLastPiecePrio" name="firstLastPiecePrio" value="true" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="dlLimitText">QBT_TR(Limit download rate)QBT_TR[CONTEXT=HttpServer]</label>
-                    </td>
-                    <td>
-                        <input type="hidden" id="dlLimitHidden" name="dlLimit" />
-                        <input type="text" id="dlLimitText" style="width: 16em;" placeholder="KiB/s" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="upLimitText">QBT_TR(Limit upload rate)QBT_TR[CONTEXT=HttpServer]</label>
-                    </td>
-                    <td>
-                        <input type="hidden" id="upLimitHidden" name="upLimit" />
-                        <input type="text" id="upLimitText" style="width: 16em;" placeholder="KiB/s" />
-                    </td>
-                </tr>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="savepath">QBT_TR(Save files to location:)QBT_TR[CONTEXT=HttpServer]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="savepath" name="savepath" class="pathDirectory" style="width: 16em;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="rename">QBT_TR(Rename torrent)QBT_TR[CONTEXT=HttpServer]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="rename" name="rename" style="width: 16em;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="category">QBT_TR(Category:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <div class="select-watched-folder-editable">
+                                <select id="categorySelect" onchange="qBittorrent.Download.changeCategorySelect(this)">
+                                    <option selected value="\other"></option>
+                                </select>
+                                <input name="category" type="text" />
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <input type="hidden" id="startTorrentHidden" name="stopped" />
+                            <input type="checkbox" id="startTorrent" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="addToTopOfQueue">QBT_TR(Add to top of queue)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <input type="checkbox" id="addToTopOfQueue" name="addToTopOfQueue" value="true" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="stopCondition">QBT_TR(Stop condition:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <select id="stopCondition" name="stopCondition">
+                                <option selected value="None">QBT_TR(None)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                <option value="MetadataReceived">QBT_TR(Metadata received)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                <option value="FilesChecked">QBT_TR(Files checked)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="skip_checking">QBT_TR(Skip hash check)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <input type="checkbox" id="skip_checking" name="skip_checking" value="true" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="contentLayout">QBT_TR(Content layout:)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
+                        </td>
+                        <td>
+                            <select id="contentLayout" name="contentLayout">
+                                <option selected value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                                <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="sequentialDownload">QBT_TR(Download in sequential order)QBT_TR[CONTEXT=TransferListWidget]</label>
+                        </td>
+                        <td>
+                            <input type="checkbox" id="sequentialDownload" name="sequentialDownload" value="true" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="firstLastPiecePrio">QBT_TR(Download first and last pieces first)QBT_TR[CONTEXT=TransferListWidget]</label>
+                        </td>
+                        <td>
+                            <input type="checkbox" id="firstLastPiecePrio" name="firstLastPiecePrio" value="true" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="dlLimitText">QBT_TR(Limit download rate)QBT_TR[CONTEXT=HttpServer]</label>
+                        </td>
+                        <td>
+                            <input type="hidden" id="dlLimitHidden" name="dlLimit" />
+                            <input type="text" id="dlLimitText" style="width: 16em;" placeholder="KiB/s" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="upLimitText">QBT_TR(Limit upload rate)QBT_TR[CONTEXT=HttpServer]</label>
+                        </td>
+                        <td>
+                            <input type="hidden" id="upLimitHidden" name="upLimit" />
+                            <input type="text" id="upLimitText" style="width: 16em;" placeholder="KiB/s" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <div id="submitbutton" style="margin-top: 30px; text-align: center;">
                 <button type="submit" style="font-size: 1em;">QBT_TR(Upload Torrents)QBT_TR[CONTEXT=HttpServer]</button>
diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html
index e566106a8..9d6f7151d 100644
--- a/src/webui/www/private/views/about.html
+++ b/src/webui/www/private/views/about.html
@@ -7,52 +7,58 @@
     <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p>
     <p>Copyright © 2006-2024 The qBittorrent project</p>
     <table>
-        <tr>
-            <td>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td><a href="https://www.qbittorrent.org" target="_blank">https://www.qbittorrent.org</a></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td><a href="https://bugs.qbittorrent.org" target="_blank">https://bugs.qbittorrent.org</a></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Forum:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td><a href="https://forum.qbittorrent.org" target="_blank">https://forum.qbittorrent.org</a></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td><a href="https://www.qbittorrent.org" target="_blank">https://www.qbittorrent.org</a></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td><a href="https://bugs.qbittorrent.org" target="_blank">https://bugs.qbittorrent.org</a></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Forum:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td><a href="https://forum.qbittorrent.org" target="_blank">https://forum.qbittorrent.org</a></td>
+            </tr>
+        </tbody>
     </table>
 </div>
 
 <div id="aboutAuthorContent" class="aboutTabContent invisible">
     <h3>QBT_TR(Current maintainer)QBT_TR[CONTEXT=AboutDialog]</h3>
     <table>
-        <tr>
-            <td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td>Sledgehammer999</td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td>QBT_TR(Greece)QBT_TR[CONTEXT=AboutDialog]</td>
-        </tr>
-        <tr>
-            <td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td><a target="_blank" href="mailto:sledgehammer999@qbittorrent.org">sledgehammer999@qbittorrent.org</a></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td>Sledgehammer999</td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td>QBT_TR(Greece)QBT_TR[CONTEXT=AboutDialog]</td>
+            </tr>
+            <tr>
+                <td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td><a target="_blank" href="mailto:sledgehammer999@qbittorrent.org">sledgehammer999@qbittorrent.org</a></td>
+            </tr>
+        </tbody>
     </table>
     <br />
     <h3>QBT_TR(Original author)QBT_TR[CONTEXT=HttpServer]</h3>
     <table>
-        <tr>
-            <td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td>Christophe Dumez</td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td>QBT_TR(France)QBT_TR[CONTEXT=AboutDialog]</td>
-        </tr>
-        <tr>
-            <td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
-            <td><a target="_blank" href="mailto:chris@qbittorrent.org">chris@qbittorrent.org</a></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(Name:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td>Christophe Dumez</td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Nationality:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td>QBT_TR(France)QBT_TR[CONTEXT=AboutDialog]</td>
+            </tr>
+            <tr>
+                <td>QBT_TR(E-mail:)QBT_TR[CONTEXT=AboutDialog]</td>
+                <td><a target="_blank" href="mailto:chris@qbittorrent.org">chris@qbittorrent.org</a></td>
+            </tr>
+        </tbody>
     </table>
 </div>
 
@@ -816,26 +822,28 @@
 <div id="aboutSoftwareUsedContent" class="aboutTabContent invisible">
     <p>QBT_TR(qBittorrent was built with the following libraries:)QBT_TR[CONTEXT=AboutDialog]</p>
     <table style="margin-left: 20px;">
-        <tr>
-            <td>Qt:</td>
-            <td><span id="qtVersion"></span></td>
-        </tr>
-        <tr>
-            <td>Libtorrent:</td>
-            <td><span id="libtorrentVersion"></span></td>
-        </tr>
-        <tr>
-            <td>Boost:</td>
-            <td><span id="boostVersion"></span></td>
-        </tr>
-        <tr>
-            <td>OpenSSL:</td>
-            <td><span id="opensslVersion"></span></td>
-        </tr>
-        <tr>
-            <td>zlib:</td>
-            <td><span id="zlibVersion"></span></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>Qt:</td>
+                <td><span id="qtVersion"></span></td>
+            </tr>
+            <tr>
+                <td>Libtorrent:</td>
+                <td><span id="libtorrentVersion"></span></td>
+            </tr>
+            <tr>
+                <td>Boost:</td>
+                <td><span id="boostVersion"></span></td>
+            </tr>
+            <tr>
+                <td>OpenSSL:</td>
+                <td><span id="opensslVersion"></span></td>
+            </tr>
+            <tr>
+                <td>zlib:</td>
+                <td><span id="zlibVersion"></span></td>
+            </tr>
+        </tbody>
     </table>
     <p>QBT_TR(The free IP to Country Lite database by DB-IP is used for resolving the countries of peers. The database is licensed under the Creative Commons Attribution 4.0 International License)QBT_TR[CONTEXT=AboutDialog] (<a href="https://db-ip.com/" target="_blank" rel="noopener ">https://db-ip.com/</a>)</p>
 </div>
diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html
index 89ac7fb64..fb88ae016 100644
--- a/src/webui/www/private/views/preferences.html
+++ b/src/webui/www/private/views/preferences.html
@@ -10,24 +10,26 @@
     <fieldset class="settings">
         <legend>QBT_TR(Action on double-click)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td><label for="dblclickDownloadSelect">QBT_TR(Downloading torrents:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td>
-                    <select id="dblclickDownloadSelect">
-                        <option value="1" selected>QBT_TR(Start / Stop Torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="0">QBT_TR(No action)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td><label for="dblclickCompleteSelect">QBT_TR(Completed torrents:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td>
-                    <select id="dblclickCompleteSelect">
-                        <option value="1" selected>QBT_TR(Start / Stop Torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="0">QBT_TR(No action)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td><label for="dblclickDownloadSelect">QBT_TR(Downloading torrents:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td>
+                        <select id="dblclickDownloadSelect">
+                            <option value="1" selected>QBT_TR(Start / Stop Torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="0">QBT_TR(No action)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td><label for="dblclickCompleteSelect">QBT_TR(Completed torrents:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td>
+                        <select id="dblclickCompleteSelect">
+                            <option value="1" selected>QBT_TR(Start / Stop Torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="0">QBT_TR(No action)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -41,23 +43,25 @@
             <input type="text" id="filelog_save_path_input" class="pathDirectory" />
         </div>
         <table>
-            <tr>
-                <td><input type="checkbox" id="filelog_backup_checkbox" onclick="qBittorrent.Preferences.updateFileLogBackupEnabled();" /></td>
-                <td><label for="filelog_backup_checkbox">QBT_TR(Backup the log file after:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td><input id="filelog_max_size_input" type="number" min="1" max="1024000" value="65" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]</td>
-            </tr>
-            <tr>
-                <td><input type="checkbox" id="filelog_delete_old_checkbox" onclick="qBittorrent.Preferences.updateFileLogDeleteEnabled();" /></td>
-                <td><label for="filelog_delete_old_checkbox">QBT_TR(Delete backup logs older than:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td>
-                    <input type="number" min="1" max="365" value="6" id="filelog_age_input" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />
-                    <select id="filelog_age_type_select">
-                        <option value="0">QBT_TR(days)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1" selected>QBT_TR(months)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="2">QBT_TR(years)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td><input type="checkbox" id="filelog_backup_checkbox" onclick="qBittorrent.Preferences.updateFileLogBackupEnabled();" /></td>
+                    <td><label for="filelog_backup_checkbox">QBT_TR(Backup the log file after:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td><input id="filelog_max_size_input" type="number" min="1" max="1024000" value="65" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]</td>
+                </tr>
+                <tr>
+                    <td><input type="checkbox" id="filelog_delete_old_checkbox" onclick="qBittorrent.Preferences.updateFileLogDeleteEnabled();" /></td>
+                    <td><label for="filelog_delete_old_checkbox">QBT_TR(Delete backup logs older than:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td>
+                        <input type="number" min="1" max="365" value="6" id="filelog_age_input" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />
+                        <select id="filelog_age_type_select">
+                            <option value="0">QBT_TR(days)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1" selected>QBT_TR(months)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="2">QBT_TR(years)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -120,91 +124,95 @@
     <fieldset class="settings">
         <legend>QBT_TR(Saving Management)QBT_TR[CONTEXT=HttpServer]</legend>
         <table>
-            <tr>
-                <td>
-                    <label>QBT_TR(Default Torrent Management Mode:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="default_tmm_combobox">
-                        <option value="false" selected>QBT_TR(Manual)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label>QBT_TR(When Torrent Category changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="torrent_changed_tmm_combobox">
-                        <option value="true">QBT_TR(Relocate torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="false" selected>QBT_TR(Switch torrent to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label>QBT_TR(When Default Save Path changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="save_path_changed_tmm_combobox">
-                        <option value="true">QBT_TR(Relocate affected torrents)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="false" selected>QBT_TR(Switch affected torrents to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label>QBT_TR(When Category Save Path changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="category_changed_tmm_combobox">
-                        <option value="true">QBT_TR(Relocate affected torrents)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="false" selected>QBT_TR(Switch affected torrents to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label>QBT_TR(Default Torrent Management Mode:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="default_tmm_combobox">
+                            <option value="false" selected>QBT_TR(Manual)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="true">QBT_TR(Automatic)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label>QBT_TR(When Torrent Category changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="torrent_changed_tmm_combobox">
+                            <option value="true">QBT_TR(Relocate torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="false" selected>QBT_TR(Switch torrent to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label>QBT_TR(When Default Save Path changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="save_path_changed_tmm_combobox">
+                            <option value="true">QBT_TR(Relocate affected torrents)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="false" selected>QBT_TR(Switch affected torrents to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label>QBT_TR(When Category Save Path changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="category_changed_tmm_combobox">
+                            <option value="true">QBT_TR(Relocate affected torrents)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="false" selected>QBT_TR(Switch affected torrents to Manual Mode)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
         </table>
         <div class="formRow">
             <input type="checkbox" id="use_subcategories_checkbox" />
             <label for="use_subcategories_checkbox">QBT_TR(Use Subcategories)QBT_TR[CONTEXT=OptionsDialog]</label>
         </div>
         <table>
-            <tr>
-                <td>
-                    <label for="savepath_text">QBT_TR(Default Save Path:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="savepath_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="temppath_checkbox" onclick="qBittorrent.Preferences.updateTempDirEnabled();" />
-                    <label for="temppath_checkbox">QBT_TR(Keep incomplete torrents in:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="temppath_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="exportdir_checkbox" onclick="qBittorrent.Preferences.updateExportDirEnabled();" />
-                    <label for="exportdir_checkbox">QBT_TR(Copy .torrent files to:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="exportdir_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="exportdirfin_checkbox" onclick="qBittorrent.Preferences.updateExportDirFinEnabled();" />
-                    <label for="exportdirfin_checkbox">QBT_TR(Copy .torrent files for finished downloads to:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="exportdirfin_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="savepath_text">QBT_TR(Default Save Path:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="savepath_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="temppath_checkbox" onclick="qBittorrent.Preferences.updateTempDirEnabled();" />
+                        <label for="temppath_checkbox">QBT_TR(Keep incomplete torrents in:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="temppath_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="exportdir_checkbox" onclick="qBittorrent.Preferences.updateExportDirEnabled();" />
+                        <label for="exportdir_checkbox">QBT_TR(Copy .torrent files to:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="exportdir_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="exportdirfin_checkbox" onclick="qBittorrent.Preferences.updateExportDirFinEnabled();" />
+                        <label for="exportdirfin_checkbox">QBT_TR(Copy .torrent files for finished downloads to:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="exportdirfin_text" class="pathDirectory" autocorrect="off" autocapitalize="none" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -235,30 +243,32 @@
             <label for="mail_notification_checkbox">QBT_TR(Email notification upon download completion)QBT_TR[CONTEXT=OptionsDialog]</label>
         </legend>
         <table>
-            <tr>
-                <td>
-                    <label for="src_email_txt">QBT_TR(From:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="src_email_txt" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="dest_email_txt">QBT_TR(To:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="dest_email_txt" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="smtp_server_txt">QBT_TR(SMTP server:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="smtp_server_txt" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="src_email_txt">QBT_TR(From:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="src_email_txt" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="dest_email_txt">QBT_TR(To:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="dest_email_txt" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="smtp_server_txt">QBT_TR(SMTP server:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="smtp_server_txt" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
         <div class="formRow">
             <input type="checkbox" id="mail_ssl_checkbox" /><label for="mail_ssl_checkbox">QBT_TR(This server requires a secure connection (SSL))QBT_TR[CONTEXT=OptionsDialog]</label>
@@ -269,22 +279,24 @@
                 <label for="mail_auth_checkbox">QBT_TR(Authentication)QBT_TR[CONTEXT=OptionsDialog]</label>
             </legend>
             <table>
-                <tr>
-                    <td>
-                        <label for="mail_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="mail_username_text" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="mail_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="password" id="mail_password_text" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="mail_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="mail_username_text" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="mail_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="password" id="mail_password_text" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
         </fieldset>
         <div class="formRow">
@@ -351,34 +363,36 @@
     <fieldset class="settings">
         <legend>QBT_TR(Connections Limits)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_connec_checkbox" onclick="qBittorrent.Preferences.updateMaxConnecEnabled();" />
-                    <label for="max_connec_checkbox">QBT_TR(Global maximum number of connections:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td><input type="text" id="max_connec_value" style="width: 4em;" /></td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_connec_per_torrent_checkbox" onclick="qBittorrent.Preferences.updateMaxConnecPerTorrentEnabled();" />
-                    <label for="max_connec_per_torrent_checkbox">QBT_TR(Maximum number of connections per torrent:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td><input type="text" id="max_connec_per_torrent_value" style="width: 4em;" /></td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_uploads_checkbox" onclick="qBittorrent.Preferences.updateMaxUploadsEnabled();" />
-                    <label for="max_uploads_checkbox">QBT_TR(Global maximum number of upload slots:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td><input type="text" id="max_uploads_value" style="width: 4em;" /></td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_uploads_per_torrent_checkbox" onclick="qBittorrent.Preferences.updateMaxUploadsPerTorrentEnabled();" />
-                    <label for="max_uploads_per_torrent_checkbox">QBT_TR(Maximum number of upload slots per torrent:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td><input type="text" id="max_uploads_per_torrent_value" style="width: 4em;" /></td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_connec_checkbox" onclick="qBittorrent.Preferences.updateMaxConnecEnabled();" />
+                        <label for="max_connec_checkbox">QBT_TR(Global maximum number of connections:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td><input type="text" id="max_connec_value" style="width: 4em;" /></td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_connec_per_torrent_checkbox" onclick="qBittorrent.Preferences.updateMaxConnecPerTorrentEnabled();" />
+                        <label for="max_connec_per_torrent_checkbox">QBT_TR(Maximum number of connections per torrent:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td><input type="text" id="max_connec_per_torrent_value" style="width: 4em;" /></td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_uploads_checkbox" onclick="qBittorrent.Preferences.updateMaxUploadsEnabled();" />
+                        <label for="max_uploads_checkbox">QBT_TR(Global maximum number of upload slots:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td><input type="text" id="max_uploads_value" style="width: 4em;" /></td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_uploads_per_torrent_checkbox" onclick="qBittorrent.Preferences.updateMaxUploadsPerTorrentEnabled();" />
+                        <label for="max_uploads_per_torrent_checkbox">QBT_TR(Maximum number of upload slots per torrent:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td><input type="text" id="max_uploads_per_torrent_value" style="width: 4em;" /></td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -388,20 +402,22 @@
             <label for="i2pEnabledCheckbox">QBT_TR(I2P (Experimental))QBT_TR[CONTEXT=OptionsDialog]</label>
         </legend>
         <table>
-            <tr>
-                <td>
-                    <label for="i2pAddress">QBT_TR(Host:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="i2pAddress" />
-                </td>
-                <td>
-                    <label for="i2pPort">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="number" id="i2pPort" min="0" max="65535" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 5em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="i2pAddress">QBT_TR(Host:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="i2pAddress" />
+                    </td>
+                    <td>
+                        <label for="i2pPort">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="number" id="i2pPort" min="0" max="65535" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 5em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
         <div class="formRow">
             <input type="checkbox" id="i2pMixedMode" title="QBT_TR(If &quot;mixed mode&quot; is enabled, I2P torrents are allowed to also get peers from other sources than the tracker, and connect to regular IPs, not providing any anonymization. This may be useful if the user is not interested in the anonymization of I2P, but still wants to be able to connect to I2P peers.)QBT_TR[CONTEXT=OptionsDialog]" />
@@ -412,31 +428,33 @@
     <fieldset class="settings">
         <legend>QBT_TR(Proxy Server)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td>
-                    <label for="peer_proxy_type_select">QBT_TR(Type:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="peer_proxy_type_select" onchange="qBittorrent.Preferences.updatePeerProxySettings();">
-                        <option value="None">QBT_TR((None))QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="SOCKS4">QBT_TR(SOCKS4)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="SOCKS5">QBT_TR(SOCKS5)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="HTTP">QBT_TR(HTTP)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-                <td>
-                    <label for="peer_proxy_host_text">QBT_TR(Host:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="peer_proxy_host_text" />
-                </td>
-                <td>
-                    <label for="peer_proxy_port_value">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="peer_proxy_port_value" style="width: 4em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="peer_proxy_type_select">QBT_TR(Type:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="peer_proxy_type_select" onchange="qBittorrent.Preferences.updatePeerProxySettings();">
+                            <option value="None">QBT_TR((None))QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="SOCKS4">QBT_TR(SOCKS4)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="SOCKS5">QBT_TR(SOCKS5)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="HTTP">QBT_TR(HTTP)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                    <td>
+                        <label for="peer_proxy_host_text">QBT_TR(Host:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="peer_proxy_host_text" />
+                    </td>
+                    <td>
+                        <label for="peer_proxy_port_value">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="peer_proxy_port_value" style="width: 4em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
 
         <div class="formRow">
@@ -450,22 +468,24 @@
                 <label for="peer_proxy_auth_checkbox">QBT_TR(Authentication)QBT_TR[CONTEXT=OptionsDialog]</label>
             </legend>
             <table>
-                <tr>
-                    <td>
-                        <label for="peer_proxy_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="peer_proxy_username_text" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="peer_proxy_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="password" id="peer_proxy_password_text" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="peer_proxy_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="peer_proxy_username_text" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="peer_proxy_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="password" id="peer_proxy_password_text" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <div class="formRow">
                 <span>QBT_TR(Info: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]</span>
@@ -518,17 +538,19 @@
     <fieldset class="settings">
         <legend>QBT_TR(Global Rate Limits)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td rowspan="2">
-                    <img src="images/slow_off.svg" style="height: 1.5em;" alt="QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]">
-                </td>
-                <td><label for="up_limit_value">QBT_TR(Upload:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td><input type="number" id="up_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
-            </tr>
-            <tr>
-                <td><label for="dl_limit_value">QBT_TR(Download:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td><input type="number" id="dl_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td rowspan="2">
+                        <img src="images/slow_off.svg" style="height: 1.5em;" alt="QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]">
+                    </td>
+                    <td><label for="up_limit_value">QBT_TR(Upload:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td><input type="number" id="up_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
+                </tr>
+                <tr>
+                    <td><label for="dl_limit_value">QBT_TR(Download:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td><input type="number" id="dl_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
+                </tr>
+            </tbody>
         </table>
         <i>QBT_TR(0 means unlimited)QBT_TR[CONTEXT=OptionsDialog]</i>
     </fieldset>
@@ -536,17 +558,19 @@
     <fieldset class="settings">
         <legend>QBT_TR(Alternative Rate Limits)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td rowspan="2">
-                    <img src="images/slow.svg" style="height: 1.5em;" alt="QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]">
-                </td>
-                <td><label for="alt_up_limit_value">QBT_TR(Upload:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td><input type="number" id="alt_up_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
-            </tr>
-            <tr>
-                <td><label for="alt_dl_limit_value">QBT_TR(Download:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td><input type="number" id="alt_dl_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td rowspan="2">
+                        <img src="images/slow.svg" style="height: 1.5em;" alt="QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow]">
+                    </td>
+                    <td><label for="alt_up_limit_value">QBT_TR(Upload:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td><input type="number" id="alt_up_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
+                </tr>
+                <tr>
+                    <td><label for="alt_dl_limit_value">QBT_TR(Download:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td><input type="number" id="alt_dl_limit_value" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]</td>
+                </tr>
+            </tbody>
         </table>
         <i>QBT_TR(0 means unlimited)QBT_TR[CONTEXT=OptionsDialog]</i>
 
@@ -636,30 +660,32 @@
             <label for="queueing_checkbox">QBT_TR(Torrent Queueing)QBT_TR[CONTEXT=OptionsDialog]</label>
         </legend>
         <table>
-            <tr>
-                <td>
-                    <label for="max_active_dl_value">QBT_TR(Maximum active downloads:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_active_dl_value" style="width: 4em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="max_active_up_value">QBT_TR(Maximum active uploads:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_active_up_value" style="width: 4em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="max_active_to_value">QBT_TR(Maximum active torrents:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_active_to_value" style="width: 4em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="max_active_dl_value">QBT_TR(Maximum active downloads:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_active_dl_value" style="width: 4em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="max_active_up_value">QBT_TR(Maximum active uploads:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_active_up_value" style="width: 4em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="max_active_to_value">QBT_TR(Maximum active torrents:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_active_to_value" style="width: 4em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
         <fieldset class="settings">
             <legend>
@@ -667,30 +693,32 @@
                 <label for="dont_count_slow_torrents_checkbox">QBT_TR(Do not count slow torrents in these limits)QBT_TR[CONTEXT=OptionsDialog]</label>
             </legend>
             <table>
-                <tr>
-                    <td>
-                        <label for="dl_rate_threshold">QBT_TR(Download rate threshold:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="dl_rate_threshold" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="ul_rate_threshold">QBT_TR(Upload rate threshold:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="ul_rate_threshold" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="torrent_inactive_timer">QBT_TR(Torrent inactivity timer:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="torrent_inactive_timer" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="dl_rate_threshold">QBT_TR(Download rate threshold:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="dl_rate_threshold" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="ul_rate_threshold">QBT_TR(Upload rate threshold:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="ul_rate_threshold" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="torrent_inactive_timer">QBT_TR(Torrent inactivity timer:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="torrent_inactive_timer" style="width: 4em;" />&nbsp;&nbsp;QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]
+                        </td>
+                    </tr>
+                </tbody>
             </table>
         </fieldset>
     </fieldset>
@@ -698,44 +726,46 @@
     <fieldset class="settings">
         <legend>QBT_TR(Seeding Limits)QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_ratio_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
-                    <label for="max_ratio_checkbox">QBT_TR(When ratio reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_ratio_value" style="width: 4em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_seeding_time_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
-                    <label for="max_seeding_time_checkbox">QBT_TR(When total seeding time reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_seeding_time_value" style="width: 4em;" />QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="checkbox" id="max_inactive_seeding_time_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
-                    <label for="max_inactive_seeding_time_checkbox">QBT_TR(When inactive seeding time reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="max_inactive_seeding_time_value" style="width: 4em;" />QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td style="text-align: right;"><label for="max_ratio_act">QBT_TR(then)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                <td>
-                    <select id="max_ratio_act">
-                        <option value="0">QBT_TR(Stop torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Remove torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="3">QBT_TR(Remove torrent and its files)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="2">QBT_TR(Enable super seeding for torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_ratio_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
+                        <label for="max_ratio_checkbox">QBT_TR(When ratio reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_ratio_value" style="width: 4em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_seeding_time_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
+                        <label for="max_seeding_time_checkbox">QBT_TR(When total seeding time reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_seeding_time_value" style="width: 4em;" />QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <input type="checkbox" id="max_inactive_seeding_time_checkbox" onclick="qBittorrent.Preferences.updateMaxRatioTimeEnabled();" />
+                        <label for="max_inactive_seeding_time_checkbox">QBT_TR(When inactive seeding time reaches)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="max_inactive_seeding_time_value" style="width: 4em;" />QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right;"><label for="max_ratio_act">QBT_TR(then)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                    <td>
+                        <select id="max_ratio_act">
+                            <option value="0">QBT_TR(Stop torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Remove torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="3">QBT_TR(Remove torrent and its files)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="2">QBT_TR(Enable super seeding for torrent)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -756,30 +786,32 @@
             <label for="enable_fetching_rss_feeds_checkbox">QBT_TR(Enable fetching RSS feeds)QBT_TR[CONTEXT=OptionsDialog]</label>
         </div>
         <table>
-            <tr>
-                <td>
-                    <label for="feed_refresh_interval">QBT_TR(Feeds refresh interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="feed_refresh_interval" style="width: 4em;" />&nbsp;&nbsp;QBT_TR( min)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="feedFetchDelay">QBT_TR(Same host request delay:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="feedFetchDelay" style="width: 4em;" />&nbsp;&nbsp;QBT_TR( sec)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="maximum_article_number">QBT_TR(Maximum number of articles per feed:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="maximum_article_number" style="width: 4em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="feed_refresh_interval">QBT_TR(Feeds refresh interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="feed_refresh_interval" style="width: 4em;" />&nbsp;&nbsp;QBT_TR( min)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="feedFetchDelay">QBT_TR(Same host request delay:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="feedFetchDelay" style="width: 4em;" />&nbsp;&nbsp;QBT_TR( sec)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="maximum_article_number">QBT_TR(Maximum number of articles per feed:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="maximum_article_number" style="width: 4em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 
@@ -808,16 +840,18 @@
     <fieldset class="settings">
         <legend>QBT_TR(Web User Interface (Remote control))QBT_TR[CONTEXT=OptionsDialog]</legend>
         <table>
-            <tr>
-                <td>
-                    <label for="webui_address_value">QBT_TR(IP address:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="webui_address_value" />
-                    <label for="webui_port_value" style="margin-left: 10px;">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    <input type="text" id="webui_port_value" style="width: 4em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="webui_address_value">QBT_TR(IP address:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="webui_address_value" />
+                        <label for="webui_port_value" style="margin-left: 10px;">QBT_TR(Port:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        <input type="text" id="webui_port_value" style="width: 4em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
         <div class="formRow">
             <input type="checkbox" id="webui_upnp_checkbox" />
@@ -829,22 +863,24 @@
                 <label for="use_https_checkbox">QBT_TR(Use HTTPS instead of HTTP)QBT_TR[CONTEXT=OptionsDialog]</label>
             </legend>
             <table>
-                <tr>
-                    <td>
-                        <label for="ssl_cert_text">QBT_TR(Certificate:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="ssl_cert_text" class="pathFile" style="width: 30em;" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="ssl_key_text">QBT_TR(Key:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="ssl_key_text" class="pathFile" style="width: 30em;" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="ssl_cert_text">QBT_TR(Certificate:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="ssl_cert_text" class="pathFile" style="width: 30em;" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="ssl_key_text">QBT_TR(Key:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="ssl_key_text" class="pathFile" style="width: 30em;" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <div style="padding-left: 10px;"><a target="_blank" href="https://httpd.apache.org/docs/current/ssl/ssl_faq.html#aboutcerts">QBT_TR(Information about certificates)QBT_TR[CONTEXT=HttpServer]</a></div>
         </fieldset>
@@ -852,22 +888,24 @@
         <fieldset class="settings">
             <legend>QBT_TR(Authentication)QBT_TR[CONTEXT=OptionsDialog]</legend>
             <table>
-                <tr>
-                    <td>
-                        <label for="webui_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="text" id="webui_username_text" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="webui_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                    </td>
-                    <td>
-                        <input type="password" id="webui_password_text" placeholder="QBT_TR(Change current password)QBT_TR[CONTEXT=OptionsDialog]" autocomplete="new-password" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="webui_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="text" id="webui_username_text" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="webui_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                        </td>
+                        <td>
+                            <input type="password" id="webui_password_text" placeholder="QBT_TR(Change current password)QBT_TR[CONTEXT=OptionsDialog]" autocomplete="new-password" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <div class="formRow">
                 <input type="checkbox" id="bypass_local_auth_checkbox" />
@@ -881,20 +919,24 @@
                 <textarea id="bypass_auth_subnet_whitelist_textarea" rows="5" cols="48" placeholder="QBT_TR(Example: 172.17.32.0/24, fdff:ffff:c8::/40)QBT_TR[CONTEXT=OptionsDialog]"></textarea>
             </div>
             <table>
-                <tr>
-                    <td><label for="webUIMaxAuthFailCountInput">QBT_TR(Ban client after consecutive failures:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                    <td><input type="number" id="webUIMaxAuthFailCountInput" style="width: 4em;" min="0" /></td>
-                </tr>
-                <tr>
-                    <td style="text-align: right;"><label for="webUIBanDurationInput">QBT_TR(ban for:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                    <td><input type="number" id="webUIBanDurationInput" style="width: 4em;" min="1" />QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]</td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td><label for="webUIMaxAuthFailCountInput">QBT_TR(Ban client after consecutive failures:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                        <td><input type="number" id="webUIMaxAuthFailCountInput" style="width: 4em;" min="0" /></td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: right;"><label for="webUIBanDurationInput">QBT_TR(ban for:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                        <td><input type="number" id="webUIBanDurationInput" style="width: 4em;" min="1" />QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]</td>
+                    </tr>
+                </tbody>
             </table>
             <table>
-                <tr>
-                    <td><label for="webUISessionTimeoutInput">QBT_TR(Session timeout:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
-                    <td><input type="number" id="webUISessionTimeoutInput" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]</td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td><label for="webUISessionTimeoutInput">QBT_TR(Session timeout:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
+                        <td><input type="number" id="webUISessionTimeoutInput" style="width: 4em;" min="0" />&nbsp;&nbsp;QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]</td>
+                    </tr>
+                </tbody>
             </table>
         </fieldset>
 
@@ -929,18 +971,20 @@
                     <label for="host_header_validation_checkbox">QBT_TR(Enable Host header validation)QBT_TR[CONTEXT=OptionsDialog]</label>
                 </legend>
                 <table>
-                    <tr>
-                        <td>
-                            <label for="webui_domain_textarea">QBT_TR(Server domains:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                        </td>
-                        <td>
-                            <textarea id="webui_domain_textarea" rows="1" cols="60" title="QBT_TR(Whitelist for filtering HTTP Host header values.
+                    <tbody>
+                        <tr>
+                            <td>
+                                <label for="webui_domain_textarea">QBT_TR(Server domains:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                            </td>
+                            <td>
+                                <textarea id="webui_domain_textarea" rows="1" cols="60" title="QBT_TR(Whitelist for filtering HTTP Host header values.
 In order to defend against DNS rebinding attack,
 you should put in domain names used by WebUI server.
 
 Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsDialog]"></textarea>
-                        </td>
-                    </tr>
+                            </td>
+                        </tr>
+                    </tbody>
                 </table>
             </fieldset>
         </fieldset>
@@ -977,30 +1021,32 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
         </select>
         <input type="button" value="QBT_TR(Register)QBT_TR[CONTEXT=OptionsDialog]" onclick="qBittorrent.Preferences.registerDynDns();" />
         <table style="margin-top: 10px;">
-            <tr>
-                <td>
-                    <label for="dyndns_domain_text">QBT_TR(Domain name:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="dyndns_domain_text" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="dyndns_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="dyndns_username_text" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="dyndns_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="password" id="dyndns_password_text" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="dyndns_domain_text">QBT_TR(Domain name:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="dyndns_domain_text" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="dyndns_username_text">QBT_TR(Username:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="dyndns_username_text" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="dyndns_password_text">QBT_TR(Password:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="password" id="dyndns_password_text" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 </div>
@@ -1009,560 +1055,564 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
     <fieldset class="settings">
         <legend>QBT_TR(qBittorrent Section)QBT_TR[CONTEXT=OptionsDialog]&nbsp;(<a href="https://github.com/qbittorrent/qBittorrent/wiki/Explanation-of-Options-in-qBittorrent#Advanced" target="_blank">QBT_TR(Open documentation)QBT_TR[CONTEXT=HttpServer]</a>)</legend>
         <table>
-            <tr>
-                <td>
-                    <label for="resumeDataStorageType">QBT_TR(Resume data storage type (requires restart):)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="resumeDataStorageType" style="width: 15em;">
-                        <option value="Legacy">QBT_TR(Fastresume files)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="SQLite">QBT_TR(SQLite database (experimental))QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr id="rowMemoryWorkingSetLimit">
-                <td>
-                    <label for="torrentContentRemoveOption">QBT_TR(Torrent content removing mode:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="torrentContentRemoveOption" style="width: 15em;">
-                        <option value="Delete">QBT_TR(Delete files permanently)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="MoveToTrash">QBT_TR(Move files to trash (if possible))QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="memoryWorkingSetLimit">QBT_TR(Physical memory (RAM) usage limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://wikipedia.org/wiki/Working_set" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="memoryWorkingSetLimit" style="width: 15em;" title="QBT_TR(This option is less effective on Linux)QBT_TR[CONTEXT=OptionsDialog]">&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="networkInterface">QBT_TR(Network interface:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="networkInterface" style="width: 15em;">
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="optionalIPAddressToBind">QBT_TR(Optional IP address to bind to:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <select id="optionalIPAddressToBind" style="width: 15em;">
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="saveResumeDataInterval">QBT_TR(Save resume data interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="saveResumeDataInterval" style="width: 15em;">&nbsp;&nbsp;QBT_TR(min)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="torrentFileSizeLimit">QBT_TR(.torrent file size limit:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="torrentFileSizeLimit" style="width: 15em;">&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="recheckTorrentsOnCompletion">QBT_TR(Recheck torrents on completion:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="recheckTorrentsOnCompletion">
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="appInstanceName">QBT_TR(Customize application instance name:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="appInstanceName" style="width: 15em;" title="QBT_TR(It appends the text to the window title to help distinguish qBittorent instances)QBT_TR[CONTEXT=OptionsDialog]" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="refreshInterval">QBT_TR(Refresh interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="refreshInterval" style="width: 15em;" title="QBT_TR(It controls the internal state update interval which in turn will affect UI updates)QBT_TR[CONTEXT=OptionsDialog]">&nbsp;&nbsp;QBT_TR(ms)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="resolvePeerCountries">QBT_TR(Resolve peer countries:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="resolvePeerCountries">
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="reannounceWhenAddressChanged">QBT_TR(Reannounce to all trackers when IP or port changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="reannounceWhenAddressChanged" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="enableEmbeddedTracker">QBT_TR(Enable embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="enableEmbeddedTracker" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="embeddedTrackerPort">QBT_TR(Embedded tracker port:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="embeddedTrackerPort" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="embeddedTrackerPortForwarding">QBT_TR(Enable port forwarding for embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="embeddedTrackerPortForwarding" />
-                </td>
-            </tr>
-            <tr id="rowMarkOfTheWeb">
-                <td>
-                    <label for="markOfTheWeb">QBT_TR(Enable Mark-of-the-Web (MOTW) for downloaded files (require macOS or Windows):)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="checkbox" id="markOfTheWeb" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="pythonExecutablePath">QBT_TR(Python executable path (may require restart):)QBT_TR[CONTEXT=OptionsDialog]</label>
-                </td>
-                <td>
-                    <input type="text" id="pythonExecutablePath" class="pathFile" placeholder="QBT_TR((Auto detect if empty))QBT_TR[CONTEXT=OptionsDialog]" style="width: 15em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="resumeDataStorageType">QBT_TR(Resume data storage type (requires restart):)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="resumeDataStorageType" style="width: 15em;">
+                            <option value="Legacy">QBT_TR(Fastresume files)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="SQLite">QBT_TR(SQLite database (experimental))QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr id="rowMemoryWorkingSetLimit">
+                    <td>
+                        <label for="torrentContentRemoveOption">QBT_TR(Torrent content removing mode:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="torrentContentRemoveOption" style="width: 15em;">
+                            <option value="Delete">QBT_TR(Delete files permanently)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="MoveToTrash">QBT_TR(Move files to trash (if possible))QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="memoryWorkingSetLimit">QBT_TR(Physical memory (RAM) usage limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://wikipedia.org/wiki/Working_set" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="memoryWorkingSetLimit" style="width: 15em;" title="QBT_TR(This option is less effective on Linux)QBT_TR[CONTEXT=OptionsDialog]">&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="networkInterface">QBT_TR(Network interface:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="networkInterface" style="width: 15em;">
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="optionalIPAddressToBind">QBT_TR(Optional IP address to bind to:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <select id="optionalIPAddressToBind" style="width: 15em;">
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="saveResumeDataInterval">QBT_TR(Save resume data interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="saveResumeDataInterval" style="width: 15em;">&nbsp;&nbsp;QBT_TR(min)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="torrentFileSizeLimit">QBT_TR(.torrent file size limit:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="torrentFileSizeLimit" style="width: 15em;">&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="recheckTorrentsOnCompletion">QBT_TR(Recheck torrents on completion:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="recheckTorrentsOnCompletion">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="appInstanceName">QBT_TR(Customize application instance name:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="appInstanceName" style="width: 15em;" title="QBT_TR(It appends the text to the window title to help distinguish qBittorent instances)QBT_TR[CONTEXT=OptionsDialog]" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="refreshInterval">QBT_TR(Refresh interval:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="refreshInterval" style="width: 15em;" title="QBT_TR(It controls the internal state update interval which in turn will affect UI updates)QBT_TR[CONTEXT=OptionsDialog]">&nbsp;&nbsp;QBT_TR(ms)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="resolvePeerCountries">QBT_TR(Resolve peer countries:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="resolvePeerCountries">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="reannounceWhenAddressChanged">QBT_TR(Reannounce to all trackers when IP or port changed:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="reannounceWhenAddressChanged" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="enableEmbeddedTracker">QBT_TR(Enable embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="enableEmbeddedTracker" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="embeddedTrackerPort">QBT_TR(Embedded tracker port:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="embeddedTrackerPort" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="embeddedTrackerPortForwarding">QBT_TR(Enable port forwarding for embedded tracker:)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="embeddedTrackerPortForwarding" />
+                    </td>
+                </tr>
+                <tr id="rowMarkOfTheWeb">
+                    <td>
+                        <label for="markOfTheWeb">QBT_TR(Enable Mark-of-the-Web (MOTW) for downloaded files (require macOS or Windows):)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="markOfTheWeb" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="pythonExecutablePath">QBT_TR(Python executable path (may require restart):)QBT_TR[CONTEXT=OptionsDialog]</label>
+                    </td>
+                    <td>
+                        <input type="text" id="pythonExecutablePath" class="pathFile" placeholder="QBT_TR((Auto detect if empty))QBT_TR[CONTEXT=OptionsDialog]" style="width: 15em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
     <fieldset class="settings">
         <legend>QBT_TR(libtorrent Section)QBT_TR[CONTEXT=OptionsDialog]&nbsp;(<a href="https://www.libtorrent.org/reference-Settings.html" target="_blank">QBT_TR(Open documentation)QBT_TR[CONTEXT=HttpServer]</a>)</legend>
         <table>
-            <tr>
-                <td>
-                    <label for="bdecodeDepthLimit">QBT_TR(Bdecode depth limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Bdecoding.html#bdecode()" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="bdecodeDepthLimit" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="bdecodeTokenLimit">QBT_TR(Bdecode token limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Bdecoding.html#bdecode()" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="bdecodeTokenLimit" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="asyncIOThreads">QBT_TR(Asynchronous I/O threads:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#aio_threads" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="asyncIOThreads" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr id="rowHashingThreads">
-                <td>
-                    <label for="hashingThreads">QBT_TR(Hashing threads:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#hashing_threads" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="hashingThreads" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="filePoolSize">QBT_TR(File pool size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#file_pool_size" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="filePoolSize" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="outstandMemoryWhenCheckingTorrents">QBT_TR(Outstanding memory when checking torrents:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#checking_mem_usage" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="outstandMemoryWhenCheckingTorrents" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr id="rowDiskCache">
-                <td>
-                    <label for="diskCache">QBT_TR(Disk cache:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#cache_size" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="diskCache" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr id="rowDiskCacheExpiryInterval">
-                <td>
-                    <label for="diskCacheExpiryInterval">QBT_TR(Disk cache expiry interval:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#cache_expiry" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="diskCacheExpiryInterval" style="width: 15em;">&nbsp;&nbsp;QBT_TR(s)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="diskQueueSize">QBT_TR(Disk queue size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_queued_disk_bytes" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="diskQueueSize" style="width: 15em;">&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr id="rowDiskIOType">
-                <td>
-                    <label for="diskIOType">QBT_TR(Disk IO type (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/single-page-ref.html#default-disk-io-constructor" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="diskIOType" style="width: 15em;">
-                        <option value="0">QBT_TR(Default)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Memory mapped files)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="2">QBT_TR(POSIX-compliant)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="diskIOReadMode">QBT_TR(Disk IO read mode:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#disk_io_read_mode" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="diskIOReadMode" style="width: 15em;">
-                        <option value="0">QBT_TR(Disable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Enable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="diskIOWriteMode">QBT_TR(Disk IO write mode:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#disk_io_write_mode" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="diskIOWriteMode" style="width: 15em;">
-                        <option value="0">QBT_TR(Disable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Enable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="2" id="diskIOWriteModeWriteThrough">QBT_TR(Write-through)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr id="rowCoalesceReadsAndWrites">
-                <td>
-                    <label for="coalesceReadsAndWrites">QBT_TR(Coalesce reads &amp; writes:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#coalesce_reads" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="coalesceReadsAndWrites" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="pieceExtentAffinity">QBT_TR(Use piece extent affinity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://libtorrent.org/single-page-ref.html#piece_extent_affinity" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="pieceExtentAffinity" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="sendUploadPieceSuggestions">QBT_TR(Send upload piece suggestions:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#suggest_mode" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="sendUploadPieceSuggestions" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="sendBufferWatermark">QBT_TR(Send buffer watermark:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="sendBufferWatermark" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="sendBufferLowWatermark">QBT_TR(Send buffer low watermark:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_low_watermark" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="sendBufferLowWatermark" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="sendBufferWatermarkFactor">QBT_TR(Send buffer watermark factor:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark_factor" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="sendBufferWatermarkFactor" style="width: 15em;" />&nbsp;&nbsp;%
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="connectionSpeed">QBT_TR(Outgoing connections per second:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#connection_speed" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="connectionSpeed" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="socketSendBufferSize">QBT_TR(Socket send buffer size [0: system default]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_socket_buffer_size" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="socketSendBufferSize" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="socketReceiveBufferSize">QBT_TR(Socket receive buffer size [0: system default]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#recv_socket_buffer_size" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="socketReceiveBufferSize" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="socketBacklogSize">QBT_TR(Socket backlog size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#listen_queue_size" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="socketBacklogSize" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="outgoingPortsMin">QBT_TR(Outgoing ports (Min) [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#outgoing_port" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="outgoingPortsMin" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="outgoingPortsMax">QBT_TR(Outgoing ports (Max) [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#outgoing_port" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="outgoingPortsMax" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="UPnPLeaseDuration">QBT_TR(UPnP lease duration [0: permanent lease]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#upnp_lease_duration" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="UPnPLeaseDuration" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="peerToS">QBT_TR(Type of service (ToS) for connections to peers)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_tos" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="peerToS" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="utpTCPMixedModeAlgorithm">QBT_TR(μTP-TCP mixed mode algorithm:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#mixed_mode_algorithm" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="utpTCPMixedModeAlgorithm" style="width: 15em;">
-                        <option value="0">QBT_TR(Prefer TCP)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Peer proportional (throttles TCP))QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="IDNSupportCheckbox">QBT_TR(Support internationalized domain name (IDN):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#allow_idna" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="IDNSupportCheckbox" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="allowMultipleConnectionsFromTheSameIPAddress">QBT_TR(Allow multiple connections from the same IP address:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#allow_multiple_connections_per_ip" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="allowMultipleConnectionsFromTheSameIPAddress" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="validateHTTPSTrackerCertificate">QBT_TR(Validate HTTPS tracker certificate:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#validate_https_trackers" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="validateHTTPSTrackerCertificate" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="mitigateSSRF">QBT_TR(Server-side request forgery (SSRF) mitigation:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#ssrf_mitigation" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="mitigateSSRF" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="blockPeersOnPrivilegedPorts">QBT_TR(Disallow connection to peers on privileged ports:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://libtorrent.org/single-page-ref.html#no_connect_privileged_ports" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="blockPeersOnPrivilegedPorts" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="uploadSlotsBehavior">QBT_TR(Upload slots behavior:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#choking_algorithm" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="uploadSlotsBehavior" style="width: 15em;">
-                        <option value="0">QBT_TR(Fixed slots)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Upload rate based)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="uploadChokingAlgorithm">QBT_TR(Upload choking algorithm:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#seed_choking_algorithm" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <select id="uploadChokingAlgorithm" style="width: 15em;">
-                        <option value="0">QBT_TR(Round-robin)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="1">QBT_TR(Fastest upload)QBT_TR[CONTEXT=OptionsDialog]</option>
-                        <option value="2">QBT_TR(Anti-leech)QBT_TR[CONTEXT=OptionsDialog]</option>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="announceAllTrackers">QBT_TR(Always announce to all trackers in a tier:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_to_all_trackers" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="announceAllTrackers" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="announceAllTiers">QBT_TR(Always announce to all tiers:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_to_all_tiers" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="checkbox" id="announceAllTiers" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="announceIP">QBT_TR(IP address reported to trackers (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_ip" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="announceIP" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="maxConcurrentHTTPAnnounces">QBT_TR(Max concurrent HTTP announces:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_concurrent_http_announces" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="maxConcurrentHTTPAnnounces" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="stopTrackerTimeout">QBT_TR(Stop tracker timeout [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#stop_tracker_timeout" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="stopTrackerTimeout" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="peerTurnover">QBT_TR(Peer turnover disconnect percentage:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="peerTurnover" style="width: 15em;" />&nbsp;&nbsp;%
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="peerTurnoverCutoff">QBT_TR(Peer turnover threshold percentage:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="peerTurnoverCutoff" style="width: 15em;" />&nbsp;&nbsp;%
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="peerTurnoverInterval">QBT_TR(Peer turnover disconnect interval:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="peerTurnoverInterval" style="width: 15em;" />&nbsp;&nbsp;s
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="requestQueueSize">QBT_TR(Maximum outstanding requests to a single peer:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_out_request_queue" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="requestQueueSize" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="dhtBootstrapNodes">QBT_TR(DHT bootstrap nodes:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#dht_bootstrap_nodes" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input type="text" id="dhtBootstrapNodes" placeholder="QBT_TR(Resets to default if empty)QBT_TR[CONTEXT=OptionsDialog]" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr id="rowI2pInboundQuantity">
-                <td>
-                    <label for="i2pInboundQuantity">QBT_TR(I2P inbound quantity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_inbound_quantity" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input id="i2pInboundQuantity" type="number" min="1" max="16" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr id="rowI2pOutboundQuantity">
-                <td>
-                    <label for="i2pOutboundQuantity">QBT_TR(I2P outbound quantity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_outbound_quantity" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input id="i2pOutboundQuantity" type="number" min="1" max="16" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr id="rowI2pInboundLength">
-                <td>
-                    <label for="i2pInboundLength">QBT_TR(I2P inbound length:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_inbound_length" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input id="i2pInboundLength" type="number" min="0" max="7" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
-                </td>
-            </tr>
-            <tr id="rowI2pOutboundLength">
-                <td>
-                    <label for="i2pOutboundLength">QBT_TR(I2P outbound length:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_outbound_length" target="_blank">(?)</a></label>
-                </td>
-                <td>
-                    <input id="i2pOutboundLength" type="number" min="0" max="7" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
-                </td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td>
+                        <label for="bdecodeDepthLimit">QBT_TR(Bdecode depth limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Bdecoding.html#bdecode()" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="bdecodeDepthLimit" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="bdecodeTokenLimit">QBT_TR(Bdecode token limit:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Bdecoding.html#bdecode()" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="bdecodeTokenLimit" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="asyncIOThreads">QBT_TR(Asynchronous I/O threads:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#aio_threads" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="asyncIOThreads" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr id="rowHashingThreads">
+                    <td>
+                        <label for="hashingThreads">QBT_TR(Hashing threads:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#hashing_threads" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="hashingThreads" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="filePoolSize">QBT_TR(File pool size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#file_pool_size" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="filePoolSize" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="outstandMemoryWhenCheckingTorrents">QBT_TR(Outstanding memory when checking torrents:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#checking_mem_usage" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="outstandMemoryWhenCheckingTorrents" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr id="rowDiskCache">
+                    <td>
+                        <label for="diskCache">QBT_TR(Disk cache:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#cache_size" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="diskCache" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr id="rowDiskCacheExpiryInterval">
+                    <td>
+                        <label for="diskCacheExpiryInterval">QBT_TR(Disk cache expiry interval:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#cache_expiry" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="diskCacheExpiryInterval" style="width: 15em;">&nbsp;&nbsp;QBT_TR(s)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="diskQueueSize">QBT_TR(Disk queue size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_queued_disk_bytes" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="diskQueueSize" style="width: 15em;">&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr id="rowDiskIOType">
+                    <td>
+                        <label for="diskIOType">QBT_TR(Disk IO type (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/single-page-ref.html#default-disk-io-constructor" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="diskIOType" style="width: 15em;">
+                            <option value="0">QBT_TR(Default)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Memory mapped files)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="2">QBT_TR(POSIX-compliant)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="diskIOReadMode">QBT_TR(Disk IO read mode:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#disk_io_read_mode" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="diskIOReadMode" style="width: 15em;">
+                            <option value="0">QBT_TR(Disable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Enable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="diskIOWriteMode">QBT_TR(Disk IO write mode:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#disk_io_write_mode" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="diskIOWriteMode" style="width: 15em;">
+                            <option value="0">QBT_TR(Disable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Enable OS cache)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="2" id="diskIOWriteModeWriteThrough">QBT_TR(Write-through)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr id="rowCoalesceReadsAndWrites">
+                    <td>
+                        <label for="coalesceReadsAndWrites">QBT_TR(Coalesce reads &amp; writes:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#coalesce_reads" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="coalesceReadsAndWrites" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="pieceExtentAffinity">QBT_TR(Use piece extent affinity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://libtorrent.org/single-page-ref.html#piece_extent_affinity" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="pieceExtentAffinity" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="sendUploadPieceSuggestions">QBT_TR(Send upload piece suggestions:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#suggest_mode" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="sendUploadPieceSuggestions" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="sendBufferWatermark">QBT_TR(Send buffer watermark:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="sendBufferWatermark" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="sendBufferLowWatermark">QBT_TR(Send buffer low watermark:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_low_watermark" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="sendBufferLowWatermark" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="sendBufferWatermarkFactor">QBT_TR(Send buffer watermark factor:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark_factor" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="sendBufferWatermarkFactor" style="width: 15em;" />&nbsp;&nbsp;%
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="connectionSpeed">QBT_TR(Outgoing connections per second:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#connection_speed" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="connectionSpeed" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="socketSendBufferSize">QBT_TR(Socket send buffer size [0: system default]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#send_socket_buffer_size" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="socketSendBufferSize" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="socketReceiveBufferSize">QBT_TR(Socket receive buffer size [0: system default]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#recv_socket_buffer_size" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="socketReceiveBufferSize" style="width: 15em;" />&nbsp;&nbsp;QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="socketBacklogSize">QBT_TR(Socket backlog size:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#listen_queue_size" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="socketBacklogSize" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="outgoingPortsMin">QBT_TR(Outgoing ports (Min) [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#outgoing_port" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="outgoingPortsMin" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="outgoingPortsMax">QBT_TR(Outgoing ports (Max) [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#outgoing_port" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="outgoingPortsMax" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="UPnPLeaseDuration">QBT_TR(UPnP lease duration [0: permanent lease]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#upnp_lease_duration" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="UPnPLeaseDuration" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="peerToS">QBT_TR(Type of service (ToS) for connections to peers)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_tos" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="peerToS" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="utpTCPMixedModeAlgorithm">QBT_TR(μTP-TCP mixed mode algorithm:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#mixed_mode_algorithm" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="utpTCPMixedModeAlgorithm" style="width: 15em;">
+                            <option value="0">QBT_TR(Prefer TCP)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Peer proportional (throttles TCP))QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="IDNSupportCheckbox">QBT_TR(Support internationalized domain name (IDN):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#allow_idna" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="IDNSupportCheckbox" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="allowMultipleConnectionsFromTheSameIPAddress">QBT_TR(Allow multiple connections from the same IP address:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#allow_multiple_connections_per_ip" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="allowMultipleConnectionsFromTheSameIPAddress" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="validateHTTPSTrackerCertificate">QBT_TR(Validate HTTPS tracker certificate:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#validate_https_trackers" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="validateHTTPSTrackerCertificate" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="mitigateSSRF">QBT_TR(Server-side request forgery (SSRF) mitigation:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#ssrf_mitigation" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="mitigateSSRF" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="blockPeersOnPrivilegedPorts">QBT_TR(Disallow connection to peers on privileged ports:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://libtorrent.org/single-page-ref.html#no_connect_privileged_ports" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="blockPeersOnPrivilegedPorts" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="uploadSlotsBehavior">QBT_TR(Upload slots behavior:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#choking_algorithm" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="uploadSlotsBehavior" style="width: 15em;">
+                            <option value="0">QBT_TR(Fixed slots)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Upload rate based)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="uploadChokingAlgorithm">QBT_TR(Upload choking algorithm:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#seed_choking_algorithm" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <select id="uploadChokingAlgorithm" style="width: 15em;">
+                            <option value="0">QBT_TR(Round-robin)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="1">QBT_TR(Fastest upload)QBT_TR[CONTEXT=OptionsDialog]</option>
+                            <option value="2">QBT_TR(Anti-leech)QBT_TR[CONTEXT=OptionsDialog]</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="announceAllTrackers">QBT_TR(Always announce to all trackers in a tier:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_to_all_trackers" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="announceAllTrackers" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="announceAllTiers">QBT_TR(Always announce to all tiers:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_to_all_tiers" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="checkbox" id="announceAllTiers" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="announceIP">QBT_TR(IP address reported to trackers (requires restart):)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#announce_ip" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="announceIP" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="maxConcurrentHTTPAnnounces">QBT_TR(Max concurrent HTTP announces:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_concurrent_http_announces" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="maxConcurrentHTTPAnnounces" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="stopTrackerTimeout">QBT_TR(Stop tracker timeout [0: disabled]:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#stop_tracker_timeout" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="stopTrackerTimeout" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="peerTurnover">QBT_TR(Peer turnover disconnect percentage:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="peerTurnover" style="width: 15em;" />&nbsp;&nbsp;%
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="peerTurnoverCutoff">QBT_TR(Peer turnover threshold percentage:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="peerTurnoverCutoff" style="width: 15em;" />&nbsp;&nbsp;%
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="peerTurnoverInterval">QBT_TR(Peer turnover disconnect interval:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#peer_turnover" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="peerTurnoverInterval" style="width: 15em;" />&nbsp;&nbsp;s
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="requestQueueSize">QBT_TR(Maximum outstanding requests to a single peer:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#max_out_request_queue" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="requestQueueSize" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="dhtBootstrapNodes">QBT_TR(DHT bootstrap nodes:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#dht_bootstrap_nodes" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input type="text" id="dhtBootstrapNodes" placeholder="QBT_TR(Resets to default if empty)QBT_TR[CONTEXT=OptionsDialog]" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr id="rowI2pInboundQuantity">
+                    <td>
+                        <label for="i2pInboundQuantity">QBT_TR(I2P inbound quantity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_inbound_quantity" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input id="i2pInboundQuantity" type="number" min="1" max="16" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr id="rowI2pOutboundQuantity">
+                    <td>
+                        <label for="i2pOutboundQuantity">QBT_TR(I2P outbound quantity:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_outbound_quantity" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input id="i2pOutboundQuantity" type="number" min="1" max="16" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr id="rowI2pInboundLength">
+                    <td>
+                        <label for="i2pInboundLength">QBT_TR(I2P inbound length:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_inbound_length" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input id="i2pInboundLength" type="number" min="0" max="7" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
+                    </td>
+                </tr>
+                <tr id="rowI2pOutboundLength">
+                    <td>
+                        <label for="i2pOutboundLength">QBT_TR(I2P outbound length:)QBT_TR[CONTEXT=OptionsDialog]&nbsp;<a href="https://www.libtorrent.org/reference-Settings.html#i2p_outbound_length" target="_blank">(?)</a></label>
+                    </td>
+                    <td>
+                        <input id="i2pOutboundLength" type="number" min="0" max="7" onchange="qBittorrent.Preferences.numberInputLimiter(this);" style="width: 15em;" />
+                    </td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 </div>
diff --git a/src/webui/www/private/views/properties.html b/src/webui/www/private/views/properties.html
index b42c8d19f..badda7f09 100644
--- a/src/webui/www/private/views/properties.html
+++ b/src/webui/www/private/views/properties.html
@@ -1,99 +1,105 @@
 <div id="prop_general" class="propertiesTabContent">
     <table style="width: 100%; padding: 0 3px">
-        <tr>
-            <td style="text-align: right; white-space: nowrap">QBT_TR(Progress:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-            <td id="progress" style="width: 100%"></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td style="text-align: right; white-space: nowrap">QBT_TR(Progress:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                <td id="progress" style="width: 100%"></td>
+            </tr>
+        </tbody>
     </table>
     <hr>
     <fieldset>
         <legend><b>QBT_TR(Transfer)QBT_TR[CONTEXT=PropertiesWidget]</b></legend>
         <table style="width: 100%">
-            <tr>
-                <td class="generalLabel">QBT_TR(Time Active:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="time_elapsed"></td>
-                <td class="generalLabel">QBT_TR(ETA:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="eta"></td>
-                <td class="generalLabel">QBT_TR(Connections:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="nb_connections"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Downloaded:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="total_downloaded"></td>
-                <td class="generalLabel">QBT_TR(Uploaded:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="total_uploaded"></td>
-                <td class="generalLabel">QBT_TR(Seeds:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="seeds"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Download Speed:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="dl_speed"></td>
-                <td class="generalLabel">QBT_TR(Upload Speed:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="up_speed"></td>
-                <td class="generalLabel">QBT_TR(Peers:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="peers"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Download Limit:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="dl_limit"></td>
-                <td class="generalLabel">QBT_TR(Upload Limit:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="up_limit"></td>
-                <td class="generalLabel">QBT_TR(Wasted:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="total_wasted"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Share Ratio:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="share_ratio"></td>
-                <td class="generalLabel">QBT_TR(Reannounce In:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="reannounce"></td>
-                <td class="generalLabel">QBT_TR(Last Seen Complete:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="last_seen"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel" title="QBT_TR(Ratio / Time Active (in months), indicates how popular the torrent is)QBT_TR[CONTEXT=PropertiesWidget]">QBT_TR(Popularity:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="popularity" title="QBT_TR(Ratio / Time Active (in months), indicates how popular the torrent is)QBT_TR[CONTEXT=PropertiesWidget]"></td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Time Active:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="time_elapsed"></td>
+                    <td class="generalLabel">QBT_TR(ETA:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="eta"></td>
+                    <td class="generalLabel">QBT_TR(Connections:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="nb_connections"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Downloaded:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="total_downloaded"></td>
+                    <td class="generalLabel">QBT_TR(Uploaded:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="total_uploaded"></td>
+                    <td class="generalLabel">QBT_TR(Seeds:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="seeds"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Download Speed:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="dl_speed"></td>
+                    <td class="generalLabel">QBT_TR(Upload Speed:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="up_speed"></td>
+                    <td class="generalLabel">QBT_TR(Peers:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="peers"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Download Limit:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="dl_limit"></td>
+                    <td class="generalLabel">QBT_TR(Upload Limit:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="up_limit"></td>
+                    <td class="generalLabel">QBT_TR(Wasted:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="total_wasted"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Share Ratio:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="share_ratio"></td>
+                    <td class="generalLabel">QBT_TR(Reannounce In:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="reannounce"></td>
+                    <td class="generalLabel">QBT_TR(Last Seen Complete:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="last_seen"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel" title="QBT_TR(Ratio / Time Active (in months), indicates how popular the torrent is)QBT_TR[CONTEXT=PropertiesWidget]">QBT_TR(Popularity:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="popularity" title="QBT_TR(Ratio / Time Active (in months), indicates how popular the torrent is)QBT_TR[CONTEXT=PropertiesWidget]"></td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
     <fieldset>
         <legend><b>QBT_TR(Information)QBT_TR[CONTEXT=PropertiesWidget]</b></legend>
         <table style="width: 100%">
-            <tr>
-                <td class="generalLabel">QBT_TR(Total Size:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="total_size"></td>
-                <td class="generalLabel">QBT_TR(Pieces:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="pieces"></td>
-                <td class="generalLabel">QBT_TR(Created By:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="created_by"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Added On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="addition_date"></td>
-                <td class="generalLabel">QBT_TR(Completed On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="completion_date"></td>
-                <td class="generalLabel">QBT_TR(Created On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="creation_date"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Private:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td id="private"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Info Hash v1:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td colspan="5" id="torrent_hash_v1"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Info Hash v2:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td colspan="5" id="torrent_hash_v2"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Save Path:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td colspan="5" id="save_path"></td>
-            </tr>
-            <tr>
-                <td class="generalLabel">QBT_TR(Comment:)QBT_TR[CONTEXT=PropertiesWidget]</td>
-                <td colspan="5" style="white-space: pre-wrap;" id="comment"></td>
-            </tr>
+            <tbody>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Total Size:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="total_size"></td>
+                    <td class="generalLabel">QBT_TR(Pieces:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="pieces"></td>
+                    <td class="generalLabel">QBT_TR(Created By:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="created_by"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Added On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="addition_date"></td>
+                    <td class="generalLabel">QBT_TR(Completed On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="completion_date"></td>
+                    <td class="generalLabel">QBT_TR(Created On:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="creation_date"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Private:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td id="private"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Info Hash v1:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td colspan="5" id="torrent_hash_v1"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Info Hash v2:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td colspan="5" id="torrent_hash_v2"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Save Path:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td colspan="5" id="save_path"></td>
+                </tr>
+                <tr>
+                    <td class="generalLabel">QBT_TR(Comment:)QBT_TR[CONTEXT=PropertiesWidget]</td>
+                    <td colspan="5" style="white-space: pre-wrap;" id="comment"></td>
+                </tr>
+            </tbody>
         </table>
     </fieldset>
 </div>
diff --git a/src/webui/www/private/views/rssDownloader.html b/src/webui/www/private/views/rssDownloader.html
index 0ec57a3ff..b1382c012 100644
--- a/src/webui/www/private/views/rssDownloader.html
+++ b/src/webui/www/private/views/rssDownloader.html
@@ -167,30 +167,32 @@
                 <label for="useRegEx">QBT_TR(Use Regular Expressions)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
             </div>
             <table class="fullWidth">
-                <tr>
-                    <td>
-                        <label for="mustContainText" class="noWrap">QBT_TR(Must Contain:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <input disabled type="text" id="mustContainText" class="fullWidth" autocorrect="off" autocapitalize="none" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="mustNotContainText" class="noWrap">QBT_TR(Must Not Contain:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <input disabled type="text" id="mustNotContainText" class="fullWidth" autocorrect="off" autocapitalize="none" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="episodeFilterText" class="noWrap">QBT_TR(Episode Filter:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <input disabled type="text" id="episodeFilterText" class="fullWidth" autocorrect="off" autocapitalize="none" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label for="mustContainText" class="noWrap">QBT_TR(Must Contain:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <input disabled type="text" id="mustContainText" class="fullWidth" autocorrect="off" autocapitalize="none" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="mustNotContainText" class="noWrap">QBT_TR(Must Not Contain:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <input disabled type="text" id="mustNotContainText" class="fullWidth" autocorrect="off" autocapitalize="none" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="episodeFilterText" class="noWrap">QBT_TR(Episode Filter:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <input disabled type="text" id="episodeFilterText" class="fullWidth" autocorrect="off" autocapitalize="none" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <div class="formRow" title="QBT_TR(Smart Episode Filter will check the episode number to prevent downloading of duplicates.
 Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also support - as a separator))QBT_TR[CONTEXT=AutomatedRssDownloader]">
@@ -201,24 +203,26 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
             <hr>
 
             <table class="fullWidth">
-                <tr>
-                    <td>
-                        <label class="noWrap">QBT_TR(Assign Category:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <select disabled id="assignCategoryCombobox" class="fullWidth">
-                            <option value=""></option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label class="noWrap">QBT_TR(Add Tags:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <input type="text" id="ruleAddTags" class="fullWidth" autocapitalize="none" autocorrect="off" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="noWrap">QBT_TR(Assign Category:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <select disabled id="assignCategoryCombobox" class="fullWidth">
+                                <option value=""></option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label class="noWrap">QBT_TR(Add Tags:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <input type="text" id="ruleAddTags" class="fullWidth" autocapitalize="none" autocorrect="off" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
 
             <div class="formRow">
@@ -226,52 +230,60 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
                 <label for="savetoDifferentDir">QBT_TR(Save to a Different Directory)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
             </div>
             <table class="fullWidth">
-                <tr>
-                    <td>
-                        <label class="noWrap" for="saveToText">QBT_TR(Save to:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <input disabled type="text" class="fullWidth" id="saveToText" autocorrect="off" autocapitalize="none" />
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="noWrap" for="saveToText">QBT_TR(Save to:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <input disabled type="text" class="fullWidth" id="saveToText" autocorrect="off" autocapitalize="none" />
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <table>
-                <tr>
-                    <td><label for="ignoreDaysValue">QBT_TR(Ignore Subsequent Matches for (0 to Disable))QBT_TR[CONTEXT=AutomatedRssDownloader]</label></td>
-                    <td><input type="number" id="ignoreDaysValue" min="0" />QBT_TR( days)QBT_TR[CONTEXT=AutomatedRssDownloader]</td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td><label for="ignoreDaysValue">QBT_TR(Ignore Subsequent Matches for (0 to Disable))QBT_TR[CONTEXT=AutomatedRssDownloader]</label></td>
+                        <td><input type="number" id="ignoreDaysValue" min="0" />QBT_TR( days)QBT_TR[CONTEXT=AutomatedRssDownloader]</td>
+                    </tr>
+                </tbody>
             </table>
             <div id="lastMatchDiv">
                 <span id="lastMatchText">QBT_TR(Last Match: Unknown)QBT_TR[CONTEXT=AutomatedRssDownloader]</span>
             </div>
             <table class="fullWidth">
-                <tr>
-                    <td>
-                        <label class="noWrap">QBT_TR(Add Stopped:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <select disabled id="addStoppedCombobox" class="fullWidth">
-                            <option value="default">QBT_TR(Use global settings)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                            <option value="always">QBT_TR(Always)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                            <option value="never">QBT_TR(Never)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                        </select>
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="noWrap">QBT_TR(Add Stopped:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <select disabled id="addStoppedCombobox" class="fullWidth">
+                                <option value="default">QBT_TR(Use global settings)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                                <option value="always">QBT_TR(Always)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                                <option value="never">QBT_TR(Never)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                            </select>
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             <table class="fullWidth">
-                <tr>
-                    <td>
-                        <label class="noWrap">QBT_TR(Torrent content layout:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
-                    </td>
-                    <td class="fullWidth">
-                        <select disabled id="contentLayoutCombobox" class="fullWidth">
-                            <option value="Default">QBT_TR(Use global settings)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                            <option value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                            <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                            <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
-                        </select>
-                    </td>
-                </tr>
+                <tbody>
+                    <tr>
+                        <td>
+                            <label class="noWrap">QBT_TR(Torrent content layout:)QBT_TR[CONTEXT=AutomatedRssDownloader]</label>
+                        </td>
+                        <td class="fullWidth">
+                            <select disabled id="contentLayoutCombobox" class="fullWidth">
+                                <option value="Default">QBT_TR(Use global settings)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                                <option value="Original">QBT_TR(Original)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                                <option value="Subfolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                                <option value="NoSubfolder">QBT_TR(Don't create subfolder)QBT_TR[CONTEXT=AutomatedRssDownloader]</option>
+                            </select>
+                        </td>
+                    </tr>
+                </tbody>
             </table>
         </fieldset>
         <fieldset class="settings" id="rssDownloaderFeeds">
diff --git a/src/webui/www/private/views/statistics.html b/src/webui/www/private/views/statistics.html
index dffd3ecc9..19e9e73cb 100644
--- a/src/webui/www/private/views/statistics.html
+++ b/src/webui/www/private/views/statistics.html
@@ -1,59 +1,65 @@
 <div id="statisticsContent">
     <h3>QBT_TR(User statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
     <table style="width:100%">
-        <tr>
-            <td>QBT_TR(All-time upload:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="AlltimeUL" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(All-time download:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="AlltimeDL" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(All-time share ratio:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="GlobalRatio" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Session waste:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="TotalWastedSession" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Connected peers:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="TotalPeerConnections" class="statisticsValue"></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(All-time upload:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="AlltimeUL" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(All-time download:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="AlltimeDL" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(All-time share ratio:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="GlobalRatio" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Session waste:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="TotalWastedSession" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Connected peers:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="TotalPeerConnections" class="statisticsValue"></td>
+            </tr>
+        </tbody>
     </table>
     <h3>QBT_TR(Cache statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
     <table style="width:100%">
-        <tr>
-            <td>QBT_TR(Read cache hits:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="ReadCacheHits" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Total buffer size:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="TotalBuffersSize" class="statisticsValue"></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(Read cache hits:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="ReadCacheHits" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Total buffer size:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="TotalBuffersSize" class="statisticsValue"></td>
+            </tr>
+        </tbody>
     </table>
     <h3>QBT_TR(Performance statistics)QBT_TR[CONTEXT=StatsDialog]</h3>
     <table style="width:100%">
-        <tr>
-            <td>QBT_TR(Write cache overload:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="WriteCacheOverload" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Read cache overload:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="ReadCacheOverload" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Queued I/O jobs:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="QueuedIOJobs" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Average time in queue:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="AverageTimeInQueue" class="statisticsValue"></td>
-        </tr>
-        <tr>
-            <td>QBT_TR(Total queued size:)QBT_TR[CONTEXT=StatsDialog]</td>
-            <td id="TotalQueuedSize" class="statisticsValue"></td>
-        </tr>
+        <tbody>
+            <tr>
+                <td>QBT_TR(Write cache overload:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="WriteCacheOverload" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Read cache overload:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="ReadCacheOverload" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Queued I/O jobs:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="QueuedIOJobs" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Average time in queue:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="AverageTimeInQueue" class="statisticsValue"></td>
+            </tr>
+            <tr>
+                <td>QBT_TR(Total queued size:)QBT_TR[CONTEXT=StatsDialog]</td>
+                <td id="TotalQueuedSize" class="statisticsValue"></td>
+            </tr>
+        </tbody>
     </table>
 </div>