diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6387028..d73da7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Server sidebar use more width, also displays name and guild ID, becomes smaller on small devices
 - Update changelog to follow [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 - Made the tables and their respective buttons more mobile friendly
+- Tidy up the layout of switches on some forms
 
 ## [0.3.4] - 2024-09-12
 
diff --git a/apps/templates/home/includes/filtermodal.html b/apps/templates/home/includes/filtermodal.html
index ae0242b..ac4e0e3 100644
--- a/apps/templates/home/includes/filtermodal.html
+++ b/apps/templates/home/includes/filtermodal.html
@@ -31,18 +31,18 @@
                                 <input type="text" id="filterMatch" name="filterMatch" class="form-control rounded-1" placeholder="" tabindex="3">
                             </div>
                         </div>
-                        <div class="col-lg-6 pe-lg-4">
-                            <div class="form-switch ps-0">
-                                <label for="filterWhitelist" class="form-check-label mb-2">Is Whitelist?</label>
-                                <br>
-                                <input type="checkbox" id="filterWhitelist" name="filterWhitelist" class="form-check-input ms-0 mt-0" tabindex="4">
+                        <div class="col-12">
+                            <div class="form-check form-switch mb-4">
+                                <label for="filterWhitelist" class="form-check-label">Whitelist</label>
+                                <input type="checkbox" id="filterWhitelist" name="filterWhitelist" class="form-check-input" tabindex="4">
+                                <div class="form-text">Allow only matches, instead of blocking them.</div>
                             </div>
                         </div>
-                        <div class="col-lg-6 ps-lg-4">
-                            <div class="form-switch ps-0">
-                                <label for="filterInsensitive" class="form-check-label mb-2">Case Insensitive?</label>
-                                <br>
-                                <input type="checkbox" id="filterInsensitive" name="filterInsensitive" class="form-check-input ms-0 mt-0" tabindex="5">
+                        <div class="col-12">
+                            <div class="form-check form-switch">
+                                <label for="filterInsensitive" class="form-check-label">Case Insensitive</label>
+                                <input type="checkbox" id="filterInsensitive" name="filterInsensitive" class="form-check-input" tabindex="5">
+                                <div class="form-text">Ignore case sensitivity when matching.</div>
                             </div>
                         </div>
                     </div>
diff --git a/apps/templates/home/includes/settingsmodal.html b/apps/templates/home/includes/settingsmodal.html
index b6ad960..3d20cfb 100644
--- a/apps/templates/home/includes/settingsmodal.html
+++ b/apps/templates/home/includes/settingsmodal.html
@@ -19,14 +19,19 @@
                         </div>
                     </div>
                     <div>
-                        <div class="form-switch ps-0">
-                            <label for="guildSettingsActive" class="form-check-label mb-2">Server Active?</label>
-                            <br>
-                            <input type="checkbox" name="guildSettingsActive" id="guildSettingsActive" class="form-check-input ms-0 mt-0">
-                            <br>
-                            <div class="form-text">Is this server active?</div>
+                        <div class="form-check form-switch">
+                            <label for="guildSettingsActive" class="form-check-label">Server Enabled</label>
+                            <input type="checkbox" name="guildSettingsActive" id="guildSettingsActive" class="form-check-input" role="switch">
+                            <div class="form-text">Disabled servers will not process Subscriptions.</div>
                         </div>
                     </div>
+                    {% comment %}
+                    <hr class="my-4">
+                    <div>
+                        <button type="button" class="btn btn-outline-primary">Reset All Publish Thresholds</button>
+                        <div class="form-text">Subscription content predating the threshold won't be processed.</div>
+                    </div>
+                    {% endcomment %}
                 </div>
                 <div class="modal-footer px-4">
                     <button type="submit" class="btn btn-primary rounded-1 ms-3 me-0">Save Changes</button>
diff --git a/apps/templates/home/includes/submodal.html b/apps/templates/home/includes/submodal.html
index 01d914a..80fed8d 100644
--- a/apps/templates/home/includes/submodal.html
+++ b/apps/templates/home/includes/submodal.html
@@ -47,12 +47,10 @@
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
-                            <div class="form-switch mb-4 ps-0">
-                                <label for="subActive" class="form-check-label mb-2">Active</label>
-                                <br>
-                                <input type="checkbox" id="subActive" name="subActive" class="form-check-input ms-0 mt-0" data-field="active" tabindex="6">
-                                <br>
-                                <div class="form-text">Inactive subscriptions wont be processed.</div>
+                            <div class="form-check form-switch">
+                                <label for="subActive" class="form-check-label">Enabled</label>
+                                <input type="checkbox" id="subActive" name="subActive" class="form-check-input" data-field="active" tabindex="6">
+                                <div class="form-text">Disabled Subscriptions are ignored.</div>
                             </div>
                         </div>
                     </div>
@@ -141,12 +139,10 @@
                             </div>
                         </div>
                         <div class="col-lg-6 ps-lg-4">
-                            <div class="form-switch ps-0">
-                                <label for="subArticleFetchImage" class="form-check-label mb-2">Show Images on Embed?</label>
-                                <br>
-                                <input type="checkbox" id="subArticleFetchImage" name="subArticleFetchImage" class="form-check-input ms-0 mt-0" data-field="article_fetch_image" tabindex="11">
-                                <br>
-                                <div class="form-text">Show images on the discord embed?</div>
+                            <div class="form-check form-switch">
+                                <label for="subArticleFetchImage" class="form-check-label">Show Images</label>
+                                <input type="checkbox" id="subArticleFetchImage" name="subArticleFetchImage" class="form-check-input" data-field="article_fetch_image" tabindex="11">
+                                <div class="form-text">Show images on the Discord embed?</div>
                             </div>
                         </div>
                     </div>