From a297b8d6d8379ae90f2501531f3dccf6fe2f18c2 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 5 Nov 2025 01:39:22 -0500
Subject: [PATCH] Migrate many admin Add modals to the new ajax-modal

---
 admin/ai_model.php                            |   3 +-
 admin/ai_provider.php                         |   3 +-
 admin/api_keys.php                            | 289 +++++++++--------
 admin/custom_link.php                         |   3 +-
 admin/modals/ai/ai_model_add.php              | 144 ++++-----
 admin/modals/ai/ai_provider_add.php           | 102 +++---
 admin/modals/api/api_key_add.php              | 233 +++++++-------
 admin/modals/custom_link/custom_link_add.php  | 161 +++++-----
 .../payment_method/payment_method_add.php     |  69 +++--
 .../payment_provider/payment_provider_add.php | 201 ++++++------
 .../project_template/project_template_add.php |  78 ++---
 .../project_template_edit.php                 |  92 +++---
 .../project_template_ticket_template_add.php  | 123 ++++----
 admin/modals/role/role_add.php                | 112 +++----
 admin/modals/tag/tag_add.php                  |   1 +
 admin/modals/tax/tax_add.php                  |  51 +--
 .../ticket_status/ticket_status_add.php       |  65 ++--
 admin/modals/user/user_add.php                | 292 ++++++++++--------
 admin/modals/user/user_all_reset_password.php |  58 ++--
 admin/modals/user/user_edit.php               |  23 +-
 admin/modals/user/user_invite.php             |  86 +++---
 admin/payment_method.php                      |   3 +-
 admin/payment_provider.php                    |   3 +-
 admin/project_template.php                    |  17 +-
 admin/project_template_details.php            |   7 +-
 admin/roles.php                               |   4 +-
 admin/tax.php                                 | 151 +++++----
 admin/ticket_status.php                       |   8 +-
 admin/users.php                               |  16 +-
 agent/ajax.php                                |   2 +-
 agent/modals/contact/contact_add.php          |  16 +-
 agent/modals/contact/contact_edit.php         |  16 +-
 32 files changed, 1243 insertions(+), 1189 deletions(-)

diff --git a/admin/ai_model.php b/admin/ai_model.php
index cca1f863..a231ce5c 100644
--- a/admin/ai_model.php
+++ b/admin/ai_model.php
@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-robot mr-2"></i>AI Models</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAIModelModal"><i class="fas fa-plus mr-2"></i>Add Model</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ai/ai_model_add.php"><i class="fas fa-plus mr-2"></i>Add Model</button>
         </div>
     </div>
     <div class="card-body">
@@ -104,5 +104,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/ai/ai_model_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/ai_provider.php b/admin/ai_provider.php
index a3b01452..45fb5f56 100644
--- a/admin/ai_provider.php
+++ b/admin/ai_provider.php
@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-robot mr-2"></i>AI Providers</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAIProviderModal"><i class="fas fa-plus mr-2"></i>Add Provider</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ai/ai_provider_add.php"><i class="fas fa-plus mr-2"></i>Add Provider</button>
         </div>
     </div>
     <div class="card-body">
@@ -105,5 +105,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/ai/ai_provider_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/api_keys.php b/admin/api_keys.php
index 0d59e1fd..0b433d8d 100644
--- a/admin/api_keys.php
+++ b/admin/api_keys.php
@@ -18,159 +18,150 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-key mr-2"></i>API Keys</h3>
-            <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addApiKeyModal"><i class="fas fa-plus mr-2"></i>Create</button>
-            </div>
-        </div>
-
-        <div class="card-body">
-
-            <form autocomplete="off">
-                <div class="row">
-
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search keys">
-                            <div class="input-group-append">
-                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col-md-8">
-                        <div class="btn-group float-right">
-                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
-                                </button>
-                                <div class="dropdown-menu">
-                                    <button class="dropdown-item text-danger text-bold"
-                                            type="submit" form="bulkActions" name="bulk_delete_api_keys">
-                                        <i class="fas fa-fw fa-trash mr-2"></i>Revoke
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </form>
-            <hr>
-
-            <div class="table-responsive-sm">
-
-                <form id="bulkActions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                    <table class="table table-striped table-borderless table-hover">
-                        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                        <tr>
-                            <td class="pr-0">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" onclick="checkAll(this)">
-                                </div>
-                            </td>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_name&order=<?php echo $disp; ?>">
-                                    Name <?php if ($sort == 'api_key_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_client_id&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'api_key_client_id') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_secret&order=<?php echo $disp; ?>">
-                                    Secret <?php if ($sort == 'api_key_secret') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_created_at&order=<?php echo $disp; ?>">
-                                    Created <?php if ($sort == 'api_key_created_at') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_expire&order=<?php echo $disp; ?>">
-                                    Expires <?php if ($sort == 'api_key_expire') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $api_key_id = intval($row['api_key_id']);
-                            $api_key_name = nullable_htmlentities($row['api_key_name']);
-                            $api_key_secret = nullable_htmlentities("************" . substr($row['api_key_secret'], -4));
-                            $api_key_created_at = nullable_htmlentities($row['api_key_created_at']);
-                            $api_key_expire = nullable_htmlentities($row['api_key_expire']);
-                            if ($api_key_expire < date("Y-m-d H:i:s")) {
-                                $api_key_expire = $api_key_expire . " (Expired)";
-                            }
-
-                            if ($row['api_key_client_id'] == 0) {
-                                $api_key_client = "<i>All Clients</i>";
-                            } else {
-                                $api_key_client = nullable_htmlentities($row['client_name']);
-                            }
-
-                            ?>
-                            <tr>
-                                <td class="pr-0">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="api_key_ids[]" value="<?php echo $api_key_id ?>">
-                                    </div>
-                                </td>
-
-                                <td class="text-bold"><?php echo $api_key_name; ?></td>
-
-                                <td><?php echo $api_key_client; ?></td>
-
-                                <td><?php echo $api_key_secret; ?></td>
-
-                                <td><?php echo $api_key_created_at; ?></td>
-
-                                <td><?php echo $api_key_expire; ?></td>
-
-                                <td>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                            <i class="fas fa-ellipsis-h"></i>
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                <i class="fas fa-fw fa-times mr-2"></i>Revoke
-                                            </a>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                        <?php } ?>
-
-
-                        </tbody>
-                    </table>
-
-                </form>
-
-            </div>
-            <?php require_once "../includes/filter_footer.php";
- ?>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-key mr-2"></i>API Keys</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/api/api_key_add.php"><i class="fas fa-plus mr-2"></i>New API Key</button>
         </div>
     </div>
 
