diff --git a/agent/assets.php b/agent/assets.php
index c9e10443..c03d4eb4 100644
--- a/agent/assets.php
+++ b/agent/assets.php
@@ -303,27 +303,40 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url) { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_contact.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user mr-2"></i>Assign Contact
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_location.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
                                 </a>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignPhysicalLocationModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_assign_physical_location.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_edit_status.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-info mr-2"></i>Set Status
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_add_ticket.php"
+                                    data-modal-size="lg"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkTransferAssetClientModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/asset/asset_bulk_transfer_client.php?<?= $client_url ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer to Client
                                 </a>
                                 <?php if ($archived) { ?>
@@ -692,16 +705,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php
-            if ($client_url) {
-                require_once "modals/asset/asset_bulk_assign_contact.php";  
-                require_once "modals/asset/asset_bulk_assign_location.php";
-            }
-            ?>
-            <?php require_once "modals/asset/asset_bulk_assign_physical_location.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_transfer_client.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_edit_status.php"; ?>
-            <?php require_once "modals/asset/asset_bulk_add_ticket.php"; ?>
         </form>
         <?php require_once "../includes/filter_footer.php"; ?>
     </div>
diff --git a/agent/credentials.php b/agent/credentials.php
index a26820aa..82777be5 100644
--- a/agent/credentials.php
+++ b/agent/credentials.php
@@ -241,7 +241,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-fw fa-trash mr-2"></i>Delete
                                 </button>
                                 <?php } else { ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/credential/credential_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                     <div class="dropdown-divider"></div>
@@ -519,10 +521,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/credential/credential_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
-        ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
diff --git a/agent/documents.php b/agent/documents.php
index dd8b9355..3a4050f4 100644
--- a/agent/documents.php
+++ b/agent/documents.php
@@ -130,7 +130,9 @@ while ($folder_id > 0) {
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveDocumentModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/document/document_bulk_move.php?client_id=<?= $client_id ?>"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                 </a>
                                 <div class="dropdown-divider"></div>
@@ -465,10 +467,8 @@ while ($folder_id > 0) {
                         </table>
                         <br>
                     </div>
-                    <?php require_once "modals/document/document_bulk_move.php"; ?>
                 </form>
-                <?php require_once "../includes/filter_footer.php";
-?>
+                <?php require_once "../includes/filter_footer.php"; ?>
             </div>
         </div>
     </div>
diff --git a/agent/files.php b/agent/files.php
index 9bf77b44..2a6de5d9 100644
--- a/agent/files.php
+++ b/agent/files.php
@@ -257,7 +257,9 @@ while ($folder_id > 0) {
                                         <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMoveFilesModal">
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/file/file_bulk_move.php?client_id=<?= $client_id ?>"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-exchange-alt mr-2"></i>Move
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -581,13 +583,11 @@ while ($folder_id > 0) {
 
                         </table>
                     </div>
-                    <?php require_once "modals/file/file_bulk_move.php"; ?>
                 </form>
 
                 <?php } ?>
 
-                <?php require_once "../includes/filter_footer.php";
- ?>
+                <?php require_once "../includes/filter_footer.php"; ?>
 
             </div>
         </div>
diff --git a/agent/invoices.php b/agent/invoices.php
index 128544b9..b547b47d 100644
--- a/agent/invoices.php
+++ b/agent/invoices.php
@@ -218,12 +218,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </button>
                             <div class="dropdown-menu">
                                 <?php if ($client_url && $balance > 0) { ?> 
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addBulkPaymentModal">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/payment/payment_bulk_add.php?<?= $client_url ?>">
                                         <i class="fa fa-credit-card mr-2"></i>Batch Payment
                                     </a>
                                     <div class="dropdown-divider"></div>
                                 <?php } ?>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/invoice/invoice_bulk_edit_category.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-list-ul mr-2"></i>Set Category
                                 </a>
                             </div>
@@ -246,7 +249,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </div>
         </form>
         <hr>
-        <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+        <form id="bulkActions" action="post.php" method="post">
             <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
             <div class="table-responsive-sm">
                 <table class="table table-striped table-borderless table-hover">
@@ -437,16 +440,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/invoice/invoice_bulk_edit_category.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
-?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
 require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";
diff --git a/agent/locations.php b/agent/locations.php
index 532c6d4f..1fd9a5d5 100644
--- a/agent/locations.php
+++ b/agent/locations.php
@@ -180,7 +180,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                             </button>
                             <div class="dropdown-menu">
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTagsModal">
+                                <a class="dropdown-item ajax-modal" href="#"
+                                    data-modal-url="modals/location/location_bulk_assign_tags.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-tags mr-2"></i>Assign Tags
                                 </a>
                                 <?php if ($archived) { ?>
@@ -393,10 +395,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "modals/location/location_bulk_assign_tags.php"; ?>
         </form>
-        <?php require_once "../includes/filter_footer.php";
- ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
diff --git a/agent/modals/asset/asset_bulk_add_ticket.php b/agent/modals/asset/asset_bulk_add_ticket.php
index aa4b7042..876b725d 100644
--- a/agent/modals/asset/asset_bulk_add_ticket.php
+++ b/agent/modals/asset/asset_bulk_add_ticket.php
@@ -1,134 +1,147 @@
-<div class="modal" id="bulkAddTicketModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <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>Creating Tickets for Assets</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Subject <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="bulk_subject" placeholder="Asset Name will be prepended to Subject" maxlength="200">
-                    </div>
-                </div>
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
-                </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                <div class="row">
-                                
-                    <div class="col">
-                        <div class="form-group">
-                            <label>Priority <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-thermometer-half"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_priority">
-                                    <option>Low</option>
-                                    <option>Medium</option>
-                                    <option>High</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
+$count = count($selected_ids);
 
-                    <div class="col">
-                        <div class="form-group">
-                            <label>Category</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
-                                </div>
-                                <select class="form-control select2" name="bulk_category">
-                                    <option value="0">- Not Categorized -</option>
-                                    <?php
-                                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_categories)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
+ob_start();
 
-                                        ?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                                    <?php } ?>
+?>
 
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="form-group">
-                    <label>Assign to</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_assigned_to">
-                            <option value="0">Not Assigned</option>
-                            <?php
-
-                            $sql = mysqli_query(
-                                $mysqli,
-                                "SELECT user_id, user_name FROM users
-                                WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                            );
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $user_id = intval($row['user_id']);
-                                $user_name = nullable_htmlentities($row['user_name']); ?>
-                                <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Project</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>
-                        <select class="form-control select2" name="bulk_project">
-                            <option value="0">- None -</option>
-                            <?php
-
-                            $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
-                            while ($row = mysqli_fetch_array($sql_projects)) {
-                                $project_id_select = intval($row['project_id']);
-                                $project_name_select = nullable_htmlentities($row['project_name']); ?>
-                                <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <?php if ($config_module_enable_accounting) { ?>
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
-                        <label class="custom-control-label" for="billableSwitch">Billable</label>
-                    </div>
-                </div>
-                <?php } ?>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_add_asset_ticket" 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>
-            
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets for <strong><?= $count ?></strong> Assets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Subject <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="bulk_subject" placeholder="Asset Name will be prepended to Subject" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymceTicket" id="textInput" name="bulk_details"></textarea>
+        </div>
+
+        <div class="row">
+                        
+            <div class="col">
+                <div class="form-group">
+                    <label>Priority <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-thermometer-half"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_priority" required>
+                            <option>Low</option>
+                            <option>Medium</option>
+                            <option>High</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col">
+                <div class="form-group">
+                    <label>Category</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
+                        </div>
+                        <select class="form-control select2" name="bulk_category">
+                            <option value="0">- Not Categorized -</option>
+                            <?php
+                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                            while ($row = mysqli_fetch_array($sql_categories)) {
+                                $category_id = intval($row['category_id']);
+                                $category_name = nullable_htmlentities($row['category_name']);
+
+                                ?>
+                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                            <?php } ?>
+
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Assign to</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
+                </div>
+                <select class="form-control select2" name="bulk_assigned_to">
+                    <option value="0">Not Assigned</option>
+                    <?php
+
+                    $sql = mysqli_query(
+                        $mysqli,
+                        "SELECT user_id, user_name FROM users
+                        WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $user_id = intval($row['user_id']);
+                        $user_name = nullable_htmlentities($row['user_name']); ?>
+                        <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Project</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>
+                <select class="form-control select2" name="bulk_project">
+                    <option value="0">- None -</option>
+                    <?php
+
+                    $sql_projects = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
+                    while ($row = mysqli_fetch_array($sql_projects)) {
+                        $project_id_select = intval($row['project_id']);
+                        $project_name_select = nullable_htmlentities($row['project_name']); ?>
+                        <option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php if ($config_module_enable_accounting) { ?>
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="bulk_billable" <?php if ($config_ticket_default_billable == 1) { echo "checked"; } ?> value="1" id="billableSwitch">
+                <label class="custom-control-label" for="billableSwitch">Billable</label>
+            </div>
+        </div>
+        <?php } ?>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_add_asset_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Tickets</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/agent/modals/asset/asset_bulk_assign_contact.php b/agent/modals/asset/asset_bulk_assign_contact.php
index 6f928a30..e292ae62 100644
--- a/agent/modals/asset/asset_bulk_assign_contact.php
+++ b/agent/modals/asset/asset_bulk_assign_contact.php
@@ -1,44 +1,58 @@
-<div class="modal" id="bulkAssignContactModal" 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-user-check mr-2"></i>Bulk Assign Contact</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Assign To</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="bulk_contact_id">
-                            <option value="">- Contact -</option>
-                            <?php
+$client_id = intval($_GET['client_id']);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $contact_id = intval($row['contact_id']);
-                                $contact_name = nullable_htmlentities($row['contact_name']);
-                                ?>
-                                <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+$count = count($selected_ids);
 
-                            <?php } ?>
+ob_start();
 
-                        </select>
-                    </div>
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assign Contact to <strong><?= $count ?></strong> Assets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Contact</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="bulk_contact_id">
+                    <option value="">- Contact -</option>
+                    <?php
 
-            </div>
+                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $contact_id = intval($row['contact_id']);
+                        $contact_name = nullable_htmlentities($row['contact_name']);
+                        ?>
+                        <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_asset_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                    <?php } ?>
+
+                </select>
             </div>
         </div>
+
     </div>
-</div>
\ No newline at end of file
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Contact</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/agent/modals/asset/asset_bulk_assign_location.php b/agent/modals/asset/asset_bulk_assign_location.php
index 3e3b85f9..114b462b 100644
--- a/agent/modals/asset/asset_bulk_assign_location.php
+++ b/agent/modals/asset/asset_bulk_assign_location.php
@@ -1,43 +1,58 @@
-<div class="modal" id="bulkAssignLocationModal" 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-map-marker-alt mr-2"></i>Bulk Assign Location</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_location_id">
-                            <option value="">- Location -</option>
-                            <?php
+$client_id = intval($_GET['client_id']);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                            $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $location_id = intval($row['location_id']);
-                                $location_name = nullable_htmlentities($row['location_name']);
-                            ?>
-                                <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                            <?php } ?>
+$count = count($selected_ids);
 
-                        </select>
-                    </div>
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Assign Location to <strong><?= $count ?></strong> Assets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Location</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_location_id">
+                    <option value="">- Location -</option>
+                    <?php
 
-            </div>
+                    $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $location_id = intval($row['location_id']);
+                        $location_name = nullable_htmlentities($row['location_name']);
+                    ?>
+                        <option value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                    <?php } ?>
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_asset_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
\ No newline at end of file
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Location</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/agent/modals/asset/asset_bulk_assign_physical_location.php b/agent/modals/asset/asset_bulk_assign_physical_location.php
index 32d49043..feb87400 100644
--- a/agent/modals/asset/asset_bulk_assign_physical_location.php
+++ b/agent/modals/asset/asset_bulk_assign_physical_location.php
@@ -1,31 +1,43 @@
-<div class="modal" id="bulkAssignPhysicalLocationModal" 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-map-marker-alt mr-2"></i>Bulk Set Physical Location</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Set Physical Location for <strong><?= $count ?></strong> Assets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Physical Location</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_asset_physical_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_asset_physical_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Physical Location</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/agent/modals/asset/asset_bulk_edit_status.php b/agent/modals/asset/asset_bulk_edit_status.php
index 384ce234..c80ff202 100644
--- a/agent/modals/asset/asset_bulk_edit_status.php
+++ b/agent/modals/asset/asset_bulk_edit_status.php
@@ -1,36 +1,49 @@
-<div class="modal" id="bulkEditStatusModal" 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-info mr-2"></i>Bulk Edit Status</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Status</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_status">
-                            <option value="">- Status -</option>
-                            <?php foreach($asset_status_array as $asset_status) { ?>
-                                <option><?php echo $asset_status; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-info mr-2"></i>Set Status for <strong><?= $count ?></strong> Assets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Status</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_asset_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <select class="form-control select2" name="bulk_status">
+                    <option value="">- Status -</option>
+                    <?php foreach($asset_status_array as $asset_status) { ?>
+                        <option><?php echo $asset_status; ?></option>
+                    <?php } ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
\ No newline at end of file
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_asset_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set Status</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/agent/modals/asset/asset_bulk_transfer_client.php b/agent/modals/asset/asset_bulk_transfer_client.php
index 4b6a6228..33c93a82 100644
--- a/agent/modals/asset/asset_bulk_transfer_client.php
+++ b/agent/modals/asset/asset_bulk_transfer_client.php
@@ -1,56 +1,68 @@
-<?php 
-if ($client_url) {
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+$count = count($selected_ids);
+
+$client_id = intval($_GET['client_id'] ?? 0);
+if ($client_id) {
     $client_select_query = "AND client_id != $client_id";
 } else {
     $client_select_query = '';
 }
+
+ob_start();
+
 ?>
 
-<div class="modal" id="bulkTransferAssetClientModal" 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-exchange mr-2"></i>Transferring Asset(s)</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfer <strong><?= $count ?></strong> Asset(s) to Client</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-            <div class="modal-body">
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="asset_ids[]" value="<?= $id ?>"><?php } ?>
 
-                <div class="form-group">
-                    <label>New Client <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-users"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_client_id">
-                            <option value="">- Select Client -</option>
-                            <?php
-                                $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
-                        
-                                while ($row = mysqli_fetch_array($clients_sql)) {
-                                    $client_id_select = intval($row["client_id"]);
-                                    $client_name_select = nullable_htmlentities($row["client_name"]);
-                                ?>
-                                <option value='<?php echo $client_id_select; ?>'><?php echo $client_name_select; ?></option>
-                                <?php
-                                }
-                            ?>
-                        </select>
-                    </div>
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Client <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-users"></i></span>
                 </div>
-
-                <div class="alert alert-dark" role="alert">
-                    <i>The current asset will be archived and content copied to a new asset.</i>
-                </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_transfer_client_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Transfer</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <select class="form-control select2" name="bulk_client_id">
+                    <option value="">- Select Client -</option>
+                    <?php
+                        $clients_sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $client_select_query");
+                
+                        while ($row = mysqli_fetch_array($clients_sql)) {
+                            $client_id_select = intval($row["client_id"]);
+                            $client_name_select = nullable_htmlentities($row["client_name"]);
+                        ?>
+                        <option value='<?php echo $client_id_select; ?>'><?php echo $client_name_select; ?></option>
+                        <?php
+                        }
+                    ?>
+                </select>
             </div>
         </div>
+
+        <div class="alert alert-dark" role="alert">
+            <i>The current asset will be archived and content copied to a new asset.</i>
+        </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_transfer_client_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Transfer to Client</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/agent/modals/credential/credential_bulk_assign_tags.php b/agent/modals/credential/credential_bulk_assign_tags.php
index 302b4f24..c1503e0e 100644
--- a/agent/modals/credential/credential_bulk_assign_tags.php
+++ b/agent/modals/credential/credential_bulk_assign_tags.php
@@ -1,55 +1,67 @@
-<div class="modal" id="bulkAssignTagsModal" 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-tags mr-2"></i>Bulk Assigning Tags</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
-                <input type="hidden" name="bulk_remove_tags" value="0">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
-                    <label class="form-check-label text-danger">Remove Existing Tags</label>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Assign Tags to <strong><?= $count ?></strong> Credentials</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="credential_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+        <input type="hidden" name="bulk_remove_tags" value="0">
+
+        <div class="form-group form-check">
+            <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
+            <label class="form-check-label text-danger">Remove Existing Tags</label>
+        </div>
+
+        <div class="form-group">
+            <label>Tags</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
+                    <?php
 
-                <div class="form-group">
-                    <label>Tags</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
-                            <?php
+                    $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
+                    while ($row = mysqli_fetch_array($sql_tags_select)) {
+                        $tag_id_select = intval($row['tag_id']);
+                        $tag_name_select = nullable_htmlentities($row['tag_name']);
+                        ?>
+                        <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                    <?php } ?>
 
-                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 4 ORDER BY tag_name ASC");
-                            while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                $tag_id_select = intval($row['tag_id']);
-                                $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                ?>
-                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                        <div class="input-group-append">
-                            <button class="btn btn-secondary ajax-modal" type="button"
-                                data-modal-size="sm"
-                                data-modal-url="../admin/modals/tag/tag_add.php?id=4">
-                                <i class="fas fa-plus"></i>
-                            </button>
-                        </div>
-                    </div>
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-size="sm"
+                        data-modal-url="../admin/modals/tag/tag_add.php?id=4">
+                        <i class="fas fa-plus"></i>
+                    </button>
                 </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_credential_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
         </div>
+
     </div>
-</div>
\ No newline at end of file
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_credential_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Tags</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';
\ No newline at end of file
diff --git a/agent/modals/document/document_bulk_move.php b/agent/modals/document/document_bulk_move.php
index 3d1b9eb9..d9bc2b77 100644
--- a/agent/modals/document/document_bulk_move.php
+++ b/agent/modals/document/document_bulk_move.php
@@ -1,92 +1,108 @@
-<div class="modal" id="bulkMoveDocumentModal" 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-file-alt mr-2"></i>Moving documents</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Move Documents to</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_folder_id">
-                            <option value="0">/</option>
-                                <?php
-                                // Fetch all folders for the client
-                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                                $folders = array();
+require_once '../../../includes/modal_header.php';
 
-                                // Build an associative array of folders indexed by folder_id
-                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                    $folders[$row['folder_id']] = array(
-                                        'folder_id' => intval($row['folder_id']),
-                                        'folder_name' => nullable_htmlentities($row['folder_name']),
-                                        'parent_folder' => intval($row['parent_folder']),
-                                        'children' => array()
-                                    );
-                                }
+$client_id = intval($_GET['client_id']);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                                // Build the folder hierarchy
-                                foreach ($folders as $id => &$folder) {
-                                    if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) {
-                                        $folders[$folder['parent_folder']]['children'][] = &$folder;
-                                    }
-                                }
-                                unset($folder); // Break the reference
+$count = count($selected_ids);
 
-                                // Prepare a list of root folders
-                                $root_folders = array();
-                                foreach ($folders as $id => $folder) {
-                                    if ($folder['parent_folder'] == 0) {
-                                        $root_folders[] = $folder;
-                                    }
-                                }
+ob_start();
 
-                                // Display the folder options iteratively
-                                $stack = array();
-                                foreach (array_reverse($root_folders) as $folder) {
-                                    $stack[] = array('folder' => $folder, 'level' => 0);
-                                }
+?>
 
-                                while (!empty($stack)) {
-                                    $node = array_pop($stack);
-                                    $folder = $node['folder'];
-                                    $level = $node['level'];
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Move <strong><?= $count ?></strong> Documents</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                                    // Indentation for subfolders
-                                    $indentation = str_repeat('&nbsp;', $level * 4);
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="document_ids[]" value="<?= $id ?>"><?php } ?>
 
-                                    // Check if this folder is selected
-                                    $selected = '';
-                                    if ($folder['folder_id'] == $get_folder_id) {
-                                        $selected = 'selected';
-                                    }
+    <div class="modal-body">
 
-                                    echo "<option value=\"{$folder['folder_id']}\" $selected>$indentation{$folder['folder_name']}</option>";
-
-                                    // Add children to the stack
-                                    if (!empty($folder['children'])) {
-                                        foreach (array_reverse($folder['children']) as $child_folder) {
-                                            $stack[] = array('folder' => $child_folder, 'level' => $level + 1);
-                                        }
-                                    }
-                                }
-                                ?>
-                        </select>
-                    </div>
+        <div class="form-group">
+            <label>Target Folder</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_folder_id">
+                    <option value="0">/</option>
+                        <?php
+                        // Fetch all folders for the client
+                        $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                        $folders = array();
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                        // Build an associative array of folders indexed by folder_id
+                        while ($row = mysqli_fetch_assoc($sql_all_folders)) {
+                            $folders[$row['folder_id']] = array(
+                                'folder_id' => intval($row['folder_id']),
+                                'folder_name' => nullable_htmlentities($row['folder_name']),
+                                'parent_folder' => intval($row['parent_folder']),
+                                'children' => array()
+                            );
+                        }
+
+                        // Build the folder hierarchy
+                        foreach ($folders as $id => &$folder) {
+                            if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) {
+                                $folders[$folder['parent_folder']]['children'][] = &$folder;
+                            }
+                        }
+                        unset($folder); // Break the reference
+
+                        // Prepare a list of root folders
+                        $root_folders = array();
+                        foreach ($folders as $id => $folder) {
+                            if ($folder['parent_folder'] == 0) {
+                                $root_folders[] = $folder;
+                            }
+                        }
+
+                        // Display the folder options iteratively
+                        $stack = array();
+                        foreach (array_reverse($root_folders) as $folder) {
+                            $stack[] = array('folder' => $folder, 'level' => 0);
+                        }
+
+                        while (!empty($stack)) {
+                            $node = array_pop($stack);
+                            $folder = $node['folder'];
+                            $level = $node['level'];
+
+                            // Indentation for subfolders
+                            $indentation = str_repeat('&nbsp;', $level * 4);
+
+                            // Check if this folder is selected
+                            $selected = '';
+                            if ($folder['folder_id'] == $get_folder_id) {
+                                $selected = 'selected';
+                            }
+
+                            echo "<option value=\"{$folder['folder_id']}\" $selected>$indentation{$folder['folder_name']}</option>";
+
+                            // Add children to the stack
+                            if (!empty($folder['children'])) {
+                                foreach (array_reverse($folder['children']) as $child_folder) {
+                                    $stack[] = array('folder' => $child_folder, 'level' => $level + 1);
+                                }
+                            }
+                        }
+                        ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move Documents</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/agent/modals/file/file_bulk_move.php b/agent/modals/file/file_bulk_move.php
index f9645969..57aa223e 100644
--- a/agent/modals/file/file_bulk_move.php
+++ b/agent/modals/file/file_bulk_move.php
@@ -1,92 +1,108 @@
-<div class="modal" id="bulkMoveFilesModal" 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-exchange-alt mr-2"></i>Bulk Moving Files</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Folder</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_folder_id">
-                            <option value="0">/</option>
-                                <?php
-                                // Fetch all folders for the client
-                                $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
-                                $folders = array();
+require_once '../../../includes/modal_header.php';
 
