diff --git a/agent/document_details.php b/agent/document_details.php
index 45dd35b4..2888dc19 100644
--- a/agent/document_details.php
+++ b/agent/document_details.php
@@ -202,7 +202,8 @@ $page_title = $row['document_name'];
             <h5 class="mb-3"><i class="fas fa-tags mr-2"></i>Related Items</h5>
             <h6>
                 <i class="fas fa-fw fa-paperclip text-secondary mr-2"></i>Files
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkFileToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_file.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -224,9 +225,9 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="files.php?client_id=<?php echo $client_id; ?>&folder_id=<?php echo $folder_id; ?>&q=<?php echo $file_name; ?>" target="_blank"><?php echo $file_name; ?></a>
-                    <a class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?php echo $file_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary float-right"></i>
+                    <a href="files.php?client_id=<?= $client_id ?>&folder_id=<?= $folder_id ?>&q=<?= $file_name ?>" target="_blank"><?= $file_name ?></a>
+                    <a class="confirm-link" href="post.php?unlink_file_from_document&file_id=<?= $file_id ?>&document_id=<?= $document_id ?>">
+                        <i class="fas fa-fw fa-unlink text-secondary float-right" title="Unlink File"></i>
                     </a>
                 </div>
                 <?php
@@ -234,7 +235,8 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-users text-secondary mt-3 mr-2"></i>Contacts
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkContactToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_contact.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -260,7 +262,7 @@ $page_title = $row['document_name'];
                         data-modal-url="modals/contact/contact_details.php?id=<?= $contact_id ?>">
                         <?php echo $contact_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_contact_from_document&contact_id=<?php echo $contact_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Contact"></i>
                     </a>
                 </div>
                 <?php
@@ -268,7 +270,7 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-laptop text-secondary mr-2 mt-3"></i>Assets
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkAssetToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal" data-modal-url="modals/document/document_link_asset.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -295,7 +297,7 @@ $page_title = $row['document_name'];
                         <?php echo $asset_name; ?>
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Asset"></i>
                     </a>
                 </div>
             <?php
@@ -303,7 +305,8 @@ $page_title = $row['document_name'];
             ?>
             <h6>
                 <i class="fas fa-fw fa-cube text-secondary mr-2 mt-3"></i>Licenses
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkSoftwareToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_software.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -326,7 +329,7 @@ $page_title = $row['document_name'];
                 <div class="ml-2">
                     <a href="software.php?client_id=<?php echo $client_id; ?>&q=<?php echo $software_name; ?>" target="_blank"><?php echo $software_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_software_from_document&software_id=<?php echo $software_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink License"></i>
                     </a>
                 </div>
                 <?php
@@ -334,7 +337,8 @@ $page_title = $row['document_name'];
                 ?>
             <h6>
                 <i class="fas fa-fw fa-building text-secondary mr-2 mt-3"></i>Vendors
-                <button type="button" class="btn btn-link btn-sm" data-toggle="modal" data-target="#linkVendorToDocumentModal">
+                <button type="button" class="btn btn-link btn-sm ajax-modal"
+                    data-modal-url="modals/document/document_link_vendor.php?document_id=<?= $document_id ?>">
                     <i class="fas fa-fw fa-plus"></i>
                 </button>
             </h6>
@@ -359,7 +363,7 @@ $page_title = $row['document_name'];
                         <?php echo $vendor_name; ?>
                     </a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
-                        <i class="fas fa-fw fa-trash-alt text-secondary"></i>
+                        <i class="fas fa-fw fa-unlink text-secondary" title="Unlink Vendor"></i>
                     </a>
                 </div>
             <?php
@@ -372,7 +376,8 @@ $page_title = $row['document_name'];
                 <h6><i class="fas fa-handshake mr-2"></i>Portal Collaboration</h6>
                 <div class="mt-1">
                     <i class="fa fa-fw fa-eye<?php if (!$document_client_visible) { echo '-slash'; } ?> text-secondary mr-2"></i>Document is