-    <script src="../js/bulk_actions.js"></script>
+    <div class="card-body">
+
+        <form autocomplete="off">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search keys">
+                        <div class="input-group-append">
+                            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-8">
+                    <div class="btn-group float-right">
+                        <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
+                            </button>
+                            <div class="dropdown-menu">
+                                <button class="dropdown-item text-danger text-bold"
+                                        type="submit" form="bulkActions" name="bulk_delete_api_keys">
+                                    <i class="fas fa-fw fa-trash mr-2"></i>Revoke
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+        </form>
+        <hr>
+
+        <div class="table-responsive-sm">
+
+            <form id="bulkActions" action="post.php" method="post">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <td class="pr-0">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" onclick="checkAll(this)">
+                            </div>
+                        </td>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'api_key_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_client_id&order=<?php echo $disp; ?>">
+                                Client <?php if ($sort == 'api_key_client_id') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_secret&order=<?php echo $disp; ?>">
+                                Secret <?php if ($sort == 'api_key_secret') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_created_at&order=<?php echo $disp; ?>">
+                                Created <?php if ($sort == 'api_key_created_at') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=api_key_expire&order=<?php echo $disp; ?>">
+                                Expires <?php if ($sort == 'api_key_expire') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $api_key_id = intval($row['api_key_id']);
+                        $api_key_name = nullable_htmlentities($row['api_key_name']);
+                        $api_key_secret = nullable_htmlentities("************" . substr($row['api_key_secret'], -4));
+                        $api_key_created_at = nullable_htmlentities($row['api_key_created_at']);
+                        $api_key_expire = nullable_htmlentities($row['api_key_expire']);
+                        if ($api_key_expire < date("Y-m-d H:i:s")) {
+                            $api_key_expire = $api_key_expire . " (Expired)";
+                        }
+
+                        if ($row['api_key_client_id'] == 0) {
+                            $api_key_client = "<i>All Clients</i>";
+                        } else {
+                            $api_key_client = nullable_htmlentities($row['client_name']);
+                        }
+
+                        ?>
+                        <tr>
+                            <td class="pr-0">
+                                <div class="form-check">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="api_key_ids[]" value="<?php echo $api_key_id ?>">
+                                </div>
+                            </td>
+                            <td class="text-bold"><?php echo $api_key_name; ?></td>
+                            <td><?php echo $api_key_client; ?></td>
+                            <td><?php echo $api_key_secret; ?></td>
+                            <td><?php echo $api_key_created_at; ?></td>
+                            <td><?php echo $api_key_expire; ?></td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_api_key=<?php echo $api_key_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                            <i class="fas fa-fw fa-times mr-2"></i>Revoke
+                                        </a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                    <?php } ?>
+
+
+                    </tbody>
+                </table>
+
+            </form>
+
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
+
+<script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/api/api_key_add.php";
-
 require_once "../includes/footer.php";
 
diff --git a/admin/custom_link.php b/admin/custom_link.php
index 77a42072..eebc217d 100644
--- a/admin/custom_link.php
+++ b/admin/custom_link.php
@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Custom Links</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLinkModal"><i class="fas fa-plus mr-2"></i>New Link</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/custom_link/custom_link_add.php"><i class="fas fa-plus mr-2"></i>New Link</button>
             </div>
         </div>
 