-                                // Build an associative array of folders indexed by folder_id
-                                while ($row = mysqli_fetch_assoc($sql_all_folders)) {
-                                    $folders[$row['folder_id']] = array(
-                                        'folder_id' => intval($row['folder_id']),
-                                        'folder_name' => nullable_htmlentities($row['folder_name']),
-                                        'parent_folder' => intval($row['parent_folder']),
-                                        'children' => array()
-                                    );
-                                }
+$client_id = intval($_GET['client_id']);
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                                // Build the folder hierarchy
-                                foreach ($folders as $id => &$folder) {
-                                    if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) {
-                                        $folders[$folder['parent_folder']]['children'][] = &$folder;
-                                    }
-                                }
-                                unset($folder); // Break the reference
+$count = count($selected_ids);
 
-                                // Prepare a list of root folders
-                                $root_folders = array();
-                                foreach ($folders as $id => $folder) {
-                                    if ($folder['parent_folder'] == 0) {
-                                        $root_folders[] = $folder;
-                                    }
-                                }
+ob_start();
 
-                                // Display the folder options iteratively
-                                $stack = array();
-                                foreach (array_reverse($root_folders) as $folder) {
-                                    $stack[] = array('folder' => $folder, 'level' => 0);
-                                }
+?>
 
-                                while (!empty($stack)) {
-                                    $node = array_pop($stack);
-                                    $folder = $node['folder'];
-                                    $level = $node['level'];
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Move <strong><?= $count ?></strong> Files</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                                    // Indentation for subfolders
-                                    $indentation = str_repeat('&nbsp;', $level * 4);
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="file_ids[]" value="<?= $id ?>"><?php } ?>
 
