diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2
index c1287ef4..95854026 100644
--- a/package/share/ahriman/templates/build-status.jinja2
+++ b/package/share/ahriman/templates/build-status.jinja2
@@ -103,11 +103,14 @@
             {% include "build-status/login-modal.jinja2" %}
         {% endif %}
 
-        {% include "build-status/package-modals.jinja2" %}
-
         {% include "utils/bootstrap-scripts.jinja2" %}
 
-        {% include "build-status/scripts.jinja2" %}
+        {% include "build-status/failed-modal.jinja2" %}
+        {% include "build-status/success-modal.jinja2" %}
+
+        {% include "build-status/package-add-modal.jinja2" %}
+
+        {% include "build-status/table.jinja2" %}
 
     </body>
 
diff --git a/package/share/ahriman/templates/build-status/failed-modal.jinja2 b/package/share/ahriman/templates/build-status/failed-modal.jinja2
new file mode 100644
index 00000000..6cf3136f
--- /dev/null
+++ b/package/share/ahriman/templates/build-status/failed-modal.jinja2
@@ -0,0 +1,28 @@
+<div id="failed-form" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header bg-danger">
+                <h4 class="modal-title">failed</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+            </div>
+            <div class="modal-body">
+                <p>Packages update has failed.</p>
+                <p id="error-details"></p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const failedForm = $("#failed-form");
+    const errorDetails = $("#error-details");
+    failedForm.on("hidden.bs.modal", () => { reload(); });
+
+    function showFailure(details) {
+        errorDetails.text(details);
+        failedForm.modal("show");
+    }
+</script>
diff --git a/package/share/ahriman/templates/build-status/login-modal.jinja2 b/package/share/ahriman/templates/build-status/login-modal.jinja2
index 386b02f5..f10320bb 100644
--- a/package/share/ahriman/templates/build-status/login-modal.jinja2
+++ b/package/share/ahriman/templates/build-status/login-modal.jinja2
@@ -26,4 +26,4 @@
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/package/share/ahriman/templates/build-status/package-add-modal.jinja2 b/package/share/ahriman/templates/build-status/package-add-modal.jinja2
new file mode 100644
index 00000000..8483e36e
--- /dev/null
+++ b/package/share/ahriman/templates/build-status/package-add-modal.jinja2
@@ -0,0 +1,62 @@
+<div id="add-form" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title">add new packages</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+            </div>
+            <div class="modal-body">
+                <div class="form-group row">
+                    <label for="package" class="col-sm-2 col-form-label">package</label>
+                    <div class="col-sm-10">
+                        <input id="package-form" type="text" list="known-packages-dlist" class="form-control" placeholder="AUR package" name="package" required>
+                        <datalist id="known-packages-dlist"></datalist>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">close</button>
+                <button type="button" class="btn btn-success" data-bs-dismiss="modal" onclick="requestPackages()">request</button>
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addPackages()">add</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const packageInput = $("#package-form");
+    const knownPackages = $("#known-packages-dlist");
+    packageInput.keyup(() => {
+        clearTimeout(packageInput.data("timeout"));
+        packageInput.data("timeout", setTimeout($.proxy(() => {
+            const value = packageInput.val();
+
+            $.ajax({
+                url: "/service-api/v1/search",
+                data: {"for": value},
+                type: "GET",
+                dataType: "json",
+                success: response => {
+                    const options = response.map(pkg => {
+                        const option = document.createElement("option");
+                        option.value = pkg.package;
+                        option.innerText = `${pkg.package} (${pkg.description})`;
+                        return option;
+                    });
+                    knownPackages.empty().append(options);
+                    packageInput.focus();
+                },
+            })
+        }, this), 500));
+    });
+
+    function addPackages() {
+        const packages = [packageInput.val()]
+        doPackageAction("/service-api/v1/add", packages);
+    }
+
+    function requestPackages() {
+        const packages = [packageInput.val()]
+        doPackageAction("/service-api/v1/request", packages);
+    }
+</script>
diff --git a/package/share/ahriman/templates/build-status/package-modals.jinja2 b/package/share/ahriman/templates/build-status/package-modals.jinja2
deleted file mode 100644
index 91a8880e..00000000
--- a/package/share/ahriman/templates/build-status/package-modals.jinja2
+++ /dev/null
@@ -1,60 +0,0 @@
-<div id="add-form" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">add new packages</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group row">
-                    <label for="package" class="col-sm-2 col-form-label">package</label>
-                    <div class="col-sm-10">
-                        <input id="package-form" type="text" list="known-packages-dlist" class="form-control" placeholder="AUR package" name="package" required>
-                        <datalist id="known-packages-dlist"></datalist>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">close</button>
-                <button type="button" class="btn btn-success" data-bs-dismiss="modal" onclick="requestPackages()">request</button>
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addPackages()">add</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="failed-form" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header bg-danger">
-                <h4 class="modal-title">failed</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <p>Packages update has failed.</p>
-                <p id="error-details"></p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="success-form" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header bg-success">
-                <h4 class="modal-title">success</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <p>Packages update has been run.</p>
-                <ul id="success-details"></ul>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/package/share/ahriman/templates/build-status/success-modal.jinja2 b/package/share/ahriman/templates/build-status/success-modal.jinja2
new file mode 100644
index 00000000..cab3b54b
--- /dev/null
+++ b/package/share/ahriman/templates/build-status/success-modal.jinja2
@@ -0,0 +1,28 @@
+<div id="success-form" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header bg-success">
+                <h4 class="modal-title">success</h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+            </div>
+            <div class="modal-body">
+                <p>Packages update has been run.</p>
+                <ul id="success-details"></ul>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const successForm = $("#success-form");
+    const successDetails = $("#success-details");
+    successForm.on("hidden.bs.modal", () => { reload(); });
+
+    function showSuccess(details) {
+        successDetails.empty().append(details);
+        successForm.modal("show");
+    }
+</script>
diff --git a/package/share/ahriman/templates/build-status/scripts.jinja2 b/package/share/ahriman/templates/build-status/table.jinja2
similarity index 75%
rename from package/share/ahriman/templates/build-status/scripts.jinja2
rename to package/share/ahriman/templates/build-status/table.jinja2
index f7207237..e5f349f6 100644
--- a/package/share/ahriman/templates/build-status/scripts.jinja2
+++ b/package/share/ahriman/templates/build-status/table.jinja2
@@ -10,40 +10,6 @@
             updateButton.prop("disabled", !table.bootstrapTable("getSelections").length);
         });
 