@@ -145,5 +145,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/custom_link/custom_link_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/modals/ai/ai_model_add.php b/admin/modals/ai/ai_model_add.php
index 32c3880d..aa40a2fb 100644
--- a/admin/modals/ai/ai_model_add.php
+++ b/admin/modals/ai/ai_model_add.php
@@ -1,73 +1,77 @@
-<div class="form-group">
-    <div class="modal" id="addAIModelModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Add AI Model</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Add AI Model</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <select class="form-control select2" name="provider" required>
+                    <option value="">- Select an AI Provider -</option>
+                    <?php
+                        $sql_ai_providers = mysqli_query($mysqli, "SELECT * FROM ai_providers");
+                        while ($row = mysqli_fetch_array($sql_ai_providers)) {
+                            $ai_provider_id = intval($row['ai_provider_id']);
+                            $ai_provider_name = nullable_htmlentities($row['ai_provider_name']);
+
+                        ?>
+                        <option value="<?php echo $ai_provider_id; ?>"><?php echo $ai_provider_name; ?></option>
+                    <?php } ?>
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <label>Provider <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <select class="form-control select2" name="provider" required>
-                                <option value="">- Select an AI Provider -</option>
-                                <?php
-                                    $sql_ai_providers = mysqli_query($mysqli, "SELECT * FROM ai_providers");
-                                    while ($row = mysqli_fetch_array($sql_ai_providers)) {
-                                        $ai_provider_id = intval($row['ai_provider_id']);
-                                        $ai_provider_name = nullable_htmlentities($row['ai_provider_name']);
-
-                                    ?>
-                                    <option value="<?php echo $ai_provider_id; ?>"><?php echo $ai_provider_name; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Model Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="model" placeholder="ex gpt-4">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Use Case <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-th-list"></i></span>
-                            </div>
-                            <select class="form-control select2" name="use_case">
-                                <option>General</option>
-                                <option>Tickets</option>
-                                <option>Documentation</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control" rows="8" name="prompt" placeholder="Enter a model prompt:"></textarea>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_ai_model" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
+
+        <div class="form-group">
+            <label>Model Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <input type="text" class="form-control" name="model" placeholder="ex gpt-4">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Use Case <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-th-list"></i></span>
+                </div>
+                <select class="form-control select2" name="use_case">
+                    <option>General</option>
+                    <option>Tickets</option>
+                    <option>Documentation</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control" rows="8" name="prompt" placeholder="Enter a model prompt:"></textarea>
+        </div>
+
     </div>
-</div>
\ No newline at end of file
+    <div class="modal-footer">
+        <button type="submit" name="add_ai_model" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/ai/ai_provider_add.php b/admin/modals/ai/ai_provider_add.php
index 34cf5e60..1350b61e 100644
--- a/admin/modals/ai/ai_provider_add.php
+++ b/admin/modals/ai/ai_provider_add.php
@@ -1,54 +1,58 @@
-<div class="form-group">
-    <div class="modal" id="addAIProviderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>New AI Provider</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Provider Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="provider" placeholder="ex OpenAI">
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>URL <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                            </div>
-                            <input type="url" class="form-control" name="url" placeholder="ex https://ai.company.ext/api">
-                        </div>
-                    </div>
+?>
 
-                    <div class="form-group">
-                        <label>API Key</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="api_key" placeholder="Enter API key here">
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_ai_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>New AI Provider</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Provider Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-robot"></i></span>
+                </div>
+                <input type="text" class="form-control" name="provider" placeholder="ex OpenAI">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>URL <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                </div>
+                <input type="url" class="form-control" name="url" placeholder="ex https://ai.company.ext/api">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>API Key</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="api_key" placeholder="Enter API key here">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_ai_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/api/api_key_add.php b/admin/modals/api/api_key_add.php
index 8a515847..b669a517 100644
--- a/admin/modals/api/api_key_add.php
+++ b/admin/modals/api/api_key_add.php
@@ -1,121 +1,124 @@
 <?php
+
+require_once '../../../includes/modal_header.php';
+
 $key = randomString(156);
 $decryptPW = randomString(160);
+
+ob_start();
 ?>
-<div class="modal" id="addApiKeyModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>New Key</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-api-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-api-keys">Keys</a>
-                        </li>
-                    </ul>
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-api-details">
-                            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                            <input type="hidden" name="key" value="<?php echo $key ?>">
-                            <input type="hidden" name="password" value="<?php echo $decryptPW ?>">
-
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Key Name" maxlength="255" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Expiration Date <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="expire" min="<?php echo date('Y-m-d')?>" max="2999-12-31" required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Client Access <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="client" required>
-                                        <option value="0"> ALL CLIENTS </option>
-                                        <?php
-                                        $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $client_id = intval($row['client_id']);
-                                            $client_name = nullable_htmlentities($row['client_name']); ?>
-                                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-api-keys">
-                            <div class="form-group">
-                                <label>API Key <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Login credential decryption password <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-unlock-alt"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" value="<?php echo $decryptPW ?>" required disabled>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $decryptPW; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-                            <br>
-                            <div class="form-group">
-                                <label>I have made a copy of the key(s)<strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <input type="checkbox" name="ack" value="1" required>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_api_key" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>New Key</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-api-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-api-keys">Keys</a>
+            </li>
+        </ul>
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-api-details">
+                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <input type="hidden" name="key" value="<?php echo $key ?>">
+                <input type="hidden" name="password" value="<?php echo $decryptPW ?>">
+
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Key Name" maxlength="255" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expiration Date <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="expire" min="<?php echo date('Y-m-d')?>" max="2999-12-31" required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Client Access <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="client" required>
+                            <option value="0"> ALL CLIENTS </option>
+                            <?php
+                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $client_id = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']); ?>
+                                <option value="<?php echo $client_id; ?>"><?php echo "$client_name  (Client ID: $client_id)"; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="tab-pane fade" id="pills-api-keys">
+                <div class="form-group">
+                    <label>API Key <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" value="<?php echo $key ?>" required disabled>
+                        <div class="input-group-append">
+                            <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $key; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Login credential decryption password <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-unlock-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" value="<?php echo $decryptPW ?>" required disabled>
+                        <div class="input-group-append">
+                            <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $decryptPW; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <br>
+                <div class="form-group">
+                    <label>I have made a copy of the key(s)<strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <input type="checkbox" name="ack" value="1" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_api_key" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/custom_link/custom_link_add.php b/admin/modals/custom_link/custom_link_add.php
index 4e02b74d..4f63af1c 100644
--- a/admin/modals/custom_link/custom_link_add.php
+++ b/admin/modals/custom_link/custom_link_add.php
@@ -1,83 +1,88 @@
-<div class="modal" id="addLinkModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-list-ul"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Link name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Order</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
-                            </div>
-                            <input type="number" class="form-control" name="order" placeholder="Leave blank for no order">
-                        </div>
-                    </div>
+?>
 
-                    <div class="form-group">
-                        <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" required>
-                            <div class="input-group-append">
-                                <div class="input-group-text">
-                                    <input type="checkbox" name="new_tab" value="1">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Icon</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Location <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
-                            </div>
-                            <select class="form-control select2" name="location" required>
-                                <option value="1">Main Side Nav</option>
-                                <option value="2">Top Nav (Icon Required)</option>
-                                <option value="3">Client Portal Nav</option>
-                                <option value="4">Admin Nav</option>
-                                <option value="5">Reports Nav</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-list-ul"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Link name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Order</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                </div>
+                <input type="number" class="form-control" name="order" placeholder="Leave blank for no order">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" required>
+                <div class="input-group-append">
+                    <div class="input-group-text">
+                        <input type="checkbox" name="new_tab" value="1">
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Icon</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
+                </div>
+                <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-home"></i></span>
+                </div>
+                <select class="form-control select2" name="location" required>
+                    <option value="1">Main Side Nav</option>
+                    <option value="2">Top Nav (Icon Required)</option>
+                    <option value="3">Client Portal Nav</option>
+                    <option value="4">Admin Nav</option>
+                    <option value="5">Reports Nav</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_custom_link" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/payment_method/payment_method_add.php b/admin/modals/payment_method/payment_method_add.php
index 25002544..1f4fcbd0 100644
--- a/admin/modals/payment_method/payment_method_add.php
+++ b/admin/modals/payment_method/payment_method_add.php
@@ -1,37 +1,42 @@
-<div class="modal" id="addPaymentMethodModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Creating: <strong>Payment Method</strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Payment method name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <textarea class="form-control" rows="3" name="description" placeholder="Enter a description..."></textarea>
-                    </div>
+?>
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_payment_method" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Creating: <strong>Payment Method</strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Payment method name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control" rows="3" name="description" placeholder="Enter a description..."></textarea>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_payment_method" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/payment_provider/payment_provider_add.php b/admin/modals/payment_provider/payment_provider_add.php
index 54b52182..5f543a1d 100644
--- a/admin/modals/payment_provider/payment_provider_add.php
+++ b/admin/modals/payment_provider/payment_provider_add.php
@@ -1,103 +1,106 @@
-<div class="form-group">
-    <div class="modal" id="addPaymentProviderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="alert alert-info">
-                        An income account named after the provider will always be created and used for income of paid invoices.<br>
-                        If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Provider <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
-                            </div>
-                            <select class="form-control select2" name="provider">
-                                <option>Stripe</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Publishable key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Secret key <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Threshold</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
-                        </div>
-                        <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
-                    </div>
-
-                    <hr>
-
-                    <div class="form-group">
-                        <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
-                            <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Percentage Fee to expense</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
-                        </div>
-                        <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Flat Fee to expense</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
-                        </div>
-                        <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="alert alert-info">
+            An income account named after the provider will always be created and used for income of paid invoices.<br>
+            If "Enable Expense" option is enabled, a matching vendor will also be automatically created for expense tracking. Additionally, an expense category named "Payment Processing" will be created.
+        </div>
+
+        <div class="form-group">
+            <label>Provider <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
+                </div>
+                <select class="form-control select2" name="provider">
+                    <option>Stripe</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Publishable key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <input type="text" class="form-control" name="public_key" placeholder="Publishable API Key (pk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Secret key <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <input type="text" class="form-control" name="private_key" placeholder="Secret API Key (sk_...)">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Threshold</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
+            </div>
+            <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
+        </div>
+
+        <hr>
+
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="enable_expense" checked value="1" id="enableExpenseSwitch">
+                <label class="custom-control-label" for="enableExpenseSwitch">Enable Expense</label>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Percentage Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-percent"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="percentage_fee" placeholder="Enter Percentage">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+        <div class="form-group">
+            <label>Flat Fee to expense</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,3}" name="flat_fee" placeholder="0.030">
+            </div>
+            <small class="form-text text-muted">See <a href="https://stripe.com/pricing" target="_blank">here <i class="fas fa-fw fa-external-link-alt"></i></a> for the latest Stripe Fees.</small>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/project_template/project_template_add.php b/admin/modals/project_template/project_template_add.php
index 97676550..b7d8fcf0 100644
--- a/admin/modals/project_template/project_template_add.php
+++ b/admin/modals/project_template/project_template_add.php
@@ -1,41 +1,45 @@
-<div class="modal" id="addProjectTemplateModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Creating Project Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
+<?php
 
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label>Project Template Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" required autofocus>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Description">
-                        </div>
-                    </div>
+ob_start();
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Creating Project Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+        <div class="form-group">
+            <label>Project Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Description">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/project_template/project_template_edit.php b/admin/modals/project_template/project_template_edit.php
index 14eda4a1..725494c5 100644
--- a/admin/modals/project_template/project_template_edit.php
+++ b/admin/modals/project_template/project_template_edit.php
@@ -1,44 +1,56 @@
-<div class="modal" id="editProjectTemplateModal<?php echo $project_template_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project Template: <strong><?php echo $project_template_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
+<?php
 
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label>Project Template Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" value="<?php echo $project_template_name; ?>" required autofocus>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $project_template_description; ?>">
-                        </div>
-                    </div>
+$project_template_id = intval($_GET['project_template_id']);
 