-                    <a href="#" data-toggle="modal" data-target="#editDocumentClientVisibileModal">
+                    <a class="ajax-modal" href="#"
+                        data-modal-url="modals/document/document_edit_visibility.php?document_id=<?= $document_id ?>">
                         <?php
                         if ($document_client_visible) {
                             echo "<span class='text-bold text-dark'>visible</span>";
@@ -427,11 +432,5 @@ $page_title = $row['document_name'];
 
 <?php
 
-require_once "modals/document/document_link_file.php";
-require_once "modals/document/document_link_contact.php";
-require_once "modals/document/document_link_asset.php";
-require_once "modals/document/document_link_software.php";
-require_once "modals/document/document_link_vendor.php";
-require_once "modals/document/document_edit_visibility.php";
 require_once "modals/share_modal.php";
 require_once "../includes/footer.php";
diff --git a/agent/modals/asset/asset_link_document.php b/agent/modals/asset/asset_link_document.php
index d90b15ba..7344d20f 100644
--- a/agent/modals/asset/asset_link_document.php
+++ b/agent/modals/asset/asset_link_document.php
@@ -37,15 +37,15 @@ ob_start();
                     <option value="">- Select a Document -</option>
                     <?php
                     $sql_documents_select = mysqli_query($mysqli, "
-                        SELECT documents.document_id, documents.document_name
+                        SELECT documents.document_id, document_name
                         FROM documents
                         LEFT JOIN asset_documents
-                        ON documents.document_id = asset_documents.document_id
-                        AND asset_documents.asset_id = $asset_id
-                        WHERE documents.document_client_id = $client_id
-                        AND documents.document_archived_at IS NULL
+                            ON documents.document_id = asset_documents.document_id
+                            AND asset_documents.asset_id = $asset_id
+                        WHERE document_client_id = $client_id
+                        AND document_archived_at IS NULL
                         AND asset_documents.asset_id IS NULL
-                        ORDER BY documents.document_name ASC
+                        ORDER BY document_name ASC
                     ");
                     while ($row = mysqli_fetch_array($sql_documents_select)) {
                         $document_id = intval($row['document_id']);
@@ -67,4 +67,3 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
-?>
diff --git a/agent/modals/document/document_edit_visibility.php b/agent/modals/document/document_edit_visibility.php
index cb5ac667..2234a6fc 100644
--- a/agent/modals/document/document_edit_visibility.php
+++ b/agent/modals/document/document_edit_visibility.php
@@ -1,42 +1,57 @@
-<div class="modal" id="editDocumentClientVisibileModal" 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-handshake mr-2"></i>
-                    Edit Visibility Status for <strong><?php echo "$document_name"; ?></strong>
-                </h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$document_client_visible = intval($row['document_client_visible']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title">
+        <i class="fa fa-fw fa-handshake mr-2"></i>
+        Edit Visibility Status for <strong><?= $document_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">
+    <div class="modal-body">
+        <input type="hidden" name="document_id" value="<?= $document_id ?>">
+        <div class="form-group">
+            <label>Visibility</label>
+            <p>Should this document be visible in the portal to client contacts with the 'Technical' role?</p>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+                <select class="form-control" name="document_visible">
+                    <option <?php if ($document_client_visible == 1) { echo "selected"; } ?> value="1">Yes</option>
+                    <option <?php if ($document_client_visible == 0) { echo "selected"; } ?> value="0">No</option>
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
-                    <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                    <div class="form-group">
-                        <label>Visibility</label>
-                        <p>Should this document be visible in the portal to client contacts with the 'Technical' role?</p>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                            </div>
-                            <select class="form-control" name="document_visible">
-                                <option <?php if ($document_client_visible == 1) { echo "selected"; } ?> value="1">Yes</option>
-                                <option <?php if ($document_client_visible == 0) { echo "selected"; } ?> value="0">No</option>
-                            </select>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="toggle_document_visibility" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-
-            </form>
 
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="toggle_document_visibility" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save changes</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/document/document_link_asset.php b/agent/modals/document/document_link_asset.php
index 9876114a..b8eca7b6 100644
--- a/agent/modals/document/document_link_asset.php
+++ b/agent/modals/document/document_link_asset.php
@@ -1,57 +1,69 @@
-<div class="modal" id="linkAssetToDocumentModal" 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>Link Asset to <strong><?php echo $document_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?= $document_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="document_id" value="<?= $document_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <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_id">
+                    <option value="">- Select an Asset -</option>
+                    <?php
+                    $sql_assets_select = mysqli_query($mysqli, "
+                        SELECT assets.asset_id, asset_name
+                        FROM assets
+                        LEFT JOIN asset_documents
+                            ON assets.asset_id = asset_documents.asset_id
+                            AND asset_documents.document_id = $document_id
+                        WHERE asset_client_id = $client_id
+                        AND asset_archived_at IS NULL
+                        AND asset_documents.asset_id IS NULL
+                        ORDER BY asset_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_assets_select)) {
+                        $asset_id = intval($row['asset_id']);
+                        $asset_name = nullable_htmlentities($row['asset_name']);
+
+                        ?>
+                        <option value="<?= $asset_id ?>"><?= $asset_name ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <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_id">
-                                <option value="">- Select an Asset -</option>
-                                <?php
-                                // Check if there are any associated vendors
-                                if (!empty($linked_assets)) {
-                                    $excluded_asset_ids = implode(",", $linked_assets);
-                                    $exclude_condition = "AND asset_id NOT IN ($excluded_asset_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
-                                }
-
-                                $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets
-                                    WHERE asset_client_id = $client_id 
-                                    AND asset_archived_at IS NULL
-                                    $exclude_condition
-                                    ORDER BY asset_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_assets_select)) {
-                                    $asset_id = intval($row['asset_id']);
-                                    $asset_name = nullable_htmlentities($row['asset_name']);
-
-                                    ?>
-                                    <option value="<?php echo $asset_id ?>"><?php echo $asset_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/document/document_link_contact.php b/agent/modals/document/document_link_contact.php
index e2139547..07d715c9 100644
--- a/agent/modals/document/document_link_contact.php
+++ b/agent/modals/document/document_link_contact.php
@@ -1,57 +1,70 @@
-<div class="modal" id="linkContactToDocumentModal" 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 mr-2"></i>Link Contact to <strong><?php echo $document_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Contact to <strong><?= $document_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="document_id" value="<?= $document_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <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="contact_id">
+                    <option value="">- Select a Contact -</option>
+                    <?php
+                    $sql_contacts_select = mysqli_query($mysqli, "
+                        SELECT contacts.contact_id, contact_name
+                        FROM contacts
+                        LEFT JOIN contact_documents
+                            ON contacts.contact_id = contact_documents.contact_id
+                            AND contact_documents.document_id = $document_id
+                        WHERE contact_client_id = $client_id
+                        AND contact_archived_at IS NULL
+                        AND contact_documents.contact_id IS NULL
+                        ORDER BY contact_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_contacts_select)) {
+                        $contact_id = intval($row['contact_id']);
+                        $contact_name = nullable_htmlentities($row['contact_name']);
+
+                        ?>
+                        <option value="<?= $contact_id ?>"><?= $contact_name ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <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="contact_id">
-                                <option value="">- Select a Contact -</option>
-                                <?php
-                                // Check if there are any associated vendors
-                                if (!empty($linked_contacts)) {
-                                    $excluded_contact_ids = implode(",", $linked_contacts);
-                                    $exclude_condition = "AND contact_id NOT IN ($excluded_contact_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
-                                }
-
-                                $sql_contacts_select = mysqli_query($mysqli, "SELECT * FROM contacts
-                                    WHERE contact_client_id = $client_id 
-                                    AND contact_archived_at IS NULL
-                                    $exclude_condition
-                                    ORDER BY contact_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_contacts_select)) {
-                                    $contact_id = intval($row['contact_id']);
-                                    $contact_name = nullable_htmlentities($row['contact_name']);
-
-                                    ?>
-                                    <option value="<?php echo $contact_id ?>"><?php echo $contact_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link 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/document/document_link_file.php b/agent/modals/document/document_link_file.php
index 96690548..213099b7 100644
--- a/agent/modals/document/document_link_file.php
+++ b/agent/modals/document/document_link_file.php
@@ -1,47 +1,73 @@
-<div class="modal" id="linkFileToDocumentModal" 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-paperclip mr-2"></i>Link File to <strong><?php echo $document_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?= $document_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="document_id" value="<?= $document_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-paperclip"></i></span>
+                </div>
+                <select class="form-control select2" name="file_id">
+                    <option value="">- Select a File -</option>
+                    <?php
+                    $sql_files_select = mysqli_query($mysqli, "
+                        SELECT files.file_id, file_name, folder_name
+                        FROM files
+                        LEFT JOIN folders
+                            ON folder_id = file_folder_id
+                        LEFT JOIN document_files
+                            ON files.file_id = document_files.file_id
+                            AND document_files.document_id = $document_id
+                        WHERE file_client_id = $client_id
+                        AND file_archived_at IS NULL
+                        AND document_files.file_id IS NULL
+                        ORDER BY folder_name ASC, file_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_files_select)) {
+                        $file_id = intval($row['file_id']);
+                        $file_name = nullable_htmlentities($row['file_name']);
+                        $folder_name = nullable_htmlentities($row['folder_name']);
+
+                        ?>
+                        <option value="<?php echo $file_id ?>"><?php echo "$folder_name/$file_name"; ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-paperclip"></i></span>
-                            </div>
-                            <select class="form-control select2" name="file_id">
-                                <option value="">- Select a File -</option>
-                                <?php
-                                $sql_files_select = mysqli_query($mysqli, "SELECT * FROM files 
-                                    LEFT JOIN folders ON folder_id = file_folder_id
-                                    WHERE file_client_id = $client_id ORDER BY folder_name ASC, file_name ASC");
-                                while ($row = mysqli_fetch_array($sql_files_select)) {
-                                    $file_id = intval($row['file_id']);
-                                    $file_name = nullable_htmlentities($row['file_name']);
-                                    $folder_name = nullable_htmlentities($row['folder_name']);
-
-                                    ?>
-                                    <option value="<?php echo $file_id ?>"><?php echo "$folder_name/$file_name"; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="link_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="link_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link File</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/document/document_link_software.php b/agent/modals/document/document_link_software.php
index 1ca2f6fb..d0474485 100644
--- a/agent/modals/document/document_link_software.php
+++ b/agent/modals/document/document_link_software.php
@@ -1,57 +1,71 @@
-<div class="modal" id="linkSoftwareToDocumentModal" 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 mr-2"></i>Link Software to <strong><?php echo $document_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Software to <strong><?= $document_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="document_id" value="<?= $document_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-box-open"></i></span>
+                </div>
+                <select class="form-control select2" name="software_id">
+                    <option value="">- Select a License -</option>
+                    <?php
+                    $sql_software_select = mysqli_query($mysqli, "
+                        SELECT software.software_id, software_name
+                        FROM software
+                        LEFT JOIN software_documents
+                            ON software.software_id = software_documents.software_id
+                            AND software_documents.document_id = $document_id
+                        WHERE software_client_id = $client_id
+                        AND software_archived_at IS NULL
+                        AND software_documents.software_id IS NULL
+                        ORDER BY software_name ASC
+                    ");
+
+                    while ($row = mysqli_fetch_array($sql_software_select)) {
+                        $software_id = intval($row['software_id']);
+                        $software_name = nullable_htmlentities($row['software_name']);
+
+                        ?>
+                        <option value="<?= $software_id ?>"><?= $software_name ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-box-open"></i></span>
-                            </div>
-                            <select class="form-control select2" name="software_id">
-                                <option value="">- Select a License -</option>
-                                <?php
-                                // Check if there are any associated vendors
-                                if (!empty($linked_software)) {
-                                    $excluded_software_ids = implode(",", $linked_software);
-                                    $exclude_condition = "AND software_id NOT IN ($excluded_software_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
-                                }
-
-                                $sql_software_select = mysqli_query($mysqli, "SELECT software_id, software_name FROM software
-                                    WHERE software_client_id = $client_id 
-                                    AND software_archived_at IS NULL
-                                    $exclude_condition
-                                    ORDER BY software_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_software_select)) {
-                                    $software_id = intval($row['software_id']);
-                                    $software_name = nullable_htmlentities($row['software_name']);
-
-                                    ?>
-                                    <option value="<?php echo $software_id ?>"><?php echo $software_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="link_software_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="link_software_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link License</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/document/document_link_vendor.php b/agent/modals/document/document_link_vendor.php
index b7af9b00..ea5079dc 100644
--- a/agent/modals/document/document_link_vendor.php
+++ b/agent/modals/document/document_link_vendor.php
@@ -1,57 +1,70 @@
-<div class="modal" id="linkVendorToDocumentModal" 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-building mr-2"></i>Link Vendor to <strong><?php echo $document_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$document_id = intval($_GET['document_id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM documents
+    WHERE document_id = $document_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$document_name = nullable_htmlentities($row['document_name']);
+$client_id = intval($row['document_client_id']);
+
+ob_start();
+
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>Link Vendor to <strong><?= $document_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="document_id" value="<?= $document_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                </div>
+                <select class="form-control select2" name="vendor_id">
+                    <option value="">- Select a Vendor -</option>
+                    <?php
+                    $sql_vendors_select = mysqli_query($mysqli, "
+                        SELECT vendors.vendor_id, vendor_name
+                        FROM vendors
+                        LEFT JOIN vendor_documents
+                            ON vendors.vendor_id = vendor_documents.vendor_id
+                            AND vendor_documents.document_id = $document_id
+                        WHERE vendor_client_id = $client_id
+                        AND vendor_archived_at IS NULL
+                        AND vendor_documents.vendor_id IS NULL
+                        ORDER BY vendor_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_vendors_select)) {
+                        $vendor_id = intval($row['vendor_id']);
+                        $vendor_name = nullable_htmlentities($row['vendor_name']);
+
+                        ?>
+                        <option value="<?= $vendor_id ?>"><?= $vendor_name ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                            </div>
-                            <select class="form-control select2" name="vendor_id">
-                                <option value="">- Select a Vendor -</option>
-                                <?php
-                                // Check if there are any associated vendors
-                                if (!empty($associated_vendors)) {
-                                    $excluded_vendor_ids = implode(",", $associated_vendors);
-                                    $exclude_condition = "AND vendor_id NOT IN ($excluded_vendor_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
-                                }
-
-                                $sql_vendors_select = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors 
-                                    WHERE vendor_client_id = $client_id 
-                                    AND vendor_archived_at IS NULL
-                                    $exclude_condition
-                                    ORDER BY vendor_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_vendors_select)) {
-                                    $vendor_id = intval($row['vendor_id']);
-                                    $vendor_name = nullable_htmlentities($row['vendor_name']);
-
-                                    ?>
-                                    <option value="<?php echo $vendor_id ?>"><?php echo $vendor_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="link_vendor_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="link_vendor_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link Vendor</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';