-                                    // Check if this folder is selected
-                                    $selected = '';
-                                    if ($folder['folder_id'] == $get_folder_id) {
-                                        $selected = 'selected';
-                                    }
+    <div class="modal-body">
 
-                                    echo "<option value=\"{$folder['folder_id']}\" $selected>$indentation{$folder['folder_name']}</option>";
-
-                                    // Add children to the stack
-                                    if (!empty($folder['children'])) {
-                                        foreach (array_reverse($folder['children']) as $child_folder) {
-                                            $stack[] = array('folder' => $child_folder, 'level' => $level + 1);
-                                        }
-                                    }
-                                }
-                                ?>
-                        </select>
-                    </div>
+        <div class="form-group">
+            <label>Target Folder</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_folder_id">
+                    <option value="0">/</option>
+                        <?php
+                        // Fetch all folders for the client
+                        $sql_all_folders = mysqli_query($mysqli, "SELECT folder_id, folder_name, parent_folder FROM folders WHERE folder_location = 1 AND folder_client_id = $client_id ORDER BY folder_name ASC");
+                        $folders = array();
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_move_files" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                        // Build an associative array of folders indexed by folder_id
+                        while ($row = mysqli_fetch_assoc($sql_all_folders)) {
+                            $folders[$row['folder_id']] = array(
+                                'folder_id' => intval($row['folder_id']),
+                                'folder_name' => nullable_htmlentities($row['folder_name']),
+                                'parent_folder' => intval($row['parent_folder']),
+                                'children' => array()
+                            );
+                        }
+
+                        // Build the folder hierarchy
+                        foreach ($folders as $id => &$folder) {
+                            if ($folder['parent_folder'] != 0 && isset($folders[$folder['parent_folder']])) {
+                                $folders[$folder['parent_folder']]['children'][] = &$folder;
+                            }
+                        }
+                        unset($folder); // Break the reference
+
+                        // Prepare a list of root folders
+                        $root_folders = array();
+                        foreach ($folders as $id => $folder) {
+                            if ($folder['parent_folder'] == 0) {
+                                $root_folders[] = $folder;
+                            }
+                        }
+
+                        // Display the folder options iteratively
+                        $stack = array();
+                        foreach (array_reverse($root_folders) as $folder) {
+                            $stack[] = array('folder' => $folder, 'level' => 0);
+                        }
+
+                        while (!empty($stack)) {
+                            $node = array_pop($stack);
+                            $folder = $node['folder'];
+                            $level = $node['level'];
+
+                            // Indentation for subfolders
+                            $indentation = str_repeat('&nbsp;', $level * 4);
+
+                            // Check if this folder is selected
+                            $selected = '';
+                            if ($folder['folder_id'] == $get_folder_id) {
+                                $selected = 'selected';
+                            }
+
+                            echo "<option value=\"{$folder['folder_id']}\" $selected>$indentation{$folder['folder_name']}</option>";
+
+                            // Add children to the stack
+                            if (!empty($folder['children'])) {
+                                foreach (array_reverse($folder['children']) as $child_folder) {
+                                    $stack[] = array('folder' => $child_folder, 'level' => $level + 1);
+                                }
+                            }
+                        }
+                        ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_move_files" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move Files</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/agent/modals/invoice/invoice_bulk_edit_category.php b/agent/modals/invoice/invoice_bulk_edit_category.php
index a9547ac8..6cd9a20a 100644
--- a/agent/modals/invoice/invoice_bulk_edit_category.php
+++ b/agent/modals/invoice/invoice_bulk_edit_category.php
@@ -1,42 +1,57 @@
-<div class="modal" id="bulkEditCategoryModal" 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-list mr-2"></i>Bulk Set Category</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Category <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"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_category_id">
-                            <?php
+require_once '../../../includes/modal_header.php';
 