-                </div>
-                
-                <div class="modal-footer">
-                    <button type="submit" name="edit_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            
-            </form>
-        </div>
-    </div>
+$sql = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_id = $project_template_id LIMIT 1");
+$row = mysqli_fetch_array($sql);
+$project_template_name = nullable_htmlentities($row['project_template_name']);
+$project_template_description = nullable_htmlentities($row['project_template_description']);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project Template: <strong><?php echo $project_template_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
+
+    <div class="modal-body">
+        <div class="form-group">
+            <label>Project Template Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Project Template Name" maxlength="255" value="<?php echo $project_template_name; ?>" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Description" value="<?php echo $project_template_description; ?>">
+            </div>
+        </div>
+
+    </div>
+    
+    <div class="modal-footer">
+        <button type="submit" name="edit_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/project_template/project_template_ticket_template_add.php b/admin/modals/project_template/project_template_ticket_template_add.php
index 9acced48..a67997dd 100644
--- a/admin/modals/project_template/project_template_ticket_template_add.php
+++ b/admin/modals/project_template/project_template_ticket_template_add.php
@@ -1,64 +1,71 @@
-<div class="modal" id="addProjectTemplateTicketTemplateModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Ticket Template <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
-                            </div>
-                            <select class="form-control select2" name="ticket_template_id" required>
-                                <option value="">- Select a Ticket Template -</option>
-                                <?php
+require_once '../../../includes/modal_header.php';
 
-                                $sql_ticket_templates_select = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_name FROM ticket_templates
-                                    WHERE ticket_template_id NOT IN (
-                                        SELECT ticket_template_id FROM project_template_ticket_templates
-                                        WHERE project_template_id = $project_template_id
-                                    )
-                                    AND ticket_template_archived_at IS NULL
-                                    ORDER BY ticket_template_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_ticket_templates_select)) {
-                                    $ticket_template_id_select = intval($row['ticket_template_id']);
-                                    $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']);
-                                    ?>
-                                    <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_name_select; ?></option>
-                                    <?php
-                                }
+$project_template_id = intval($_GET['project_template_id']);
 
-                                ?>
-                            </select>
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Order</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="order" value="1">
-                        </div>
-                    </div>
+?>
 
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_ticket_template_to_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket Template</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Ticket Template <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-life-ring"></i></span>
+                </div>
+                <select class="form-control select2" name="ticket_template_id" required>
+                    <option value="">- Select a Ticket Template -</option>
+                    <?php
+
+                    $sql_ticket_templates_select = mysqli_query($mysqli, "SELECT ticket_template_id, ticket_template_name FROM ticket_templates
+                        WHERE ticket_template_id NOT IN (
+                            SELECT ticket_template_id FROM project_template_ticket_templates
+                            WHERE project_template_id = $project_template_id
+                        )
+                        AND ticket_template_archived_at IS NULL
+                        ORDER BY ticket_template_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql_ticket_templates_select)) {
+                        $ticket_template_id_select = intval($row['ticket_template_id']);
+                        $ticket_template_name_select = nullable_htmlentities($row['ticket_template_name']);
+                        ?>
+                        <option value="<?php echo $ticket_template_id_select; ?>"><?php echo $ticket_template_name_select; ?></option>
+                        <?php
+                    }
+
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Order</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                </div>
+                <input type="text" class="form-control" name="order" value="1">
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_ticket_template_to_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/role/role_add.php b/admin/modals/role/role_add.php
index a633b342..c9397514 100644
--- a/admin/modals/role/role_add.php
+++ b/admin/modals/role/role_add.php
@@ -1,58 +1,62 @@
-<div class="modal" id="addRoleModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Add new role</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body">
-                    <div class="tab-content">
+<?php
 
-                        <div class="form-group">
-                            <label>Name <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                                </div>
-                                <input type="text" class="form-control" name="role_name" placeholder="Role Name" maxlength="200" required>
-                            </div>
-                        </div>
+require_once '../../../includes/modal_header.php';
 
-                        <div class="form-group">
-                            <label>Description <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-chevron-right"></i></span>
-                                </div>
-                                <input type="text" class="form-control" name="role_description" placeholder="Role Description" maxlength="200" required>
-                            </div>
-                        </div>
+ob_start();
 
-                        <div class="form-group">
-                            <label>Admin Access <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-tools"></i></span>
-                                </div>
-                                <select class="form-control select2" name="role_is_admin" required>
-                                    <option value="0">No - edit after creation to set permissions</option>
-                                    <option value="1">Yes - this role should have full admin access</option>
-                                </select>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>New Role</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <div class="modal-body">
+        <div class="tab-content">
+
+            <div class="form-group">
+                <label>Name <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="role_name" placeholder="Role Name" maxlength="200" required>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Description <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-chevron-right"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="role_description" placeholder="Role Description" maxlength="200" required>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Admin Access <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-tools"></i></span>
+                    </div>
+                    <select class="form-control select2" name="role_is_admin" required>
+                        <option value="0">No - edit after creation to set permissions</option>
+                        <option value="1">Yes - this role should have full admin access</option>
+                    </select>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/tag/tag_add.php b/admin/modals/tag/tag_add.php
index 2a24baea..9bd6d489 100644
--- a/admin/modals/tag/tag_add.php
+++ b/admin/modals/tag/tag_add.php
@@ -17,6 +17,7 @@ if (isset($_GET['type'])) {
         $type_display = "Credential";
     }
 }