-    const successForm = $("#success-form");
-    const successDetails = $("#success-details");
-    successForm.on("hidden.bs.modal", () => { reload(); });
-
-    const failedForm = $("#failed-form");
-    const errorDetails = $("#error-details");
-    failedForm.on("hidden.bs.modal", () => { reload(); });
-
-    const packageInput = $("#package-form");
-    const knownPackages = $("#known-packages-dlist");
-    packageInput.keyup(() => {
-        clearTimeout(packageInput.data("timeout"));
-        packageInput.data("timeout", setTimeout($.proxy(() => {
-            const value = packageInput.val();
-
-            $.ajax({
-                url: "/service-api/v1/search",
-                data: {"for": value},
-                type: "GET",
-                dataType: "json",
-                success: response => {
-                    const options = response.map(pkg => {
-                        const option = document.createElement("option");
-                        option.value = pkg.package;
-                        option.innerText = `${pkg.package} (${pkg.description})`;
-                        return option;
-                    });
-                    knownPackages.empty().append(options);
-                    packageInput.focus();
-                },
-            })
-        }, this), 500));
-    });
-
     const architectureBadge = $("#badge-architecture");
     const repositoryBadge = $("#badge-repository");
     const statusBadge = $("#badge-status");
@@ -63,13 +29,9 @@
                     li.innerText = pkg;
                     return li;
                 });
-                successDetails.empty().append(details);
-                successForm.modal("show");
-            },
-            error: (jqXHR, _, errorThrown) => {
-                errorDetails.text(errorThrown);
-                failedForm.modal("show");
+                showSuccess(details);
             },
+            error: (jqXHR, _, errorThrown) => { showFailure(errorThrown); },
         })
     }
 
@@ -77,16 +39,6 @@
         return table.bootstrapTable("getSelections").map(row => { return row.id; });
     }
 
-    function addPackages() {
-        const packages = [packageInput.val()]
-        doPackageAction("/service-api/v1/add", packages);
-    }
-
-    function requestPackages() {
-        const packages = [packageInput.val()]
-        doPackageAction("/service-api/v1/request", packages);
-    }
-
     function removePackages() { doPackageAction("/service-api/v1/remove", getSelection()); }
 
     function updatePackages() { doPackageAction("/service-api/v1/add", getSelection()); }
@@ -142,8 +94,7 @@
                     table.bootstrapTable("hideLoading");
                 } else {
                     // other errors
-                    errorDetails.text(errorThrown);
-                    failedForm.modal("show");
+                    showFailure(errorThrown);
                 }
             },
         });
diff --git a/setup.py b/setup.py
index be7d17d7..50546948 100644
--- a/setup.py
+++ b/setup.py
@@ -69,9 +69,11 @@ setup(
             "package/share/ahriman/templates/telegram-index.jinja2",
         ]),
         ("share/ahriman/templates/build-status", [
+            "package/share/ahriman/templates/build-status/failed-modal.jinja2",
             "package/share/ahriman/templates/build-status/login-modal.jinja2",
-            "package/share/ahriman/templates/build-status/package-modals.jinja2",
-            "package/share/ahriman/templates/build-status/scripts.jinja2",
+            "package/share/ahriman/templates/build-status/package-add-modal.jinja2",
+            "package/share/ahriman/templates/build-status/success-modal.jinja2",
+            "package/share/ahriman/templates/build-status/table.jinja2",
         ]),
         ("share/ahriman/templates/static", [
             "package/share/ahriman/templates/static/favicon.ico",
diff --git a/tests/ahriman/core/test_util.py b/tests/ahriman/core/test_util.py
index 25a8b0b4..bd125228 100644
--- a/tests/ahriman/core/test_util.py
+++ b/tests/ahriman/core/test_util.py
@@ -320,9 +320,11 @@ def test_walk(resource_path_root: Path) -> None:
         resource_path_root / "models" / "package_gcc10_srcinfo",
         resource_path_root / "models" / "package_tpacpi-bat-git_srcinfo",
         resource_path_root / "models" / "package_yay_srcinfo",
+        resource_path_root / "web" / "templates" / "build-status" / "failed-modal.jinja2",
         resource_path_root / "web" / "templates" / "build-status" / "login-modal.jinja2",
-        resource_path_root / "web" / "templates" / "build-status" / "package-modals.jinja2",
-        resource_path_root / "web" / "templates" / "build-status" / "scripts.jinja2",
+        resource_path_root / "web" / "templates" / "build-status" / "package-add-modal.jinja2",
+        resource_path_root / "web" / "templates" / "build-status" / "success-modal.jinja2",
+        resource_path_root / "web" / "templates" / "build-status" / "table.jinja2",
         resource_path_root / "web" / "templates" / "static" / "favicon.ico",
         resource_path_root / "web" / "templates" / "utils" / "bootstrap-scripts.jinja2",
         resource_path_root / "web" / "templates" / "utils" / "style.jinja2",