-                            $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql)) {
-                                $category_id = intval($row['category_id']);
-                                $category_name = nullable_htmlentities($row['category_name']);
-                                ?>
-                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                                <?php
-                            }
-                            ?>
-                        </select>
-                    </div>
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Set Category for <strong><?= $count ?></strong> Invoices</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="invoice_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Category <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"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_category_id">
+                    <?php
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_invoice_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_invoice_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set Category</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/agent/modals/location/location_bulk_assign_tags.php b/agent/modals/location/location_bulk_assign_tags.php
index 579ca4c4..04891e08 100644
--- a/agent/modals/location/location_bulk_assign_tags.php
+++ b/agent/modals/location/location_bulk_assign_tags.php
@@ -1,48 +1,60 @@
-<div class="modal" id="bulkAssignTagsModal" 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-tags mr-2"></i>Bulk Assign Tags</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <div class="modal-body">
-                <input type="hidden" name="bulk_remove_tags" value="0">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
-                    <label class="form-check-label text-danger">Remove Existing Tags</label>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Assign Tags to <strong><?= $count ?></strong> Locations</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="location_ids[]" value="<?= $id ?>"><?php } ?>
+    <input type="hidden" name="bulk_remove_tags" value="0">
+    <div class="modal-body">
+
+        <div class="form-group form-check">
+            <input type="checkbox" class="form-check-input" name="bulk_remove_tags" value="1">
+            <label class="form-check-label text-danger">Remove Existing Tags</label>
+        </div>
+
+        <div class="form-group">
+            <label>Tags</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                 </div>
+                <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
+                    <?php
 
-                <div class="form-group">
-                    <label>Tags</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_tags[]" data-placeholder="Add some tags" multiple>
-                            <?php
+                    $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 2 ORDER BY tag_name ASC");
+                    while ($row = mysqli_fetch_array($sql_tags_select)) {
+                        $tag_id_select = intval($row['tag_id']);
+                        $tag_name_select = nullable_htmlentities($row['tag_name']);
+                        ?>
+                        <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
+                    <?php } ?>
 
-                            $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 2 ORDER BY tag_name ASC");
-                            while ($row = mysqli_fetch_array($sql_tags_select)) {
-                                $tag_id_select = intval($row['tag_id']);
-                                $tag_name_select = nullable_htmlentities($row['tag_name']);
-                                ?>
-                                <option value="<?php echo $tag_id_select; ?>"><?php echo $tag_name_select; ?></option>
-                            <?php } ?>
-
-                        </select>
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_location_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </select>
             </div>
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_location_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign Tags</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/agent/modals/payment/payment_bulk_add.php b/agent/modals/payment/payment_bulk_add.php
index 28c40dc5..954c4daf 100644
--- a/agent/modals/payment/payment_bulk_add.php
+++ b/agent/modals/payment/payment_bulk_add.php
@@ -1,149 +1,182 @@
-<div class="modal" id="addBulkPaymentModal" 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>Make Batch Payment</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="client_id" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="balance" value="<?php echo $balance; ?>">
-                <input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="alert alert-info">
-                        <h5>Batch Payment Notice</h5>
-                        Batch Payment will settle invoices in order from the oldest to the newest.
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-row">
-                        <div class="col-md">
+$client_id = intval($_GET['client_id']);
 
-                            <div class="form-group">
-                                <label>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="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                                </div>
-                            </div>
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT * FROM clients
+    LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1
+    WHERE client_id = $client_id"
+);
 
-                        </div>
+$row = mysqli_fetch_array($sql);
+$client_name = nullable_htmlentities($row['client_name']);
+$client_currency_code = nullable_htmlentities($row['client_currency_code']);
+$contact_name = nullable_htmlentities($row['contact_name']);
+$contact_email = nullable_htmlentities($row['contact_email']);
 
-                        <div class="col-md">
+//Add up all the payments for the invoice and get the total amount paid to the invoice
+$sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable'");
+$row = mysqli_fetch_array($sql_invoice_amounts);
 
-                            <div class="form-group">
-                                <label>Amount <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-dollar-sign"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
-                                </div>
-                            </div>
+$invoice_amounts = floatval($row['invoice_amounts']);
 
-                        </div>
+$sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
+$row = mysqli_fetch_array($sql_amount_paid);
 
-                    </div>
+$amount_paid = floatval($row['amount_paid']);
 
-                    <div class="form-group">
-                        <label>Account <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-piggy-bank"></i></span>
-                            </div>
-                            <select class="form-control select2" name="account" required>
-                                <option value="">- Select an Account -</option>
-                                <?php
+$balance = $invoice_amounts - $amount_paid;
 
-                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $account_id = intval($row['account_id']);
-                                    $account_name = nullable_htmlentities($row['account_name']);
-                                    $opening_balance = floatval($row['opening_balance']);
+ob_start();
 
-                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_payments);
-                                    $total_payments = floatval($row['total_payments']);
+?>
 
-                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_revenues);
-                                    $total_revenues = floatval($row['total_revenues']);
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Make Batch Payment</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="client_id" value="<?php echo $client_id; ?>">
+    <input type="hidden" name="balance" value="<?php echo $balance; ?>">
+    <input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
+    <div class="modal-body">
 
-                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_expenses);
-                                    $total_expenses = floatval($row['total_expenses']);
-
-                                    $account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                ?>
-                                    <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?>
-                                        value="<?php echo $account_id; ?>">
-                                        <?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]
-                                    </option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Payment Method <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-money-check-alt"></i></span>
-                            </div>
-                            <select class="form-control select2" name="payment_method" required>
-                                <option value="">- Method of Payment -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $payment_method_name = nullable_htmlentities($row['payment_method_name']);
-                                ?>
-                                    <option <?php if ($config_default_payment_method == $payment_method_name) { echo "selected"; } ?>><?php echo $payment_method_name; ?></option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Reference</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc" maxlength="200">
-                        </div>
-                    </div>
-
-                    <?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
-
-                        <div class="form-group">
-                            <label>Email Receipt</label>
-                            <div class="custom-control custom-checkbox">
-                                <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" checked>
-                                <label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
-                            </div>
-                        </div>
-
-                    <?php } ?>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_bulk_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
+        <div class="alert alert-info">
+            <h5>Batch Payment Notice</h5>
+            Batch Payment will settle invoices in order from the oldest to the newest.
         </div>