+ob_start();
 
 ?>
 
diff --git a/admin/modals/tax/tax_add.php b/admin/modals/tax/tax_add.php
index d2ac58b2..57bceba7 100644
--- a/admin/modals/tax/tax_add.php
+++ b/admin/modals/tax/tax_add.php
@@ -1,30 +1,35 @@
-<div class="modal" id="addTaxModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>New Tax</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-        <div class="modal-body">
-          <div class="form-group">
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>New Tax</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+        <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" placeholder="Tax name" maxlength="200" required autofocus>
-          </div>
-          <div class="form-group">
+        </div>
+        <div class="form-group">
             <label>Percent <strong class="text-danger">*</strong></label>
             <input type="number" min="0" step="any" class="form-control col-md-4" name="percent">
-          </div>
         </div>
-        <div class="modal-footer">
-          <button type="submit" name="add_tax" class="btn btn-primary text-bold"><i class="fa fa-check mr- 2"></i>Create</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
     </div>
-  </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_tax" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/ticket_status/ticket_status_add.php b/admin/modals/ticket_status/ticket_status_add.php
index 98b205b3..bef9f7ba 100644
--- a/admin/modals/ticket_status/ticket_status_add.php
+++ b/admin/modals/ticket_status/ticket_status_add.php
@@ -1,42 +1,43 @@
-<div class="modal" id="addTicketStatusModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header bg-dark">
-        <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>New Ticket Status</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
+<?php
+require_once '../../../includes/modal_header.php';
+ob_start();
+?>
 
-        <div class="modal-body">
-          
-          <div class="form-group">
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>New Ticket Status</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+        <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" placeholder="Ticket Status name" maxlength="200" required autofocus>
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Ticket Status name" maxlength="200" required autofocus>
             </div>
-          </div>
+        </div>
 
-          <div class="form-group">
+        <div class="form-group">
             <label>Color <strong class="text-danger">*</strong></label>
             <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
-              </div>
-              <input type="color" class="form-control col-3" name="color" required>
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-paint-brush"></i></span>
+                </div>
+                <input type="color" class="form-control col-3" name="color" required>
             </div>
-          </div>
-        
         </div>
-        <div class="modal-footer">
-          <button type="submit" name="add_ticket_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-          <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-        </div>
-      </form>
+
     </div>
-  </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_ticket_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/user/user_add.php b/admin/modals/user/user_add.php
index e57da329..02a35998 100644
--- a/admin/modals/user/user_add.php
+++ b/admin/modals/user/user_add.php
@@ -1,156 +1,176 @@
-<div class="modal" id="addUserModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-user-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-user-access">Restrict Access</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+ob_start();
 
-                    <div class="tab-content">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <div class="modal-body">
 
-                        <div class="tab-pane fade show active" id="pills-user-details">
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-user-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-user-access">Restrict Access</a>
+            </li>
+        </ul>
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
-                                </div>
-                            </div>
+        <hr>
 
-                            <div class="form-group">
-                                <label>Email <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
-                                </div>
-                            </div>
+        <div class="tab-content">
 
