diff --git a/admin_category.php b/admin_category.php
index d5de8015..d27228f5 100644
--- a/admin_category.php
+++ b/admin_category.php
@@ -33,7 +33,6 @@ if (isset($_GET['archived'])) {
 
 ?>
 
-
 <div class="card card-dark">
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i>
@@ -134,10 +133,15 @@ if (isset($_GET['archived'])) {
 
                         ?>
                         <tr>
-                            <td><a class="text-dark" href="#" data-toggle="modal"
-                                    data-target="#editCategoryModal<?php echo $category_id; ?>">
+                            <td>
+                                <a class="text-dark" href="#" 
+                                    data-toggle="ajax-modal"
+                                    data-ajax-url="ajax/ajax_category_edit.php"
+                                    data-ajax-id="<?php echo $category_id; ?>"
+                                    >
                                     <?php echo $category_name; ?>
-                                </a></td>
+                                </a>
+                            </td>
                             <td><i class="fa fa-3x fa-circle" style="color:<?php echo $category_color; ?>;"></i></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
@@ -159,8 +163,11 @@ if (isset($_GET['archived'])) {
                                             <?php
                                         } else {
                                             ?>
-                                            <a class="dropdown-item" href="#" data-toggle="modal"
-                                                data-target="#editCategoryModal<?php echo $category_id; ?>">
+                                            <a class="dropdown-item" href="#"
+                                                data-toggle="ajax-modal"
+                                                data-ajax-url="ajax/ajax_category_edit.php"
+                                                data-ajax-id="<?php echo $category_id; ?>"
+                                                >
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                             </a>
                                             <a class="dropdown-item text-danger confirm-link"
@@ -177,8 +184,6 @@ if (isset($_GET['archived'])) {
 
                         <?php
 
-                        require "modals/admin_category_edit_modal.php";
-
                     }
 
                     ?>
@@ -193,5 +198,4 @@ if (isset($_GET['archived'])) {
 
 <?php
 require_once "modals/admin_category_add_modal.php";
-
 require_once "includes/footer.php";
diff --git a/admin_role.php b/admin_role.php
index d59c2c4e..f79def74 100644
--- a/admin_role.php
+++ b/admin_role.php
@@ -114,7 +114,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         </button>
                                         <div class="dropdown-menu">
 
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRoleModal<?php echo $role_id; ?>">
+                                            <a class="dropdown-item" href="#"
+                                                data-toggle="ajax-modal"
+                                                data-ajax-url="ajax/ajax_role_edit.php"
+                                                data-ajax-id="<?php echo $role_id; ?>"
+                                                >
                                                 <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
                                             </a>
 
@@ -133,9 +137,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "modals/admin_role_edit_modal.php";
-
-
                     }
 
                     ?>
@@ -151,6 +152,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/admin_role_add_modal.php";
-
 require_once "includes/footer.php";
-
diff --git a/admin_tag.php b/admin_tag.php
index e2382ae4..64ec7193 100644
--- a/admin_tag.php
+++ b/admin_tag.php
@@ -87,7 +87,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         ?>
                         <tr>
                             <td>
-                                <a href="#" data-toggle="modal" data-target="#editTagModal<?php echo $tag_id; ?>">
+                                <a href="#"
+                                    data-toggle="ajax-modal"
+                                    data-ajax-url="ajax/ajax_tag_edit.php"
+                                    data-ajax-id="<?php echo $tag_id; ?>"
+                                    >
                                     <span class='badge text-light p-2 mr-1' style="background-color: <?php echo $tag_color; ?>"><i class="fa fa-fw fa-<?php echo $tag_icon; ?> mr-2"></i><?php echo $tag_name; ?></span>
                                 </a>
                             </td>
@@ -98,7 +102,11 @@ $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="#editTagModal<?php echo $tag_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_tag_edit.php"
+                                            data-ajax-id="<?php echo $tag_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -112,9 +120,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-                        require "modals/admin_tag_edit_modal.php";
-
-
                     }
 
                     ?>
diff --git a/admin_user.php b/admin_user.php
index e950bcd6..dace2d78 100644
--- a/admin_user.php
+++ b/admin_user.php
@@ -153,7 +153,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
                     <tr>
                         <td class="text-center">
-                            <a class="text-dark" href="#" <?php if ($user_id !== $session_user_id) {   // Prevent modifying self ?> data-toggle="modal" data-target="#editUserModal<?php echo $user_id; ?>" <?php } ?>>
+                            <a class="text-dark" href="#" 
+                                <?php if ($user_id !== $session_user_id) { // Prevent modifying self ?>
+                                data-toggle="ajax-modal"
+                                data-ajax-url="ajax/ajax_user_edit.php"
+                                data-ajax-id="<?php echo $user_id; ?>"
+                                <?php } ?>
+                                >
                                 <?php if (!empty($user_avatar)) { ?>
                                     <img class="img-size-50 img-circle" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
                                 <?php } else { ?>
@@ -179,7 +185,11 @@ $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="#editUserModal<?php echo $user_id; ?>">
+                                    <a class="dropdown-item" href="#"
+                                        data-toggle="ajax-modal"
+                                        data-ajax-url="ajax/ajax_user_edit.php"
+                                        data-ajax-id="<?php echo $user_id; ?>"
+                                        >
                                         <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
                                     </a>
                                     <?php if ($remember_token_count > 0) { ?>
@@ -207,11 +217,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "modals/admin_user_edit_modal.php";
-
                     require "modals/admin_user_archive_modal.php";
 
-
                 }
 
                 ?>
@@ -230,14 +237,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </script>
 
 <?php
-
 require_once "modals/admin_user_add_modal.php";
-
 require_once "modals/admin_user_invite_modal.php";
-
 require_once "modals/admin_user_export_modal.php";
-
 require_once "modals/admin_user_all_reset_password_modal.php";
-
 require_once "includes/footer.php";
-
diff --git a/ajax/ajax_category_edit.php b/ajax/ajax_category_edit.php
new file mode 100644
index 00000000..a3ce233a
--- /dev/null
+++ b/ajax/ajax_category_edit.php
@@ -0,0 +1,56 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$category_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_id = $category_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$category_name = nullable_htmlentities($row['category_name']);
+$category_color = nullable_htmlentities($row['category_color']);
+$category_type = nullable_htmlentities($row['category_type']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>Editing category: <strong><?php echo $category_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="category_id" value="<?php echo $category_id; ?>">
+    <input type="hidden" name="type" value="<?php echo $category_type; ?>">
+    <div class="modal-body bg-white">
+
+        <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" maxlength="200" value="<?php echo $category_name; ?>" required>
+            </div>
+        </div>
+
+        <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" value="<?php echo $category_color; ?>" required>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_category" class="btn btn-primary text-bold"><i class="fa 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/ajax_footer.php";
diff --git a/ajax/ajax_role_edit.php b/ajax/ajax_role_edit.php
new file mode 100644
index 00000000..f0f2d237
--- /dev/null
+++ b/ajax/ajax_role_edit.php
@@ -0,0 +1,153 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$role_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE user_role_id = $role_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$role_name = nullable_htmlentities($row['user_role_name']);
+$role_description = nullable_htmlentities($row['user_role_description']);
+$role_admin = intval($row['user_role_is_admin']);
+
+// Count number of users that have each role
+$sql_role_user_count = mysqli_query($mysqli, "SELECT COUNT(users.user_id) FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL");
+$role_user_count = mysqli_fetch_row($sql_role_user_count)[0];
+
+$sql_users = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN user_settings on users.user_id = user_settings.user_id WHERE user_role = $role_id AND user_archived_at IS NULL");
+// Initialize an empty array to hold user names
+$user_names = [];
+
+// Fetch each row and store the user_name in the array
+while($row = mysqli_fetch_assoc($sql_users)) {
+    $user_names[] = nullable_htmlentities($row['user_name']);
+}
+
+// Convert the array of user names to a comma-separated string
+$user_names_string = implode(",", $user_names) ;
+
+if (empty($user_names_string)) {
+    $user_names_string = "-";
+}
+
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Editing role:
+        <strong><?php echo $role_name; ?></strong></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'] ?>">
+    <input type="hidden" name="role_id" value="<?php echo $role_id; ?>">
+    <div class="modal-body bg-white">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-role-details<?php echo $role_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-role-access<?php echo $role_id; ?>">Access</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-role-details<?php echo $role_id; ?>">
+
+                <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" value="<?php echo $role_name; ?>" 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" value="<?php echo $role_description; ?>" 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="1" <?php if ($role_admin) { echo 'selected'; } ?> >Yes - this role should have full admin access</option>
+                            <option value="0" <?php if (!$role_admin) { echo 'selected'; } ?>>No - use permissions on the next tab</option>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-role-access<?php echo $role_id; ?>">
+
+                <?php if ($role_admin) { ?>
+                    <div class="alert alert-warning"><strong>Module permissions do not apply to Admins.</strong></div>
+                <?php } ?>
+
+                <?php
+
+                // Enumerate modules
+                $sql_modules = mysqli_query($mysqli, "SELECT * FROM modules");
+                while ($row_modules = mysqli_fetch_array($sql_modules)) {
+                    $module_id = intval($row_modules['module_id']);
+                    $module_name = nullable_htmlentities($row_modules['module_name']);
+                    $module_name_display = ucfirst(str_replace("module_","",$module_name));
+                    $module_description = nullable_htmlentities($row_modules['module_description']);
+
+                    // Get permission level for module
+                    $module_permission_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT user_role_permission_level FROM user_role_permissions WHERE module_id = $module_id AND user_role_id = $role_id LIMIT 1"));
+                    $module_permission = 0;
+                    if ($module_permission_row) {
+                        $module_permission = $module_permission_row['user_role_permission_level'];
+                    }
+                    ?>
+
+                    <div class="form-group">
+                        <label> <?php echo $module_name_display ?> <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <select class="form-control select2" name="<?php echo "$module_id##$module_name" ?>" required>
+                                <option value="0" <?php if ($module_permission == 0) { echo 'selected'; } ?> >None</option>
+                                <option value="1" <?php if ($module_permission == 1) { echo 'selected'; } ?> >Read</option>
+                                <option value="2" <?php if ($module_permission == 2) { echo 'selected'; } ?>>Modify (Read, Edit, Archive)</option>
+                                <option value="3" <?php if ($module_permission == 3) { echo 'selected'; } ?>>Full (Read, Edit, Archive, Delete)</option>
+                            </select>
+                        </div>
+                        <small class="form-text text-muted"><?php echo $module_description ?></small>
+
+                    </div>
+
+                <?php } // End while ?>
+
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_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/ajax_footer.php";
diff --git a/ajax/ajax_tag_edit.php b/ajax/ajax_tag_edit.php
new file mode 100644
index 00000000..d2425a89
--- /dev/null
+++ b/ajax/ajax_tag_edit.php
@@ -0,0 +1,82 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$tag_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_id = $tag_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$tag_name = nullable_htmlentities($row['tag_name']);
+$tag_type = intval($row['tag_type']);
+$tag_color = nullable_htmlentities($row['tag_color']);
+$tag_icon = nullable_htmlentities($row['tag_icon']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>Editing tag: <strong><?php echo $tag_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="tag_id" value="<?php echo $tag_id; ?>">
+    <div class="modal-body bg-white">
+
+        <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-tag"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $tag_name; ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Type <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"></i></span>
+                </div>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Type -</option>
+                    <option value="1" <?php if ($tag_type == 1) { echo "selected"; } ?>>Client Tag</option>
+                    <option value="2" <?php if ($tag_type == 2) { echo "selected"; } ?>>Location Tag</option>
+                    <option value="3" <?php if ($tag_type == 3) { echo "selected"; } ?>>Contact Tag</option>
+                    <option value="4" <?php if ($tag_type == 4) { echo "selected"; } ?>>Credential Tag</option>
+                </select>
+            </div>
+        </div>
+
+        <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" value="<?php echo $tag_color; ?>" required>
+            </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" value="<?php echo $tag_icon; ?>">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_tag" 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/ajax_footer.php";
diff --git a/ajax/ajax_user_edit.php b/ajax/ajax_user_edit.php
new file mode 100644
index 00000000..f592d71b
--- /dev/null
+++ b/ajax/ajax_user_edit.php
@@ -0,0 +1,201 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$user_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM users, user_settings WHERE users.user_id = user_settings.user_id AND users.user_id = $user_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$user_name = nullable_htmlentities($row['user_name']);
+$user_email = nullable_htmlentities($row['user_email']);
+$user_avatar = nullable_htmlentities($row['user_avatar']);
+$user_token = nullable_htmlentities($row['user_token']);
+$user_config_force_mfa = intval($row['user_config_force_mfa']);
+$user_role = intval($row['user_role']);
+$user_initials = nullable_htmlentities(initials($user_name));
+
+// Get User Client Access Permissions
+$user_client_access_sql = mysqli_query($mysqli,"SELECT client_id FROM user_permissions WHERE user_id = $user_id");
+$client_access_array = [];
+while ($row = mysqli_fetch_assoc($user_client_access_sql)) {
+    $client_access_array[] = intval($row['client_id']);
+}
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-edit mr-2"></i>Editing user:
+        <strong><?php echo $user_name; ?></strong></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'] ?>">
+    <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
+    <div class="modal-body bg-white">
+
+        <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<?php echo $user_id; ?>">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-user-access<?php echo $user_id; ?>">Restrict Access</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-user-details<?php echo $user_id; ?>">
+
+                <center class="mb-3">
+                    <?php if (!empty($user_avatar)) { ?>
+                        <img class="img-fluid" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
+                    <?php } else { ?>
+                        <span class="fa-stack fa-4x">
+                            <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                            <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
+                        </span>
+                    <?php } ?>
+                </center>
+
+                <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"
+                               value="<?php echo $user_name; ?>" required>
+                    </div>
+                </div>
+
+                <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"
+                               value="<?php echo $user_email; ?>" required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>New Password</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="new_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>
+                </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>
+                            <?php
+                            $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE user_role_archived_at IS NULL");
+                            while ($row = mysqli_fetch_array($sql_user_roles)) {
+                                $user_role_id = intval($row['user_role_id']);
+                                $user_role_name = nullable_htmlentities($row['user_role_name']);
+
+                                ?>
+                                <option <?php if ($user_role == $user_role_id) {echo "selected";} ?> value="<?php echo $user_role_id; ?>"><?php echo $user_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">
+                    <div class="custom-control custom-checkbox">
+                        <input class="custom-control-input" type="checkbox" id="forceMFACheckBox<?php echo $user_id; ?>" name="force_mfa" value="1" <?php if($user_config_force_mfa == 1){ echo "checked"; } ?>>
+                        <label for="forceMFACheckBox<?php echo $user_id; ?>" class="custom-control-label">
+                            Force MFA
+                        </label>
+                    </div>
+                </div>
+
+                <?php if (!empty($user_token)) { ?>
+
+                    <div class="form-group">
+                        <label>2FA</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-id-card"></i></span>
+                            </div>
+                            <select class="form-control" name="2fa">
+                                <option value="">Keep enabled</option>
+                                <option value="disable">Disable</option>
+                            </select>
+                        </div>
+                    </div>
+
+                <?php } ?>
+            </div>
+
+            <div class="tab-pane fade" id="pills-user-access<?php echo $user_id; ?>">
+
+                <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_select = intval($row['client_id']);
+                        $client_name_select = 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_select; ?>" <?php if (in_array($client_id_select, $client_access_array)) { echo "checked"; } ?>>
+                            <label class="form-check-label ml-2"><?php echo $client_name_select; ?></label>
+                        </div>
+                    </li>
+
+                    <?php } ?>
+
+                </ul>
+
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_user" 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/ajax_footer.php";
diff --git a/modals/admin_category_edit_modal.php b/modals/admin_category_edit_modal.php
deleted file mode 100644
index 45dc29eb..00000000
--- a/modals/admin_category_edit_modal.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="modal" id="editCategoryModal<?php echo $category_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>Editing category: <strong><?php echo $category_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="category_id" value="<?php echo $category_id; ?>">
-                <input type="hidden" name="type" value="<?php echo nullable_htmlentities($category); ?>">
-                <div class="modal-body bg-white">
-
-                    <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" maxlength="200" value="<?php echo $category_name; ?>" required>
-                        </div>
-                    </div>
-
-                    <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" value="<?php echo $category_color; ?>" required>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_category" class="btn btn-primary text-bold"><i class="fa 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>
-        </div>
-    </div>
-</div>
diff --git a/modals/admin_role_edit_modal.php b/modals/admin_role_edit_modal.php
deleted file mode 100644
index 500d013a..00000000
--- a/modals/admin_role_edit_modal.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<div class="modal" id="editRoleModal<?php echo $role_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Editing role:
-                    <strong><?php echo $role_name; ?></strong></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'] ?>">
-                <input type="hidden" name="role_id" value="<?php echo $role_id; ?>">
-                <div class="modal-body bg-white">
-
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-role-details<?php echo $role_id; ?>">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-role-access<?php echo $role_id; ?>">Access</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-role-details<?php echo $role_id; ?>">
-
-                            <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" value="<?php echo $role_name; ?>" 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" value="<?php echo $role_description; ?>" 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="1" <?php if ($role_admin) { echo 'selected'; } ?> >Yes - this role should have full admin access</option>
-                                        <option value="0" <?php if (!$role_admin) { echo 'selected'; } ?>>No - use permissions on the next tab</option>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-role-access<?php echo $role_id; ?>">
-
-                            <?php if ($role_admin) { ?>
-                                <div class="alert alert-warning"><strong>Module permissions do not apply to Admins.</strong></div>
-                            <?php } ?>
-
-                            <?php
-
-                            // Enumerate modules
-                            $sql_modules = mysqli_query($mysqli, "SELECT * FROM modules");
-                            while ($row_modules = mysqli_fetch_array($sql_modules)) {
-                                $module_id = intval($row_modules['module_id']);
-                                $module_name = nullable_htmlentities($row_modules['module_name']);
-                                $module_name_display = ucfirst(str_replace("module_","",$module_name));
-                                $module_description = nullable_htmlentities($row_modules['module_description']);
-
-                                // Get permission level for module
-                                $module_permission_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT user_role_permission_level FROM user_role_permissions WHERE module_id = $module_id AND user_role_id = $role_id LIMIT 1"));
-                                $module_permission = 0;
-                                if ($module_permission_row) {
-                                    $module_permission = $module_permission_row['user_role_permission_level'];
-                                }
-                                ?>
-
-                                <div class="form-group">
-                                    <label> <?php echo $module_name_display ?> <strong class="text-danger">*</strong></label>
-                                    <div class="input-group">
-                                        <select class="form-control select2" name="<?php echo "$module_id##$module_name" ?>" required>
-                                            <option value="0" <?php if ($module_permission == 0) { echo 'selected'; } ?> >None</option>
-                                            <option value="1" <?php if ($module_permission == 1) { echo 'selected'; } ?> >Read</option>
-                                            <option value="2" <?php if ($module_permission == 2) { echo 'selected'; } ?>>Modify (Read, Edit, Archive)</option>
-                                            <option value="3" <?php if ($module_permission == 3) { echo 'selected'; } ?>>Full (Read, Edit, Archive, Delete)</option>
-                                        </select>
-                                    </div>
-                                    <small class="form-text text-muted"><?php echo $module_description ?></small>
-
-                                </div>
-
-                            <?php } // End while ?>
-
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_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>
diff --git a/modals/admin_tag_edit_modal.php b/modals/admin_tag_edit_modal.php
deleted file mode 100644
index 17bfbe63..00000000
--- a/modals/admin_tag_edit_modal.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="modal" id="editTagModal<?php echo $tag_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>Editing tag: <strong><?php echo $tag_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="tag_id" value="<?php echo $tag_id; ?>">
-        <div class="modal-body bg-white">
-          
-          <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-tag"></i></span>
-              </div>
-              <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $tag_name; ?>" required>
-            </div>
-          </div>
-
-          <div class="form-group">
-            <label>Type <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"></i></span>
-              </div>
-              <select class="form-control select2" name="type" required>
-                <option value="">- Type -</option>
-                <option value="1" <?php if ($tag_type == 1) { echo "selected"; } ?>>Client Tag</option>
-                <option value="2" <?php if ($tag_type == 2) { echo "selected"; } ?>>Location Tag</option>
-                <option value="3" <?php if ($tag_type == 3) { echo "selected"; } ?>>Contact Tag</option>
-                <option value="4" <?php if ($tag_type == 4) { echo "selected"; } ?>>Credential Tag</option>
-              </select>
-            </div>
-          </div>
-          
-          <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" value="<?php echo $tag_color; ?>" required>
-            </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" value="<?php echo $tag_icon; ?>">
-            </div>
-          </div>
-        
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="submit" name="edit_tag" 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>
\ No newline at end of file
diff --git a/modals/admin_user_edit_modal.php b/modals/admin_user_edit_modal.php
deleted file mode 100644
index 11aa7e1b..00000000
--- a/modals/admin_user_edit_modal.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<div class="modal" id="editUserModal<?php echo $user_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-user-edit mr-2"></i>Editing user:
-                    <strong><?php echo $user_name; ?></strong></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'] ?>">
-                <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
-                <div class="modal-body bg-white">
-
-                    <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<?php echo $user_id; ?>">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-user-access<?php echo $user_id; ?>">Restrict Access</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-user-details<?php echo $user_id; ?>">
-
-                            <center class="mb-3">
-                                <?php if (!empty($user_avatar)) { ?>
-                                    <img class="img-fluid" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
-                                <?php } else { ?>
-                                    <span class="fa-stack fa-4x">
-                                        <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                                        <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
-                                    </span>
-                                <?php } ?>
-                            </center>
-
-                            <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"
-                                           value="<?php echo $user_name; ?>" required>
-                                </div>
-                            </div>
-
-                            <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"
-                                           value="<?php echo $user_email; ?>" required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>New Password</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="new_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>
-                            </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>
-                                        <?php
-                                        $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE user_role_archived_at IS NULL");
-                                        while ($row = mysqli_fetch_array($sql_user_roles)) {
-                                            $user_role_id = intval($row['user_role_id']);
-                                            $user_role_name = nullable_htmlentities($row['user_role_name']);
-
-                                            ?>
-                                            <option <?php if ($user_role == $user_role_id) {echo "selected";} ?> value="<?php echo $user_role_id; ?>"><?php echo $user_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">
-                                <div class="custom-control custom-checkbox">
-                                    <input class="custom-control-input" type="checkbox" id="forceMFACheckBox<?php echo $user_id; ?>" name="force_mfa" value="1" <?php if($user_config_force_mfa == 1){ echo "checked"; } ?>>
-                                    <label for="forceMFACheckBox<?php echo $user_id; ?>" class="custom-control-label">
-                                        Force MFA
-                                    </label>
-                                </div>
-                            </div>
-
-                            <?php if (!empty($user_token)) { ?>
-
-                                <div class="form-group">
-                                    <label>2FA</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-id-card"></i></span>
-                                        </div>
-                                        <select class="form-control" name="2fa">
-                                            <option value="">Keep enabled</option>
-                                            <option value="disable">Disable</option>
-                                        </select>
-                                    </div>
-                                </div>
-
-                            <?php } ?>
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-user-access<?php echo $user_id; ?>">
-
-                            <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_select = intval($row['client_id']);
-                                    $client_name_select = 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_select; ?>" <?php if (in_array($client_id_select, $client_access_array)) { echo "checked"; } ?>>
-                                        <label class="form-check-label ml-2"><?php echo $client_name_select; ?></label>
-                                    </div>
-                                </li>
-
-                                <?php } ?>
-
-                            </ul>
-
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_user" 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>