+
+        <div class="form-row">
+            <div class="col-md">
+
+                <div class="form-group">
+                    <label>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="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="col-md">
+
+                <div class="form-group">
+                    <label>Amount <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-dollar-sign"></i></span>
+                        </div>
+                        <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($balance, 2, '.', ''); ?>" placeholder="0.00" required>
+                    </div>
+                </div>
+
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Account <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-piggy-bank"></i></span>
+                </div>
+                <select class="form-control select2" name="account" required>
+                    <option value="">- Select an Account -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $account_id = intval($row['account_id']);
+                        $account_name = nullable_htmlentities($row['account_name']);
+                        $opening_balance = floatval($row['opening_balance']);
+
+                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_payments);
+                        $total_payments = floatval($row['total_payments']);
+
+                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_revenues);
+                        $total_revenues = floatval($row['total_revenues']);
+
+                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_expenses);
+                        $total_expenses = floatval($row['total_expenses']);
+
+                        $account_balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                    ?>
+                        <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?>
+                            value="<?php echo $account_id; ?>">
+                            <?php echo $account_name; ?> [$<?php echo number_format($account_balance, 2); ?>]
+                        </option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Payment Method <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-money-check-alt"></i></span>
+                </div>
+                <select class="form-control select2" name="payment_method" required>
+                    <option value="">- Method of Payment -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $payment_method_name = nullable_htmlentities($row['payment_method_name']);
+                    ?>
+                        <option <?php if ($config_default_payment_method == $payment_method_name) { echo "selected"; } ?>><?php echo $payment_method_name; ?></option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Reference</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="reference" placeholder="Check #, Trans #, etc" maxlength="200">
+            </div>
+        </div>
+
+        <?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
+
+            <div class="form-group">
+                <label>Email Receipt</label>
+                <div class="custom-control custom-checkbox">
+                    <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_receipt" value="1" checked>
+                    <label class="custom-control-label" for="customControlAutosizing"><?php echo $contact_email; ?></label>
+                </div>
+            </div>
+
+        <?php } ?>
+
     </div>
-</div>
\ No newline at end of file
+
+    <div class="modal-footer">
+        <button type="submit" name="add_bulk_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</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/agent/modals/project/project_link_closed_ticket.php b/agent/modals/project/project_link_closed_ticket.php
index ab4b975f..59b452f1 100644
--- a/agent/modals/project/project_link_closed_ticket.php
+++ b/agent/modals/project/project_link_closed_ticket.php
@@ -1,42 +1,60 @@
-<div class="modal" id="linkClosedTicketModal" 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>Link closed ticket to project: <strong><?php echo $project_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_id" value="<?php echo $project_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Ticket number <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <?php
-                                // Show the ticket prefix, or just the tag icon
-                                $config_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_prefix FROM settings WHERE company_id = 1"));
-                                $config_ticket_prefix = $config_row['config_ticket_prefix'];
-                                if (empty($config_ticket_prefix)) {
-                                    echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
-                                } else {
-                                    echo "<div class=\"input-group-text\"> $config_ticket_prefix </div>";
-                                }
-                                ?>
-                            </div>
-                            <input type="text" class="form-control" name="ticket_number" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" placeholder="Closed ticket number to link with project" required>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                </div>
+$project_id = intval($_GET['project_id']);
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                <div class="modal-footer">
-                    <button type="submit" name="link_closed_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link</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>
+if ($client_id) {
+    $client_ticket_select_query = "AND ticket_client_id = $client_id"; // Used when linking a ticket to the project
+} else {
+    $client_ticket_select_query = '';
+}
+
+$sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$project_name = nullable_htmlentities($row['project_name']);
+
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Link closed ticket to project: <strong><?php echo $project_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_id" value="<?php echo $project_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Ticket number <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <?php
+                    // Show the ticket prefix, or just the tag icon
+                    $config_row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_ticket_prefix FROM settings WHERE company_id = 1"));
+                    $config_ticket_prefix = $config_row['config_ticket_prefix'];
+                    if (empty($config_ticket_prefix)) {
+                        echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
+                    } else {
+                        echo "<div class=\"input-group-text\"> $config_ticket_prefix </div>";
+                    }
+                    ?>
+                </div>
+                <input type="text" class="form-control" name="ticket_number" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" placeholder="Closed ticket number to link with project" required>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="link_closed_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link Ticket</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/agent/modals/project/project_link_ticket.php b/agent/modals/project/project_link_ticket.php
index 033f6f6e..83402523 100644
--- a/agent/modals/project/project_link_ticket.php
+++ b/agent/modals/project/project_link_ticket.php
@@ -1,50 +1,68 @@
-<div class="modal" id="linkTicketModal" 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>Link open ticket to project: <strong><?php echo $project_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_id" value="<?php echo $project_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Ticket <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" multiple name="tickets[]" required>
-                                <option value="" disabled>- Select Ticket(s) -</option>
-                                <?php
+require_once '../../../includes/modal_header.php';
 
-                                $sql_tickets_select = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients on ticket_client_id = client_id WHERE ticket_project_id = 0 AND ticket_closed_at IS NULL $client_ticket_select_query");
-                                while ($row = mysqli_fetch_array($sql_tickets_select)) {
-                                    $ticket_id_select = intval($row['ticket_id']);
-                                    $ticket_prefix_select = nullable_htmlentities($row['ticket_prefix']);
-                                    $ticket_number_select = intval($row['ticket_number']);
-                                    $ticket_subject_select = nullable_htmlentities($row['ticket_subject']);
-                                    $ticket_client_abbreviation_select = nullable_htmlentities($row['client_abbreviation'])
-                                    ?>
-                                    <option value="<?php echo $ticket_id_select; ?>"><?php echo "$ticket_prefix_select$ticket_number_select - $ticket_subject_select ($ticket_client_abbreviation_select)"; ?></option>
-                                    <?php
-                                }
+$project_id = intval($_GET['project_id']);
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                                ?>
-                            </select>
-                        </div>
-                    </div>
+if ($client_id) {
+    $client_ticket_select_query = "AND ticket_client_id = $client_id"; // Used when linking a ticket to the project
+} else {
+    $client_ticket_select_query = '';
+}
 
-                </div>
+$sql = mysqli_query($mysqli, "SELECT * FROM projects WHERE project_id = $project_id LIMIT 1");
 
-                <div class="modal-footer">
-                    <button type="submit" name="link_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link</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>
+$row = mysqli_fetch_array($sql);
+$project_name = nullable_htmlentities($row['project_name']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Link open ticket(s) to project: <strong><?php echo $project_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_id" value="<?php echo $project_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Tickets <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" data-placeholder="- Select Tickets- " multiple name="tickets[]" required>
+                    <?php
+
+                    $sql_tickets_select = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients on ticket_client_id = client_id WHERE ticket_project_id = 0 AND ticket_closed_at IS NULL $client_ticket_select_query");
+                    while ($row = mysqli_fetch_array($sql_tickets_select)) {
+                        $ticket_id_select = intval($row['ticket_id']);
+                        $ticket_prefix_select = nullable_htmlentities($row['ticket_prefix']);
+                        $ticket_number_select = intval($row['ticket_number']);
+                        $ticket_subject_select = nullable_htmlentities($row['ticket_subject']);
+                        $ticket_client_abbreviation_select = nullable_htmlentities($row['client_abbreviation'])
+                        ?>
+                        <option value="<?php echo $ticket_id_select; ?>"><?php echo "$ticket_prefix_select$ticket_number_select - $ticket_subject_select ($ticket_client_abbreviation_select)"; ?></option>
+                        <?php
+                    }
+
+                    ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="link_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link Ticket(s)</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/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php
index eee8669f..f2be148d 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php
@@ -1,46 +1,59 @@
-<div class="modal" id="bulkAssignAgentRecurringTicketModal" 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-user-check mr-2"></i>Assigning Agent</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Assign Agent</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                        </div>
-                        <select class="form-control select2" name="assign_to">
-                            <option value="0">Not Assigned</option>
-                            <?php
-                            $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
-                                WHERE user_type = 1
-                                AND user_status = 1
-                                AND user_archived_at IS NULL 
-                                ORDER BY user_name DESC"
-                            );
-                            while ($row = mysqli_fetch_array($sql_users_select)) {
-                                $user_id_select = intval($row['user_id']);
-                                $user_name_select = nullable_htmlentities($row['user_name']);
+require_once '../../../includes/modal_header.php';
 
-                                ?>
-                                <option value="<?= $user_id_select ?>"><?= $user_name_select ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assign Agent to <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="recurring_ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Agent</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
                 </div>
-            </div>
+                <select class="form-control select2" name="assign_to">
+                    <option value="0">Not Assigned</option>
+                    <?php
+                    $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
+                        WHERE user_type = 1
+                        AND user_status = 1
+                        AND user_archived_at IS NULL 
+                        ORDER BY user_name DESC"
+                    );
+                    while ($row = mysqli_fetch_array($sql_users_select)) {
+                        $user_id_select = intval($row['user_id']);
+                        $user_name_select = nullable_htmlentities($row['user_name']);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_recurring_ticket" 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>
+                        ?>
+                        <option value="<?= $user_id_select ?>"><?= $user_name_select ?></option>
+                    <?php } ?>
+                </select>
             </div>
-
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_recurring_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign Agent</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/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php
index c67d6d43..b0402877 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php
@@ -1,29 +1,42 @@
-<div class="modal" id="bulkEditBillableRecurringTicketModal" 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-money mr-2"></i>Bulk Set Billable</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-                
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <div class="custom-control custom-switch">
-                        <input type="checkbox" class="custom-control-input" name="billable" value="1" id="billable<?= $recurring_ticket_id ?>">
-                        <label class="custom-control-label" for="billable<?= $recurring_ticket_id ?>">Mark Billable</label>
-                    </div>
-                </div>
+require_once '../../../includes/modal_header.php';
 