-                            <div class="form-group">
-                                <label>Password <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" minlength="8" required>
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                    <div class="input-group-append">
-                                        <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Role <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="role" required>
-                                        <option value="">- Role -</option>
-                                        <?php
-                                            $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_archived_at IS NULL");
-                                            while ($row = mysqli_fetch_array($sql_user_roles)) {
-                                                $role_id = intval($row['role_id']);
-                                                $role_name = nullable_htmlentities($row['role_name']);
-
-                                            ?>
-                                            <option value="<?php echo $role_id; ?>"><?php echo $role_name; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Avatar</label>
-                                <input type="file" class="form-control-file" accept="image/*" name="file">
-                            </div>
-
-                            <div class="form-group" <?php if(empty($config_smtp_host)) { echo "hidden"; } ?>>
-                                <div class="custom-control custom-checkbox">
-                                    <input class="custom-control-input" type="checkbox" id="sendEmailCheckBox" name="send_email" value="" checked>
-                                    <label for="sendEmailCheckBox" class="custom-control-label">
-                                        Send user e-mail with login details?
-                                    </label>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <div class="custom-control custom-checkbox">
-                                    <input class="custom-control-input" type="checkbox" id="forceMFACheckBox" name="force_mfa" value=1>
-                                    <label for="forceMFACheckBox" class="custom-control-label">
-                                        Force MFA
-                                    </label>
-                                </div>
-                            </div>
+            <div class="tab-pane fade show active" id="pills-user-details">
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                         </div>
+                        <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
+                    </div>
+                </div>
 
-                        <div class="tab-pane fade" id="pills-user-access">
+                <div class="form-group">
+                    <label>Email <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
+                    </div>
+                </div>
 
-                            <div class="alert alert-info">
-                                Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected.
-                            </div>
+                <div class="form-group">
+                    <label>Password <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="password" class="form-control" data-toggle="password" name="password" id="password" placeholder="Enter a Password" autocomplete="new-password" minlength="8" required>
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
+                    </div>
+                </div>
 
-                            <ul class="list-group">
-                                <li class="list-group-item bg-dark">
-                                    <div class="form-check">
-                                        <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.client-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
-                                        <label class="form-check-label ml-3"><strong>Restrict Access to Clients</strong></label>
-                                    </div>
-                                </li>
-
-                                <?php
-
-                                $sql_client_select = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                while ($row = mysqli_fetch_array($sql_client_select)) {
-                                    $client_id = intval($row['client_id']);
-                                    $client_name = nullable_htmlentities($row['client_name']);
+                <div class="form-group">
+                    <label>Role <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                        </div>
+                        <select class="form-control select2" name="role" required>
+                            <option value="">- Role -</option>
+                            <?php
+                                $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_archived_at IS NULL");
+                                while ($row = mysqli_fetch_array($sql_user_roles)) {
+                                    $role_id = intval($row['role_id']);
+                                    $role_name = nullable_htmlentities($row['role_name']);
 
                                 ?>
-                                <li class="list-group-item">
-                                    <div class="form-check">
-                                        <input type="checkbox" class="form-check-input client-checkbox" name="clients[]" value="<?php echo $client_id; ?>">
-                                        <label class="form-check-label ml-3"><?php echo $client_name; ?></label>
-                                    </div>
-                                </li>
-
-                                <?php } ?>
-
-                            </ul>
-
-                        </div>
-
+                                <option value="<?php echo $role_id; ?>"><?php echo $role_name; ?></option>
+                            <?php } ?>
+                        </select>
                     </div>
+                </div>
 
+                <div class="form-group">
+                    <label>Avatar</label>
+                    <input type="file" class="form-control-file" accept="image/*" name="file">
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_user" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group" <?php if(empty($config_smtp_host)) { echo "hidden"; } ?>>
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" id="sendEmailCheckBox" name="send_email" value="" checked>
+                        <label for="sendEmailCheckBox" class="custom-control-label">
+                            Send user e-mail with login details?
+                        </label>
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" id="forceMFACheckBox" name="force_mfa" value=1>
+                        <label for="forceMFACheckBox" class="custom-control-label">
+                            Force MFA
+                        </label>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-user-access">
+
+                <div class="alert alert-info">
+                    Check boxes to authorize user client access. No boxes grant full client access. Admin users are unaffected.
+                </div>
+
+                <ul class="list-group">
+                    <li class="list-group-item bg-dark">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.client-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
+                            <label class="form-check-label ml-3"><strong>Restrict Access to Clients</strong></label>
+                        </div>
+                    </li>
+
+                    <?php
+
+                    $sql_client_select = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                    while ($row = mysqli_fetch_array($sql_client_select)) {
+                        $client_id = intval($row['client_id']);
+                        $client_name = nullable_htmlentities($row['client_name']);
+
+                    ?>
+                    <li class="list-group-item">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input client-checkbox" name="clients[]" value="<?php echo $client_id; ?>">
+                            <label class="form-check-label ml-3"><?php echo $client_name; ?></label>
+                        </div>
+                    </li>
+
+                    <?php } ?>
+
+                </ul>
+
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_user" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<script>
+
+function generatePassword() {
+    jQuery.get(
+        "/agent/ajax.php", {
+            get_readable_pass: 'true'
+        },
+        function(data) {
+            const password = JSON.parse(data);
+            document.getElementById("password").value = password;
+        }
+    );
+}
+
+</script>
+
+<?php
+require_once "../../../includes/modal_footer.php";
diff --git a/admin/modals/user/user_all_reset_password.php b/admin/modals/user/user_all_reset_password.php
index a68dfdc5..648f73c5 100644
--- a/admin/modals/user/user_all_reset_password.php
+++ b/admin/modals/user/user_all_reset_password.php
@@ -1,31 +1,35 @@
-<div class="modal" id="resetAllUserPassModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-body">
-                <div class="mb-4" style="text-align: center;">
-                    <i class="far fas fa-10x fa-skull-crossbones text-danger mb-3 mt-3"></i>
-                    <h2>Incident Response: Agent Password Reset</h2>
-                    <br>
-                    <div class="alert alert-danger" role="alert">
-                        <b>This is a potentially destructive function.<br>It is intended to be used as part of a potential security incident.</b>
-                    </div>
-                    <h6 class="mb-4 text-secondary"><b>All ITFlow agent passwords will be reset and shown to you </b><i>(except yours - change yours first!)</i>.<br/><br/>You should communicate temporary passwords to agents out of band (e.g. via a phone call) and require they are changed ASAP.</h6>
-                    <form action="post.php" method="POST">
-                        <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                        <div class="row col-7 offset-4">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <input type="password" class="form-control" placeholder="Enter your account password to continue" name="admin_password" required>
-                                </div>
-                            </div>
-                        </div>
-                        <br>
-                        <button class="btn btn-danger" type="submit" name="ir_reset_user_password"><i class="fas fa-fw fa-key mr-2"></i>Reset passwords</button>
-                    </form>
-                </div>
-                <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
+<?php
 
-            </div>
+require_once '../../../includes/modal_header.php';
+
+ob_start();
+
+?>
+<div class="modal-body">
+    <div class="mb-4" style="text-align: center;">
+        <i class="far fas fa-10x fa-skull-crossbones text-danger mb-3 mt-3"></i>
+        <h2>Incident Response: Agent Password Reset</h2>
+        <br>
+        <div class="alert alert-danger" role="alert">
+            <b>This is a potentially destructive function.<br>It is intended to be used as part of a potential security incident.</b>
         </div>
+        <h6 class="mb-4 text-secondary"><b>All ITFlow agent passwords will be reset and shown to you </b><i>(except yours - change yours first!)</i>.<br/><br/>You should communicate temporary passwords to agents out of band (e.g. via a phone call) and require they are changed ASAP.</h6>
+        <form action="post.php" method="POST">
+            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+            <div class="row col-7 offset-4">
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <input type="password" class="form-control" placeholder="Enter your account password to continue" name="admin_password" required>
+                    </div>
+                </div>
+            </div>
+            <br>
+            <button class="btn btn-danger" type="submit" name="ir_reset_user_password"><i class="fas fa-fw fa-key mr-2"></i>Reset passwords</button>
+        </form>
     </div>
+    <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
+
 </div>
+
+<?php
+require_once "../../../includes/modal_footer.php";
diff --git a/admin/modals/user/user_edit.php b/admin/modals/user/user_edit.php
index 154dff83..6340a178 100644
--- a/admin/modals/user/user_edit.php
+++ b/admin/modals/user/user_edit.php
@@ -94,11 +94,14 @@ ob_start();
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                         </div>
-                        <input type="password" class="form-control" data-toggle="password" name="new_password"
+                        <input type="password" class="form-control" data-toggle="password" name="new_password" id="password"
                                placeholder="Leave Blank For No Password Change" autocomplete="new-password">
                         <div class="input-group-append">
                             <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                         </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
                     </div>
                 </div>
 
@@ -200,5 +203,23 @@ ob_start();
     </div>
 </form>
 
+<script>
+
+function generatePassword() {
+    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+    jQuery.get(
+        "/agent/ajax.php", {
+            get_readable_pass: 'true'
+        },
+        function(data) {
+            //If we get a response from post.php, parse it as JSON
+            const password = JSON.parse(data);
+            document.getElementById("password").value = password;
+        }
+    );
+}
+
+</script>
+
 <?php
 require_once "../../../includes/modal_footer.php";
diff --git a/admin/modals/user/user_invite.php b/admin/modals/user/user_invite.php
index ae3ccee7..96220393 100644
--- a/admin/modals/user/user_invite.php
+++ b/admin/modals/user/user_invite.php
@@ -1,45 +1,49 @@
-<div class="modal" id="userInviteModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Email <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                            </div>
-                            <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Role <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
-                            </div>
-                            <select class="form-control select2" name="role" required>
-                                <option value="">- Role -</option>
-                                <!-- //TODO: Pull from roles -->
-                            </select>
-                        </div>
-                    </div>
+ob_start();
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Email <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                </div>
+                <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Role <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
+                </div>
+                <select class="form-control select2" name="role" required>
+                    <option value="">- Role -</option>
+                    <!-- //TODO: Pull from roles -->
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../../../includes/modal_footer.php";
diff --git a/admin/payment_method.php b/admin/payment_method.php
index 6931b163..a5c0af4e 100644
--- a/admin/payment_method.php
+++ b/admin/payment_method.php
@@ -16,7 +16,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-credit-card mr-2"></i>Payment Methods</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addPaymentMethodModal"><i class="fas fa-plus mr-2"></i>Add Payment Method</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/payment_method/payment_method_add.php"><i class="fas fa-plus mr-2"></i>Add Payment Method</button>
         </div>
     </div>
     <div class="card-body">
@@ -98,5 +98,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/payment_method/payment_method_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/payment_provider.php b/admin/payment_provider.php
index 1c1073fe..50c876aa 100644
--- a/admin/payment_provider.php
+++ b/admin/payment_provider.php
@@ -21,7 +21,7 @@ $num_rows = mysqli_num_rows($sql);
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-credit-card mr-2"></i>Payment Providers</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addPaymentProviderModal"><i class="fas fa-plus mr-2"></i>Add Provider</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/payment_provider/payment_provider_add.php"><i class="fas fa-plus mr-2"></i>Add Provider</button>
         </div>
     </div>
     <div class="card-body">
@@ -135,5 +135,4 @@ $num_rows = mysqli_num_rows($sql);
 </div>
 
 <?php
-require_once "modals/payment_provider/payment_provider_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/project_template.php b/admin/project_template.php
index 700578fb..999a7075 100644
--- a/admin/project_template.php
+++ b/admin/project_template.php
@@ -22,7 +22,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-project-diagram mr-2"></i>Project Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProjectTemplateModal"><i class="fas fa-plus mr-2"></i>New Project Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/project_template/project_template_add.php"><i class="fas fa-plus mr-2"></i>New Project Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -87,7 +87,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td>
-                            <a class="text-dark" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                            <a class="text-dark ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                                 <div class="media">
                                     <i class="fa fa-fw fa-2x fa-project-diagram mr-3"></i>
                                     <div class="media-body">
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                                    <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <?php if($session_user_role == 3) { ?>
@@ -123,10 +123,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </td>
                     </tr>
 
-                    <?php
-
-                    require "modals/project_template/project_template_edit.php";
-
+                <?php
+                
                 }
 
                 ?>
@@ -134,12 +132,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "../includes/filter_footer.php";
- ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php
-require_once "modals/project_template/project_template_add.php";
-
 require_once "../includes/footer.php";
diff --git a/admin/project_template_details.php b/admin/project_template_details.php
index e8b6a2c6..57cf2c20 100644
--- a/admin/project_template_details.php
+++ b/admin/project_template_details.php
@@ -91,7 +91,7 @@ if (isset($_GET['project_template_id'])) {
 
         <div class="col-sm-2">
             <div class="btn-group float-right">
-                <button type="button" class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#addProjectTemplateTicketTemplateModal">
+                <button type="button" class="btn btn-primary btn-sm ajax-modal" href="#" data-modal-url="modals/project_template/project_template_ticket_template_add.php?project_template_id=<?= $project_template_id ?>">
                     <i class="fas fa-fw fa-plus mr-2"></i>Add Ticket Template
                 </button>
                 <div class="dropdown dropleft text-center ml-3">
@@ -99,7 +99,7 @@ if (isset($_GET['project_template_id'])) {
                         <i class="fas fa-fw fa-ellipsis-v"></i>
                     </button>
                     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editProjectTemplateModal<?php echo $project_template_id; ?>">
+                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project_template/project_template_edit.php?project_template_id=<?= $project_template_id ?>">
                             <i class="fas fa-fw fa-edit mr-2"></i>Edit Template
                         </a>
                         <?php if ($session_user_role == 3) { ?>
@@ -221,9 +221,6 @@ if (isset($_GET['project_template_id'])) {
 
 <?php
 
-require_once "modals/project_template/project_template_edit.php";
-require_once "modals/project_template/project_template_ticket_template_add.php";
-
 }
 
 require_once "../includes/footer.php";
diff --git a/admin/roles.php b/admin/roles.php
index 72ae45a7..2d937240 100644
--- a/admin/roles.php
+++ b/admin/roles.php
@@ -24,7 +24,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-user-shield mr-2"></i>Roles</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRoleModal">
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/role/role_add.php">
                         <i class="fas fa-fw fa-user-plus mr-2"></i>New Role
                     </button>
                 </div>
@@ -143,6 +143,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-
-require_once "modals/role/role_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/tax.php b/admin/tax.php
index 66df9cfb..b82c069d 100644
--- a/admin/tax.php
+++ b/admin/tax.php
@@ -17,84 +17,83 @@ $num_rows = mysqli_num_rows($sql);
 
 ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Taxes</h3>
-            <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTaxModal"><i class="fas fa-plus mr-2"></i>New Tax</button>
-            </div>
-        </div>
-        <div class="card-body">
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_name&order=<?php echo $disp; ?>">
-                                Name <?php if ($sort == 'tax_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_percent&order=<?php echo $disp; ?>">
-                                Percent <?php if ($sort == 'tax_percent') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $tax_id = intval($row['tax_id']);
-                        $tax_name = nullable_htmlentities($row['tax_name']);
-                        $tax_percent = floatval($row['tax_percent']);
-
-                        ?>
-                        <tr>
-                            <td>
-                                <a class="text-dark text-bold ajax-modal" href="#"
-                                    data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
-                                    <?php echo $tax_name; ?>
-                                </a>
-                            </td>
-                            <td><?php echo "$tax_percent%"; ?></td>
-                            <td>
-                                <div class="dropdown dropleft text-center">
-                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                        <i class="fas fa-ellipsis-h"></i>
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#"
-                                            data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger confirm-link" href="post.php?archive_tax=<?php echo $tax_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                            <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                        </a>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    if ($num_rows == 0) {
-                        echo "<h3 class='text-secondary mt-3' style='text-align: center'>No Records Here</h3>";
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-
-            </div>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-balance-scale mr-2"></i>Taxes</h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/tax/tax_add.php"><i class="fas fa-plus mr-2"></i>New Tax</button>
         </div>
     </div>
+    <div class="card-body">
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_name&order=<?php echo $disp; ?>">
+                            Name <?php if ($sort == 'tax_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=tax_percent&order=<?php echo $disp; ?>">
+                            Percent <?php if ($sort == 'tax_percent') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $tax_id = intval($row['tax_id']);
+                    $tax_name = nullable_htmlentities($row['tax_name']);
+                    $tax_percent = floatval($row['tax_percent']);
+
+                    ?>
+                    <tr>
+                        <td>
+                            <a class="text-dark text-bold ajax-modal" href="#"
+                                data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
+                                <?php echo $tax_name; ?>
+                            </a>
+                        </td>
+                        <td><?php echo "$tax_percent%"; ?></td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/tax/tax_edit.php?id=<?= $tax_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_tax=<?php echo $tax_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                    </a>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                if ($num_rows == 0) {
+                    echo "<h3 class='text-secondary mt-3' style='text-align: center'>No Records Here</h3>";
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+
+        </div>
+    </div>
+</div>
 
 <?php
-require_once "modals/tax/tax_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/ticket_status.php b/admin/ticket_status.php
index 6fb2d9fb..5ebba399 100644
--- a/admin/ticket_status.php
+++ b/admin/ticket_status.php
@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-info-circle mr-2"></i>Tickets Statuses</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketStatusModal"><i class="fas fa-plus mr-2"></i>New Ticket Status</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/ticket_status/ticket_status_add.php"><i class="fas fa-plus mr-2"></i>New Ticket Status</button>
         </div>
     </div>
 
@@ -120,13 +120,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "../includes/filter_footer.php";
-?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php
-require_once "modals/ticket_status/ticket_status_add.php";
-
 require_once "../includes/footer.php";
-
diff --git a/admin/users.php b/admin/users.php
index 08feccfa..58a69210 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -26,16 +26,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-users mr-2"></i>Users</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addUserModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/user/user_add.php">
                     <i class="fas fa-fw fa-user-plus mr-2"></i>New User
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <!--<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#userInviteModal"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
+                    <!--<a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/user/user_invite.php"><i class="fas fa-paper-plane mr-2"></i>Invite User</a>-->
                     <?php if ($num_rows[0] > 1) { ?>
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportUserModal"><i class="fa fa-fw fa-download mr-2"></i>Export</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#resetAllUserPassModal"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
+                        <a class="dropdown-item text-danger ajax-modal" href="#" data-modal-url="modals/user/user_all_reset_password.php" data-modal-size="lg"><i class="fas fa-skull-crossbones mr-2"></i>IR</a>
                     <?php } ?>
                 </div>
             </div>
@@ -233,15 +233,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
  ?>
     </div>
 </div>
-<script>
-    function generatePassword() {
-        document.getElementById("password").value = "<?php echo randomString() ?>"
-    }
-</script>
 
 <?php
-require_once "modals/user/user_add.php";
-require_once "modals/user/user_invite.php";
 require_once "modals/user/user_export.php";
-require_once "modals/user/user_all_reset_password.php";
-require_once "../includes/footer.php";
\ No newline at end of file
+require_once "../includes/footer.php";
diff --git a/agent/ajax.php b/agent/ajax.php
index 1200757b..3d8331ae 100644
--- a/agent/ajax.php
+++ b/agent/ajax.php
@@ -432,7 +432,7 @@ if (isset($_GET['get_totp_token_via_id'])) {
 }
 
 if (isset($_GET['get_readable_pass'])) {
-    echo json_encode(GenerateReadablePassword(4));
+    echo json_encode(GenerateReadablePassword(1));
 }
 
 /*
diff --git a/agent/modals/contact/contact_add.php b/agent/modals/contact/contact_add.php
index 6c503027..69db0a7e 100644
--- a/agent/modals/contact/contact_add.php
+++ b/agent/modals/contact/contact_add.php
@@ -219,12 +219,12 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                 </div>
-                                <input type="password" class="form-control" data-toggle="password" id="password-add" name="contact_password" placeholder="Password" autocomplete="new-password">
+                                <input type="password" class="form-control" data-toggle="password" id="password" name="contact_password" placeholder="Password" autocomplete="new-password">
                                 <div class="input-group-append">
                                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                 </div>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-default" onclick="generatePassword('add')">
+                                    <button type="button" class="btn btn-default" onclick="generatePassword()">
                                         <i class="fa fa-fw fa-question"></i>
                                     </button>
                                 </div>
@@ -313,22 +313,14 @@ ob_start();
 <!-- JavaScript to Show/Hide Password Form Group -->
 <script>
 
-function generatePassword(type, id) {
-    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+function generatePassword() {
     jQuery.get(
         "ajax.php", {
             get_readable_pass: 'true'
         },
         function(data) {
-            //If we get a response from post.php, parse it as JSON
             const password = JSON.parse(data);
-
-            // Set the password value to the correct modal, based on the type
-            if (type == "add") {
-                document.getElementById("password-add").value = password;
-            } else if (type == "edit") {
-                document.getElementById("password-edit-"+id.toString()).value = password;
-            }
+            document.getElementById("password").value = password;
         }
     );
 }
diff --git a/agent/modals/contact/contact_edit.php b/agent/modals/contact/contact_edit.php
index 7ee72dbd..d258ace5 100644
--- a/agent/modals/contact/contact_edit.php
+++ b/agent/modals/contact/contact_edit.php
@@ -223,12 +223,12 @@ ob_start();
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                 </div>
-                                <input type="password" class="form-control" data-toggle="password" id="password-edit-<?php echo $contact_id; ?>" name="contact_password" placeholder="Password" autocomplete="new-password">
+                                <input type="password" class="form-control" data-toggle="password" id="password" name="contact_password" placeholder="Password" autocomplete="new-password">
                                 <div class="input-group-append">
                                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                 </div>
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-default" onclick="generatePassword('edit', <?php echo $contact_id; ?>)">
+                                    <button type="button" class="btn btn-default" onclick="generatePassword()">
                                         <i class="fa fa-fw fa-question"></i>
                                     </button>
                                 </div>
@@ -346,22 +346,14 @@ ob_start();
 <!-- JavaScript to Show/Hide Password Form Group -->
 <script>
 
-function generatePassword(type, id) {
-    // Send a GET request to ajax.php as ajax.php?get_readable_pass=true
+function generatePassword() {
     jQuery.get(
         "ajax.php", {
             get_readable_pass: 'true'
         },
         function(data) {
-            //If we get a response from post.php, parse it as JSON
             const password = JSON.parse(data);
-
-            // Set the password value to the correct modal, based on the type
-            if (type == "add") {
-                document.getElementById("password-add").value = password;
-            } else if (type == "edit") {
-                document.getElementById("password-edit-"+id.toString()).value = password;
-            }
+            document.getElementById("password").value = password;
         }
     );
 }