diff --git a/agent/calendar.php b/agent/calendar.php
index 75356d69..c8891783 100644
--- a/agent/calendar.php
+++ b/agent/calendar.php
@@ -106,7 +106,7 @@ while ($row = mysqli_fetch_array($sql)) {
 <?php require_once "../includes/footer.php";
 ?>
 
-<script src='../plugins/fullcalendar/dist/index.global.js'></script>
+<script src='/plugins/fullcalendar/dist/index.global.js'></script>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
diff --git a/agent/modals/ticket/ticket_edit_asset.php b/agent/modals/ticket/ticket_edit_asset.php
index a1c87d87..dc68c8eb 100644
--- a/agent/modals/ticket/ticket_edit_asset.php
+++ b/agent/modals/ticket/ticket_edit_asset.php
@@ -1,51 +1,111 @@
-<div class="modal" id="editTicketAssetModal<?php echo $ticket_id; ?>" 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-desktop mr-2"></i>Editing ticket Asset: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></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="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Asset</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-                            </div>
-                            <select class="form-control select2" name="asset">
-                                <option value="0">- None -</option>
-                                <?php
+require_once '../../../includes/modal_header.php';
 
-                                $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-                                while ($row = mysqli_fetch_array($sql_assets)) {
-                                    $asset_id_select = intval($row['asset_id']);
-                                    $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                    $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
-                                    ?>
-                                    <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
+$ticket_id = intval($_GET['id']);
 
-                                    <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON client_id = ticket_client_id WHERE ticket_id = $ticket_id LIMIT 1");
 
-                    </div>
+$row = mysqli_fetch_array($sql);
+$client_id = intval($row['client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_category = intval($row['ticket_category']);
+$ticket_subject = nullable_htmlentities($row['ticket_subject']);
+$ticket_details = nullable_htmlentities($row['ticket_details']);
+$ticket_priority = nullable_htmlentities($row['ticket_priority']);
+$ticket_billable = intval($row['ticket_billable']);
+$ticket_vendor_ticket_number = nullable_htmlentities($row['ticket_vendor_ticket_number']);
+$ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
+$ticket_due_at = nullable_htmlentities($row['ticket_due_at']);
+$ticket_assigned_to = intval($row['ticket_assigned_to']);
+$contact_id = intval($row['ticket_contact_id']);
+$asset_id = intval($row['ticket_asset_id']);
+$location_id = intval($row['ticket_location_id']);
+$vendor_id = intval($row['ticket_vendor_id']);
+$project_id = intval($row['ticket_project_id']);
 
-                </div>
+// Additional Assets Selected
+$additional_assets_array = array();
+$sql_additional_assets = mysqli_query($mysqli, "SELECT asset_id FROM ticket_assets WHERE ticket_id = $ticket_id");
+while ($row = mysqli_fetch_array($sql_additional_assets)) {
+    $additional_asset_id = intval($row['asset_id']);
+    $additional_assets_array[] = $additional_asset_id;
+}
 
-                <div class="modal-footer">
-                    <button type="submit" name="edit_ticket_asset" 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>
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
 
-            </form>
-
-        </div>
-    </div>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Editing ticket Asset: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong> - <?php echo $client_name; ?></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="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Asset</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                </div>
+                <select class="form-control select2" name="asset">
+                    <option value="0">- None -</option>
+                    <?php
+
+                    $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                    while ($row = mysqli_fetch_array($sql_assets)) {
+                        $asset_id_select = intval($row['asset_id']);
+                        $asset_name_select = nullable_htmlentities($row['asset_name']);
+                        $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
+                        ?>
+                        <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Additional Assets</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                </div>
+                <select class="form-control select2" name="additional_assets[]" data-tags="true" data-placeholder="- Select Additional Assets -" multiple>
+                    <option value=""></option>
+                    <?php
+
+                    $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_id != $asset_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                    while ($row = mysqli_fetch_array($sql_assets)) {
+                        $asset_id_select = intval($row['asset_id']);
+                        $asset_name_select = nullable_htmlentities($row['asset_name']);
+                        $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
+                    ?>
+                        <option value="<?php echo $asset_id_select; ?>" 
+                            <?php if (in_array($asset_id_select, $additional_assets_array)) { echo "selected"; } ?>
+                            ><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="edit_ticket_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/post/ticket.php b/agent/post/ticket.php
index 81684fd7..bbe55b50 100644
--- a/agent/post/ticket.php
+++ b/agent/post/ticket.php
@@ -571,6 +571,19 @@ if (isset($_POST['edit_ticket_asset'])) {
 
     mysqli_query($mysqli, "UPDATE tickets SET ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id");
 
+    // Add Additional Assets
+    if (isset($_POST['additional_assets'])) {
+        mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id");
+        foreach ($_POST['additional_assets'] as $additional_asset) {
+            $additional_asset_id = intval($additional_asset);
+            mysqli_query($mysqli, "INSERT INTO ticket_assets SET ticket_id = $ticket_id, asset_id = $additional_asset_id");
+        }
+    } else {
+        // If no additional assets are provided, delete them all
+        // This handles cases where the assets input might be cleared or not set at all.
+        mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id");
+    }
+
     // Get ticket / asset details for logging
     $sql = mysqli_query($mysqli, "SELECT asset_name, ticket_prefix, ticket_number, ticket_status_name, ticket_client_id FROM assets 
         LEFT JOIN tickets ON ticket_asset_id = asset_id
diff --git a/agent/ticket.php b/agent/ticket.php
index 083f4ea5..383bfeb1 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -437,7 +437,7 @@ if (isset($_GET['ticket_id'])) {
                                                 data-modal-url="modals/ticket/ticket_contact.php?id=<?= $ticket_id ?>">
                                                 <i class="fa fa-fw fa-user mr-2"></i>Add Contact
                                             </a>
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketAssetModal<?php echo $ticket_id; ?>">
+                                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
                                                 <i class="fas fa-fw fa-desktop mr-2"></i>Add Asset
                                             </a>
                                             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketVendorModal<?php echo $ticket_id; ?>">
@@ -1124,7 +1124,7 @@ if (isset($_GET['ticket_id'])) {
                             <h5 class="card-title"><i class="fas fa-fw fa-desktop mr-2 mt-2"></i>Primary Asset</h5>
                             <div class="card-tools">
                                 <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm" href="#" data-toggle="modal" data-target="#editTicketAssetModal<?php echo $ticket_id; ?>">
+                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
                                         <i class="fas fa-edit"></i>
                                     </a>
                                 <?php } ?>
@@ -1255,7 +1255,6 @@ if (isset($_GET['ticket_id'])) {
 
         <?php
         if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
-            require_once "modals/ticket/ticket_edit_asset.php";
             require_once "modals/ticket/ticket_edit_vendor.php";
             require_once "modals/ticket/ticket_add_watcher.php";
             require_once "modals/ticket/ticket_change_client.php";
@@ -1292,7 +1291,7 @@ require_once "../includes/footer.php";
     </div>
 </div>
 
-<script src="../js/show_modals.js"></script>
+<script src="/js/show_modals.js"></script>
 
 <?php if (empty($ticket_closed_at)) { ?>
     <!-- create js variable related to ticket timer setting -->
@@ -1307,7 +1306,7 @@ require_once "../includes/footer.php";
     <script src="js/ticket_collision_detection.js"></script>
 <?php } ?>
 
-<script src="../js/pretty_content.js"></script>
+<script src="/js/pretty_content.js"></script>
 
 <script>
     $('#summaryModal').on('shown.bs.modal', function (e) {
@@ -1326,7 +1325,7 @@ require_once "../includes/footer.php";
     });
 </script>
 
-<script src="../plugins/SortableJS/Sortable.min.js"></script>
+<script src="/plugins/SortableJS/Sortable.min.js"></script>
 <script>
 new Sortable(document.querySelector('table#tasks tbody'), {
     handle: '.drag-handle',
diff --git a/includes/header.php b/includes/header.php
index efbecaa2..2a9a49d6 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -27,14 +27,14 @@ header("X-Frame-Options: DENY");
     <link rel="stylesheet" href="/plugins/fontawesome-free/css/all.min.css">
 
     <!-- Custom Styles -->
-    <link href="/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-    <link href="/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-    <link href="/plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
-    <link href="/plugins/toastr/toastr.min.css" rel="stylesheet">
-    <link href="/plugins/DataTables/datatables.min.css" rel="stylesheet">
-    <link href="/plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
-    <link href="/css/itflow_custom.css" rel="stylesheet">
+    <link rel="stylesheet" href="/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" >
+    <link rel="stylesheet" href="/plugins/select2/css/select2.min.css">
+    <link rel="stylesheet" href="/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
+    <link rel="stylesheet" href="/plugins/daterangepicker/daterangepicker.css">
+    <link rel="stylesheet" href="/plugins/toastr/toastr.min.css">
+    <link rel="stylesheet" href="/plugins/DataTables/datatables.min.css">
+    <link rel="stylesheet" href="/plugins/intl-tel-input/css/intlTelInput.min.css">
+    <link rel="stylesheet" href="/css/itflow_custom.css">
     <link rel="stylesheet" href="/plugins/adminlte/css/adminlte.min.css">
 
     <!-- Scripts -->