-            </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_recurring_ticket_billable" 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>
+$count = count($selected_ids);
 
-        </div>
-    </div>
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-dollar-sign mr-2"></i>Mark <strong><?= $count ?></strong> Tickets Billable</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="recurring_ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    
+    <div class="modal-body">
+
+        <div class="form-group">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" name="billable" value="1" id="billable">
+                <label class="custom-control-label" for="billable">Mark Billable</label>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_recurring_ticket_billable" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set</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/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php
index 729a9efe..f66d95be 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_category_edit.php
@@ -1,42 +1,56 @@
-<div class="modal" id="bulkEditCategoryRecurringTicketModal" 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-layer-group mr-2"></i>Bulk Set Category</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Category</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_category">
-                            <option value="0">- Uncategorized -</option>
-                            <?php
-                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql_categories)) {
-                                $category_id = intval($row['category_id']);
-                                $category_name = nullable_htmlentities($row['category_name']);
+require_once '../../../includes/modal_header.php';
 
-                                ?>
-                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                            <?php } ?>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                        </select>
-                    </div>
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-layer-group mr-2"></i>Set Category for <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="recurring_ticket_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Category</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                 </div>
-            </div>
+                <select class="form-control select2" name="bulk_category">
+                    <option value="0">- Uncategorized -</option>
+                    <?php
+                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql_categories)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_recurring_ticket_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>
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                    <?php } ?>
 
+                </select>
+            </div>
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_recurring_ticket_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set Category</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/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php
index e3dc782e..d0cddbfe 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php
@@ -1,32 +1,45 @@
-<div class="modal" id="bulkEditNextRunRecurringTicketModal" 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-calendar-day mr-2"></i>Set Next Run Date</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-                
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Next Run 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-day"></i></span>
-                        </div>
-                        <input class="form-control" type="date" name="next_run_date" min="<?= date("Y-m-d"); ?>" max="2999-12-31">
-                    </div>
-                </div>
+require_once '../../../includes/modal_header.php';
 
-            </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_recurring_ticket_next_run_date" 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>
+$count = count($selected_ids);
 
-        </div>
-    </div>
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-calendar-day mr-2"></i>Set Next Run Date for <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="recurring_ticket_ids[]" value="<?= $id ?>"><?php } ?>
+                    
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Next Run 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-day"></i></span>
+                </div>
+                <input class="form-control" type="date" name="next_run_date" min="<?= date("Y-m-d"); ?>" max="2999-12-31">
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_recurring_ticket_next_run_date" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set Run Date</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/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php
index 38f2ee70..b0ed17cc 100644
--- a/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php
+++ b/agent/modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php
@@ -1,36 +1,49 @@
-<div class="modal" id="bulkEditPriorityRecurringTicketModal" 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-thermometer-half mr-2"></i>Bulk Editing Priority</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-                
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Priority</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_priority">
-                            <option>Low</option>
-                            <option>Medium</option>
-                            <option>High</option>
-                        </select>
-                    </div>
-                </div>
+require_once '../../../includes/modal_header.php';
 
-            </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_recurring_ticket_priority" 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>
+$count = count($selected_ids);
 
-        </div>
-    </div>
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Set Priority for <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="recurring_ticket_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Priority</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                </div>
+                <select class="form-control select2" name="bulk_priority">
+                    <option>Low</option>
+                    <option>Medium</option>
+                    <option>High</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_recurring_ticket_priority" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set Priority</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/agent/modals/ticket/ticket_bulk_add_project.php b/agent/modals/ticket/ticket_bulk_add_project.php
index 543c38c3..dbe78673 100644
--- a/agent/modals/ticket/ticket_bulk_add_project.php
+++ b/agent/modals/ticket/ticket_bulk_add_project.php
@@ -1,47 +1,61 @@
-<div class="modal" id="bulkAssignTicketToProjectModal" 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-user-check mr-2"></i>Adding Tickets to Project</strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Project</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>
-                        <select class="form-control select2" name="project_id">
-                            <option value="0">No Project</option>
-                            <?php
-                            $sql_projects_select = mysqli_query($mysqli, "SELECT project_id, project_name, project_prefix, project_number FROM projects 
-                                WHERE project_archived_at IS NULL
-                                AND project_completed_at IS NULL
-                                ORDER BY project_name DESC"
-                            );
-                            while ($row = mysqli_fetch_array($sql_projects_select)) {
-                                $project_id_select = intval($row['project_id']);
-                                $project_prefix_select = nullable_htmlentities($row['project_prefix']);
-                                $project_number_select = intval($row['project_number']);
-                                $project_name_select = nullable_htmlentities($row['project_name']);
+require_once '../../../includes/modal_header.php';
 
-                                ?>
-                                <option value="<?php echo $project_id_select; ?>"><?php echo " $project_prefix_select$project_number_select - $project_name_select"; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assign Project to <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Project</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>
-            </div>
+                <select class="form-control select2" name="project_id">
+                    <option value="0">No Project</option>
+                    <?php
+                    $sql_projects_select = mysqli_query($mysqli, "SELECT project_id, project_name, project_prefix, project_number FROM projects 
+                        WHERE project_archived_at IS NULL
+                        AND project_completed_at IS NULL
+                        ORDER BY project_name DESC"
+                    );
+                    while ($row = mysqli_fetch_array($sql_projects_select)) {
+                        $project_id_select = intval($row['project_id']);
+                        $project_prefix_select = nullable_htmlentities($row['project_prefix']);
+                        $project_number_select = intval($row['project_number']);
+                        $project_name_select = nullable_htmlentities($row['project_name']);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_add_ticket_project" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                        ?>
+                        <option value="<?php echo $project_id_select; ?>"><?php echo " $project_prefix_select$project_number_select - $project_name_select"; ?></option>
+                    <?php } ?>
+                </select>
             </div>
-
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_add_ticket_project" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</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/agent/modals/ticket/ticket_bulk_assign.php b/agent/modals/ticket/ticket_bulk_assign.php
index 044be7e6..bb95b453 100644
--- a/agent/modals/ticket/ticket_bulk_assign.php
+++ b/agent/modals/ticket/ticket_bulk_assign.php
@@ -1,46 +1,60 @@
-<div class="modal" id="bulkAssignTicketModal" 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-user-check mr-2"></i>Bulk Assigning Selected Tickets:</strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Assign to</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                        </div>
-                        <select class="form-control select2" name="assign_to">
-                            <option value="0">Not Assigned</option>
-                            <?php
-                            $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
-                                WHERE user_type = 1
-                                AND user_status = 1
-                                AND user_archived_at IS NULL 
-                                ORDER BY user_name ASC"
-                            );
-                            while ($row = mysqli_fetch_array($sql_users_select)) {
-                                $user_id_select = intval($row['user_id']);
-                                $user_name_select = nullable_htmlentities($row['user_name']);
+require_once '../../../includes/modal_header.php';
 
-                                ?>
-                                <option value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assign Agent to <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Assign to</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
                 </div>
-            </div>
+                <select class="form-control select2" name="assign_to">
+                    <option value="0">Not Assigned</option>
+                    <?php
+                    $sql_users_select = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
+                        WHERE user_type = 1
+                        AND user_status = 1
+                        AND user_archived_at IS NULL 
+                        ORDER BY user_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql_users_select)) {
+                        $user_id_select = intval($row['user_id']);
+                        $user_name_select = nullable_htmlentities($row['user_name']);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Bulk Assign</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                        ?>
+                        <option value="<?php echo $user_id_select; ?>"><?php echo $user_name_select; ?></option>
+                    <?php } ?>
+                </select>
             </div>
-
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</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/agent/modals/ticket/ticket_bulk_edit_category.php b/agent/modals/ticket/ticket_bulk_edit_category.php
index 4464d407..9e4dbcc1 100644
--- a/agent/modals/ticket/ticket_bulk_edit_category.php
+++ b/agent/modals/ticket/ticket_bulk_edit_category.php
@@ -1,42 +1,58 @@
-<div class="modal" id="bulkEditCategoryTicketModal" 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-layer-group mr-2"></i>Bulk Categorizing Selected Tickets:</strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Category</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_category">
-                            <option value="0">- Uncategorized -</option>
-                            <?php
-                            $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                            while ($row = mysqli_fetch_array($sql_categories)) {
-                                $category_id = intval($row['category_id']);
-                                $category_name = nullable_htmlentities($row['category_name']);
+require_once '../../../includes/modal_header.php';
 
-                                ?>
-                                <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-                            <?php } ?>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                        </select>
-                    </div>
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-layer-group mr-2"></i>Set Category for <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+
+    <div class="modal-body">
+
+
+
+        <div class="form-group">
+            <label>Category</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-layer-group"></i></span>
                 </div>
-            </div>
+                <select class="form-control select2" name="bulk_category">
+                    <option value="0">- Uncategorized -</option>
+                    <?php
+                    $sql_categories = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Ticket' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql_categories)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_ticket_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Bulk Edit</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-            </div>
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                    <?php } ?>
 
+                </select>
+            </div>
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_ticket_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set</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/agent/modals/ticket/ticket_bulk_edit_priority.php b/agent/modals/ticket/ticket_bulk_edit_priority.php
index ac9dd9d7..682232e4 100644
--- a/agent/modals/ticket/ticket_bulk_edit_priority.php
+++ b/agent/modals/ticket/ticket_bulk_edit_priority.php
@@ -1,36 +1,49 @@
-<div class="modal" id="bulkEditPriorityTicketModal" 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-thermometer-half mr-2"></i>Bulk Editing Priority:</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-                
-            <div class="modal-body">
+<?php
 
-                <div class="form-group">
-                    <label>Priority</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                        </div>
-                        <select class="form-control select2" name="bulk_priority">
-                            <option>Low</option>
-                            <option>Medium</option>
-                            <option>High</option>
-                        </select>
-                    </div>
-                </div>
+require_once '../../../includes/modal_header.php';
 
-            </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-            <div class="modal-footer">
-                <button type="submit" name="bulk_edit_ticket_priority" 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>
+$count = count($selected_ids);
 
-        </div>
-    </div>
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Set Priority for <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Priority</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                </div>
+                <select class="form-control select2" name="bulk_priority">
+                    <option>Low</option>
+                    <option>Medium</option>
+                    <option>High</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="bulk_edit_ticket_priority" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Set Priority</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';
\ No newline at end of file
diff --git a/agent/modals/ticket/ticket_bulk_merge.php b/agent/modals/ticket/ticket_bulk_merge.php
index 2be22401..9a4bef12 100644
--- a/agent/modals/ticket/ticket_bulk_merge.php
+++ b/agent/modals/ticket/ticket_bulk_merge.php
@@ -1,69 +1,77 @@
-<div class="modal" id="bulkMergeTicketModal" tabindex="-1">
-    <div class="modal-dialog modal-md">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Bulk merge & close tickets</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <input type="hidden" id="current_ticket_id" value="0"> <!-- Can't currently bulk check this -->
-            <input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
-            <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <label>Ticket number to merge tickets into <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <?php
-                            // Show the ticket prefix, or just the tag icon
-                            if (empty($ticket_prefix)) {
-                                echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
-                            } else {
-                                echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
-                            }
-                            ?>
-                        </div>
-                        <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" onfocusout="merge_into_number_get_details()">
-                        <!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
-                    </div>
-                </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                <div class="form-group">
-                    <label>Reason for merge <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="merge_comment" placeholder="Comments">
-                    </div>
-                </div>
+$count = count($selected_ids);
 
-                <div class="alert alert-dark" role="alert">
-                    <i>Selected tickets will be closed once merging is complete.</i>
-                </div>
+ob_start();
 
-
-                <hr>
-                <div class="form-group" id="merge_into_details_div" hidden>
-                    <h5 id="merge_into_details_number"></h5>
-                    <p id="merge_into_details_client"></p>
-                    <p id="merge_into_details_subject"></p>
-                    <p id="merge_into_details_priority"></p>
-                    <p id="merge_into_details_status"></p>
-                </div>
-
-            </div>
-            <div class="modal-footer">
-                <button type="submit" id="merge_ticket_btn" name="bulk_merge_tickets" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
-            </div>
-
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & close <strong><?= $count ?></strong>tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    <input type="hidden" id="current_ticket_id" value="0"> <!-- Can't currently bulk check this -->
+    <input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Ticket number to merge tickets into <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <?php
+                    // Show the ticket prefix, or just the tag icon
+                    if (empty($ticket_prefix)) {
+                        echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
+                    } else {
+                        echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
+                    }
+                    ?>
+                </div>
+                <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" onfocusout="merge_into_number_get_details()">
+                <!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Reason for merge <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="merge_comment" placeholder="Comments">
+            </div>
+        </div>
+
+        <div class="alert alert-dark" role="alert">
+            <i>Selected tickets will be closed once merging is complete.</i>
+        </div>
+
+
+        <hr>
+        <div class="form-group" id="merge_into_details_div" hidden>
+            <h5 id="merge_into_details_number"></h5>
+            <p id="merge_into_details_client"></p>
+            <p id="merge_into_details_subject"></p>
+            <p id="merge_into_details_priority"></p>
+            <p id="merge_into_details_status"></p>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" id="merge_ticket_btn" name="bulk_merge_tickets" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
+    </div>
+</form>
+
 <!-- Ticket merge JS -->
-<script src="js/ticket_merge.js"></script>
+<script src="/agent/js/ticket_merge.js"></script>
diff --git a/agent/modals/ticket/ticket_bulk_reply.php b/agent/modals/ticket/ticket_bulk_reply.php
index 3a375aff..e4659d95 100644
--- a/agent/modals/ticket/ticket_bulk_reply.php
+++ b/agent/modals/ticket/ticket_bulk_reply.php
@@ -1,60 +1,73 @@
-<div class="modal" id="bulkReplyTicketModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
+
+$count = count($selected_ids);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-paper-plane mr-2"></i>Update & Reply <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    <input type="hidden" name="bulk_private_reply" value="0">
+
+    <div class="modal-body">
+        <div class="input-group mb-3">
+            <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
             </div>
-            <div class="modal-body">
 
-                <input type="hidden" name="bulk_private_reply" value="0">
+            <select class="form-control select2" name="bulk_status" required>
 
-                <div class="input-group mb-3">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                    </div>
+                <!-- Show all active ticket statuses, apart from new or closed as these are system-managed -->
+                <?php $sql_ticket_status = mysqli_query($mysqli, "SELECT * FROM ticket_statuses WHERE ticket_status_id != 1 AND ticket_status_id != 5 AND ticket_status_active = 1");
+                while ($row = mysqli_fetch_array($sql_ticket_status)) {
+                    $ticket_status_id_select = intval($row['ticket_status_id']);
+                    $ticket_status_name_select = nullable_htmlentities($row['ticket_status_name']); ?>
 
-                    <select class="form-control select2" name="bulk_status" required>
+                    <option value="<?php echo $ticket_status_id_select ?>"> <?php echo $ticket_status_name_select ?> </option>
 
-                        <!-- Show all active ticket statuses, apart from new or closed as these are system-managed -->
-                        <?php $sql_ticket_status = mysqli_query($mysqli, "SELECT * FROM ticket_statuses WHERE ticket_status_id != 1 AND ticket_status_id != 5 AND ticket_status_active = 1");
-                        while ($row = mysqli_fetch_array($sql_ticket_status)) {
-                            $ticket_status_id_select = intval($row['ticket_status_id']);
-                            $ticket_status_name_select = nullable_htmlentities($row['ticket_status_name']); ?>
+                <?php } ?>
+            </select>
 
-                            <option value="<?php echo $ticket_status_id_select ?>"> <?php echo $ticket_status_name_select ?> </option>
+        </div>
 
-                        <?php } ?>
-                    </select>
+        <div class="form-group">
+            <textarea class="form-control tinymce" rows="5" name="bulk_reply_details" placeholder="Type an update here"></textarea>
+        </div>
 
-                </div>
-
-                <div class="form-group">
-                    <textarea class="form-control tinymce" rows="5" name="bulk_reply_details" placeholder="Type an update here"></textarea>
-                </div>
-
-                <div class="col-3">
-                    <div class="form-group">
-                        <label>Time worked</label>
-                        <input class="form-control timepicker" id="time_worked" name="time" type="text" placeholder="HH:MM:SS" pattern="([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])" value="00:01:00" required/>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="bulkPrivateReplyCheckbox" name="bulk_private_reply" value="1">
-                        <label class="custom-control-label" for="bulkPrivateReplyCheckbox">Mark as internal</label>
-                        <small class="form-text text-muted">If checked this note will only be visible to agents.</small>
-                    </div>
-                </div>
-
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_ticket_reply" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Reply</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+        <div class="col-3">
+            <div class="form-group">
+                <label>Time worked</label>
+                <input class="form-control timepicker" id="time_worked" name="time" type="text" placeholder="HH:MM:SS" pattern="([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])" value="00:01:00" required/>
             </div>
         </div>
+
+        <div class="form-group">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="bulkPrivateReplyCheckbox" name="bulk_private_reply" value="1">
+                <label class="custom-control-label" for="bulkPrivateReplyCheckbox">Mark as internal</label>
+                <small class="form-text text-muted">If checked this note will only be visible to agents.</small>
+            </div>
+        </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_ticket_reply" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Update & Reply</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/agent/modals/ticket/ticket_bulk_resolve.php b/agent/modals/ticket/ticket_bulk_resolve.php
index 48b7d661..9ad983c3 100644
--- a/agent/modals/ticket/ticket_bulk_resolve.php
+++ b/agent/modals/ticket/ticket_bulk_resolve.php
@@ -1,40 +1,52 @@
-<div class="modal" id="bulkCloseTicketsModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-check mr-2"></i>Resolving Multiple Tickets</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
+<?php
 
-                <input type="hidden" name="bulk_private_note" value="0">
+require_once '../../../includes/modal_header.php';
 
-                <div class="form-group">
-                    <textarea class="form-control tinymce" rows="5" name="bulk_details" placeholder="Enter closing remarks"></textarea>
-                </div>
+$selected_ids = array_map('intval', $_GET['selected_ids'] ?? []);
 
-                <div class="col-3">
-                    <div class="form-group">
-                        <label>Time worked</label>
-                        <input class="form-control timepicker" id="time_worked" name="time" type="text" placeholder="HH:MM:SS" pattern="([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])" value="00:01:00" required/>
-                    </div>
-                </div>
+$count = count($selected_ids);
 
-                <div class="form-group">
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="bulkPrivateCheckbox" name="bulk_private_note" value="1">
-                        <label class="custom-control-label" for="bulkPrivateCheckbox">Mark as Internal</label>
-                        <small class="form-text text-muted">If checked this note will only be visible to agents. The contact / watcher will not be informed this ticket was resolved.</small>
-                    </div>
-                </div>
+ob_start();
 
-            </div>
-            <div class="modal-footer">
-                <button type="submit" name="bulk_resolve_tickets" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Resolve</button>
-                <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-check mr-2"></i>Resolve <strong><?= $count ?></strong> Tickets</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="<?= $_SESSION['csrf_token'] ?>">
+    <?php foreach ($selected_ids as $id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $id ?>"><?php } ?>
+    <input type="hidden" name="bulk_private_note" value="0">
+
+    <div class="modal-body">
+        <div class="form-group">
+            <textarea class="form-control tinymce" rows="5" name="bulk_details" placeholder="Enter closing remarks"></textarea>
+        </div>
+
+        <div class="col-3">
+            <div class="form-group">
+                <label>Time worked</label>
+                <input class="form-control timepicker" id="time_worked" name="time" type="text" placeholder="HH:MM:SS" pattern="([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])" value="00:01:00" required/>
             </div>
         </div>
+
+        <div class="form-group">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="bulkPrivateCheckbox" name="bulk_private_note" value="1">
+                <label class="custom-control-label" for="bulkPrivateCheckbox">Mark as Internal</label>
+                <small class="form-text text-muted">If checked this note will only be visible to agents. The contact / watcher will not be informed this ticket was resolved.</small>
+            </div>
+        </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="bulk_resolve_tickets" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Resolve Tickets</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/agent/project_details.php b/agent/project_details.php
index 1e283538..6334c0f3 100644
--- a/agent/project_details.php
+++ b/agent/project_details.php
@@ -194,11 +194,11 @@ if (isset($_GET['project_id'])) {
                             <i class="fas fa-fw fa-link mr-2"></i>Link
                         </button>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkTicketModal">
+                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project/project_link_ticket.php?<?= $client_url ?>project_id=<?= $project_id ?>">
                                 <i class="fas fa-fw fa-life-ring mr-2"></i>Open Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkClosedTicketModal">
+                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/project/project_link_closed_ticket.php?<?= $client_url ?>project_id=<?= $project_id ?>.php">
                                 <i class="fas fa-fw fa-life-ring mr-2"></i>Closed Ticket
                             </a>
                         </div>
@@ -294,29 +294,43 @@ if (isset($_GET['project_id'])) {
                                     <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTicketModal">
-                                        <i class="fas fa-fw fa-user-check mr-2"></i>Assign Tech
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryTicketModal">
-                                        <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityTicketModal">
-                                        <i class="fas fa-fw fa-thermometer-half mr-2"></i>Update Priority
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkReplyTicketModal">
-                                        <i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMergeTicketModal">
-                                        <i class="fas fa-fw fa-clone mr-2"></i>Merge
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkCloseTicketsModal">
-                                        <i class="fas fa-fw fa-check mr-2"></i>Resolve
-                                    </a>
+                                    <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_assign.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-user-check mr-2"></i>Assign Agent
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_edit_category.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_edit_priority.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-thermometer-half mr-2"></i>Set Priority
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_reply.php"
+                                            data-modal-size="lg"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-paper-plane mr-2"></i>Update/Reply
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_merge.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-clone mr-2"></i>Merge
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_resolve.php"
+                                            data-modal-size="lg"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-check mr-2"></i>Resolve
+                                        </a>
                                 </div>
                             </div>
                         <?php } ?>
@@ -486,12 +500,6 @@ if (isset($_GET['project_id'])) {
                                 </tbody>
                             </table>
                         </div>
-                        <?php require_once "modals/ticket/ticket_bulk_assign.php"; ?>
-                        <?php require_once "modals/ticket/ticket_bulk_edit_category.php"; ?>
-                        <?php require_once "modals/ticket/ticket_bulk_edit_priority.php"; ?>
-                        <?php require_once "modals/ticket/ticket_bulk_reply.php"; ?>
-                        <?php require_once "modals/ticket/ticket_bulk_merge.php"; ?>
-                        <?php require_once "modals/ticket/ticket_bulk_resolve.php"; ?>
                     </form>
                 </div>
             </div>
@@ -539,9 +547,6 @@ if (isset($_GET['project_id'])) {
 
 <?php
 
-require_once "modals/project/project_link_ticket.php";
-require_once "modals/project/project_link_closed_ticket.php";
-
 }
 
 require_once "../includes/footer.php";
diff --git a/agent/recurring_tickets.php b/agent/recurring_tickets.php
index 34708e79..3b20593f 100644
--- a/agent/recurring_tickets.php
+++ b/agent/recurring_tickets.php
@@ -166,27 +166,37 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <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" type="submit" form="bulkActions" name="bulk_force_recurring_tickets">
+                                <button class="dropdown-item confirm-link" type="submit" form="bulkActions" name="bulk_force_recurring_tickets">
                                     <i class="fas fa-fw fa-paper-plane mr-2"></i>Force Reoccur
                                 </button>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignAgentRecurringTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#" 
+                                    data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-user-check mr-2"></i>Assign Agent
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryRecurringTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#" 
+                                    data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_category_edit.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityRecurringTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#" 
+                                    data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-thermometer-half mr-2"></i>Set Priority
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditBillableRecurringTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#" 
+                                    data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-dollar-sign mr-2"></i>Set Billable
                                 </a>
                                 <div class="dropdown-divider"></div>
-                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditNextRunRecurringTicketModal">
+                                <a class="dropdown-item ajax-modal" href="#" 
+                                    data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php"
+                                    data-bulk="true">
                                     <i class="fas fa-fw fa-calendar-day mr-2"></i>Set Next Run Date
                                 </a>
                                 <div class="dropdown-divider"></div>
@@ -344,13 +354,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
 
                 </table>
-                <?php
-                require_once "modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php";
-                require_once "modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php";
-                require_once "modals/recurring_ticket/recurring_ticket_bulk_category_edit.php";
-                require_once "modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php";
-                require_once "modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php";
-                ?>
 
             </form>
 
diff --git a/agent/ticket_list.php b/agent/ticket_list.php
index 079a6bd8..792660f2 100644
--- a/agent/ticket_list.php
+++ b/agent/ticket_list.php
@@ -304,15 +304,7 @@
                         </tbody>
                     </table>
                 </div>
-                <?php require_once "modals/ticket/ticket_bulk_assign.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_edit_category.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_edit_priority.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_add_project.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_reply.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_merge.php"; ?>
-                <?php require_once "modals/ticket/ticket_bulk_resolve.php"; ?>
             </form>
             <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
-
diff --git a/agent/tickets.php b/agent/tickets.php
index 54f5c6c8..f6c23cec 100644
--- a/agent/tickets.php
+++ b/agent/tickets.php
@@ -261,31 +261,47 @@ $sql_categories_filter = mysqli_query(
                                         <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTicketModal">
-                                            <i class="fas fa-fw fa-user-check mr-2"></i>Assign Tech
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_assign.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-user-check mr-2"></i>Assign Agent
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditCategoryTicketModal">
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_edit_category.php"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditPriorityTicketModal">
-                                            <i class="fas fa-fw fa-thermometer-half mr-2"></i>Update Priority
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_edit_priority.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-thermometer-half mr-2"></i>Set Priority
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkReplyTicketModal">
-                                            <i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_reply.php"
+                                            data-modal-size="lg"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-paper-plane mr-2"></i>Update/Reply
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignTicketToProjectModal">
-                                            <i class="fas fa-fw fa-project-diagram mr-2"></i>Add to Project
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_add_project.php"
+                                            data-bulk="true">
+                                            <i class="fas fa-fw fa-project-diagram mr-2"></i>Set Project
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkMergeTicketModal">
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_merge.php"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-clone mr-2"></i>Merge
                                         </a>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkCloseTicketsModal">
+                                        <a class="dropdown-item ajax-modal" href="#" 
+                                            data-modal-url="modals/ticket/ticket_bulk_resolve.php"
+                                            data-modal-size="lg"
+                                            data-bulk="true">
                                             <i class="fas fa-fw fa-check mr-2"></i>Resolve
                                         </a>
                                         <?php if (lookupUserPermission("module_support") === 3) { ?>