diff --git a/agent/asset_details.php b/agent/asset_details.php
index 2ade057b..ef36b501 100644
--- a/agent/asset_details.php
+++ b/agent/asset_details.php
@@ -4,7 +4,7 @@
 if (isset($_GET['client_id'])) {
     require_once "includes/inc_all_client.php";
     $client_query = "AND asset_client_id = $client_id";
-    $client_url = "AND client_id=$client_id&";
+    $client_url = "client_id=$client_id&";
 } else {
     require_once "includes/inc_client_overview_all.php";
     $client_query = '';
@@ -369,7 +369,7 @@ if (isset($_GET['asset_id'])) {
                                 <i class="fa fa-fw fa-recycle mr-2"></i>New Recurring Ticket
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-key mr-2"></i>New Credential
                             </a>
                             <div class="dropdown-divider"></div>
@@ -1227,7 +1227,6 @@ if (isset($_GET['asset_id'])) {
     require_once "modals/asset/asset_interface_export.php";
     require_once "modals/ticket/ticket_add.php";
     require_once "modals/recurring_ticket/recurring_ticket_add.php";
-    require_once "modals/credential/credential_add.php";
     require_once "modals/document/document_add.php";
     require_once "modals/file/file_upload.php";
 
diff --git a/agent/certificates.php b/agent/certificates.php
index b1147b79..3e676490 100644
--- a/agent/certificates.php
+++ b/agent/certificates.php
@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/certificate/certificate_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Certificate</button>
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
@@ -303,11 +303,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/certificate/certificate_add.php";
 require_once "modals/certificate/certificate_export.php";
 ?>
 
 <script src="../js/bulk_actions.js"></script>
-<script src="js/certificate_fetch_ssl.js"></script>
 
-<?php require_once "../includes/footer.php";
\ No newline at end of file
+<?php require_once "../includes/footer.php";
diff --git a/agent/contact_details.php b/agent/contact_details.php
index a3420b8c..11d40f58 100644
--- a/agent/contact_details.php
+++ b/agent/contact_details.php
@@ -274,7 +274,7 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-desktop mr-2"></i>New Asset
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addCredentialModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-key mr-2"></i>New Credential
                         </a>
                         <div class="dropdown-divider"></div>
@@ -1182,7 +1182,6 @@ if (isset($_GET['contact_id'])) {
 
 require_once "modals/ticket/ticket_add.php";
 require_once "modals/recurring_ticket/recurring_ticket_add.php";
-require_once "modals/credential/credential_add.php";
 require_once "modals/document/document_add.php";
 require_once "modals/file/file_upload.php";
 
diff --git a/agent/credentials.php b/agent/credentials.php
index 5589bd51..a26820aa 100644
--- a/agent/credentials.php
+++ b/agent/credentials.php
@@ -106,7 +106,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
             <?php if (lookupUserPermission("module_credential") >= 2) { ?>
                 <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCredentialModal" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/credential/credential_add.php?<?= $client_url ?>" <?php if (!isset($_COOKIE['user_encryption_session_key'])) { echo "disabled"; } ?>>
                     <i class="fas fa-plus mr-2"></i>New Credential
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -534,7 +534,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "modals/credential/credential_add.php";
 require_once "modals/credential/credential_export.php";
 if ($client_url) {
     require_once "modals/credential/credential_import.php";
diff --git a/agent/domains.php b/agent/domains.php
index e45914d3..5cff86ad 100644
--- a/agent/domains.php
+++ b/agent/domains.php
@@ -76,7 +76,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/domain/domain_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Domain</button>
                     <?php if ($num_rows[0] > 0) { ?>
                         <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                         <div class="dropdown-menu">
@@ -361,7 +361,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/domain/domain_add.php";
 require_once "modals/domain/domain_export.php";
 ?>
 
diff --git a/agent/modals/certificate/certificate_add.php b/agent/modals/certificate/certificate_add.php
index 32522bfc..457a2583 100644
--- a/agent/modals/certificate/certificate_add.php
+++ b/agent/modals/certificate/certificate_add.php
@@ -1,166 +1,175 @@
-<div class="modal" id="addCertificateModal" 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-lock mr-2"></i>New Certificate</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">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-certificate">Certificate</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>New Certificate</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">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-certificate">Certificate</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Certificate Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Certificate name" maxlength="200" required autofocus>
-                                </div>
+                    <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-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
-                                </div>
-                            </div>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Domain</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="domain_id">
-                                        <option value="">- Domain -</option>
-                                        <?php
-                                        $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
-                                        while ($domain_row = mysqli_fetch_array($domains_sql)) {
-                                            $domain_id = intval($domain_row['domain_id']);
-                                            $domain_name = nullable_htmlentities($domain_row['domain_name']);
-                                            echo "<option value=\"$domain_id\">$domain_name</option>";
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
-                        
+                                <?php } ?>
+                            </select>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-certificate">
-
-                            <div class="form-group">
-                                <label>Domain <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
-                                    </div>
-                                    <input type="text" class="form-control" name="domain" id="domain" placeholder="FQDN" maxlength="200" required>
-                                    <div class="input-group-append">
-                                        <button type="button" class="btn btn-secondary" onclick="fetchSSL('new')"><i class="fas fa-fw fa-sync-alt"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Issued By </label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="issued_by" id="issuedBy" placeholder="Issued By" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Expire Date</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="expire" id="expire" max="2999-12-31">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Public Key </label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <textarea class="form-control" rows="8" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
                     </div>
 
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Certificate Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Certificate name" maxlength="200" required autofocus>
+                    </div>
                 </div>
 
-                <div class="modal-footer">
-                    <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Short Description">
+                    </div>
                 </div>
-            </form>
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Domain</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <select class="form-control select2" name="domain_id">
+                            <option value="">- Domain -</option>
+                            <?php
+                            $domains_sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id ORDER BY domain_name ASC");
+                            while ($domain_row = mysqli_fetch_array($domains_sql)) {
+                                $domain_id = intval($domain_row['domain_id']);
+                                $domain_name = nullable_htmlentities($domain_row['domain_name']);
+                                echo "<option value=\"$domain_id\">$domain_name</option>";
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+            
+            </div>
+
+            <div class="tab-pane fade" id="pills-certificate">
+
+                <div class="form-group">
+                    <label>Domain <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i>&nbsp;https://</span>
+                        </div>
+                        <input type="text" class="form-control" name="domain" id="domain" placeholder="FQDN" maxlength="200" required>
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-secondary" onclick="fetchSSL('new')"><i class="fas fa-fw fa-sync-alt"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Issued By </label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="issued_by" id="issuedBy" placeholder="Issued By" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expire Date</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="expire" id="expire" max="2999-12-31">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Public Key </label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <textarea class="form-control" rows="8" name="public_key" id="publicKey" placeholder="-----BEGIN CERTIFICATE-----"></textarea>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
         </div>
+
     </div>
-</div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<script src="/agent/js/certificate_fetch_ssl.js"></script>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
\ No newline at end of file
diff --git a/agent/modals/credential/credential_add.php b/agent/modals/credential/credential_add.php
index 621a7638..3392bdf5 100644
--- a/agent/modals/credential/credential_add.php
+++ b/agent/modals/credential/credential_add.php
@@ -1,257 +1,263 @@
-<div class="modal" id="addCredentialModal" 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-key mr-2"></i>New Credential</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">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-credential-details">Details</a>
-                        </li>
-                        <?php if ($client_url) { ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-credential-relation">Relation</a>
-                        </li>
-                        <?php } ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-credential-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-credential-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>New Credential</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">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-credential-details">Details</a>
+            </li>
+            <?php if ($client_id) { ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-credential-relation">Relation</a>
+            </li>
+            <?php } ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-credential-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-credential-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name of Login" maxlength="200" required autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="important" value="1">
-                                        </div>
-                                    </div>
-                                </div>
+                    <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-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Username / ID</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="username" placeholder="Username or ID" maxlength="350"> <!-- DB field is 500, 350 un-encrypted chars -->
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Password / Key <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
-                                    </div>
-                                    <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password or Key" required maxlength="350" autocomplete="new-password">
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                    <div class="input-group-append">
-                                        <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>TOTP Seed</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key" maxlength="200">
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri" placeholder="http://192.168.1.1" maxlength="500">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>URI 2</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="uri_2" placeholder="https://server.company.com:5001" maxlength="500">
-                                </div>
-                            </div>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
+                                <?php } ?>
+                            </select>
                         </div>
+                    </div>
 
-                        <?php if ($client_url) { ?>
-                        <div class="tab-pane fade" id="pills-credential-relation">
-                            <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="contact">
-                                        <option value="">- Select Contact -</option>
-                                        <?php
+                <?php } ?>
 
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE 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
-                                                <?php if (isset($_GET['contact_id']) && $contact_id == $_GET['contact_id']) { 
-                                                echo "selected"; }
-                                                ?>
-                                                value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?>
-                                            </option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <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-tag"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="asset">
-                                        <option value="">- Select Asset -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $asset_id = intval($row['asset_id']);
-                                            $asset_name = nullable_htmlentities($row['asset_name']);
-                                            $asset_location = nullable_htmlentities($row['location_name']);
-
-                                            $asset_display_string = $asset_name;
-                                            if (!empty($asset_location)) {
-                                                $asset_display_string = "$asset_name ($asset_location)";
-                                            }
-
-                                            ?>
-                                            <option <?php if (isset($_GET['asset_id']) && $asset_id == $_GET['asset_id']) { 
-                                                echo "selected"; } ?>
-                                                value="<?php echo $asset_id; ?>"><?php echo $asset_display_string; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong> / <span class="text-secondary">Important?</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Name of Login" maxlength="200" required autofocus>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="important" value="1">
                             </div>
                         </div>
-                        <?php } ?>
-
-                        <div class="tab-pane fade" id="pills-credential-notes">
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"></textarea>
-                            </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="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 } ?>
-
-                                    </select>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-secondary ajax-modal" type="button"
-                                            data-modal-url="../admin/modals/tag/tag_add.php?type=4">
-                                            <i class="fas fa-plus"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description" maxlength="500">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Username / ID</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="username" placeholder="Username or ID" maxlength="350"> <!-- DB field is 500, 350 un-encrypted chars -->
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Password / Key <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                        </div>
+                        <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password or Key" required maxlength="350" autocomplete="new-password">
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                        <div class="input-group-append">
+                            <span class="btn btn-default"><i class="fa fa-fw fa-question" onclick="generatePassword()"></i></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>TOTP Seed</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="password" class="form-control" data-toggle="password" name="otp_secret" placeholder="Insert secret key" maxlength="200">
+                        <div class="input-group-append">
+                            <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri" placeholder="http://192.168.1.1" maxlength="500">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>URI 2</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="uri_2" placeholder="https://server.company.com:5001" maxlength="500">
+                    </div>
+                </div>
+
+            </div>
+
+            <?php if ($client_id) { ?>
+            <div class="tab-pane fade" id="pills-credential-relation">
+                <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="contact">
+                            <option value="">- Select Contact -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id ORDER BY contact_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $contact_id_select = intval($row['contact_id']);
+                                $contact_name = nullable_htmlentities($row['contact_name']);
+                                ?>
+                                <option
+                                    <?php if ($contact_id == $contact_id_select) { echo "selected"; } ?>
+                                    value="<?php echo $contact_id_select; ?>"><?php echo $contact_name; ?>
+                                </option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+                <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-tag"></i></span>
+                        </div>
+                        <select class="form-control select2" name="asset">
+                            <option value="">- Select Asset -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN locations on asset_location_id = location_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $asset_id_select = intval($row['asset_id']);
+                                $asset_name = nullable_htmlentities($row['asset_name']);
+                                $asset_location = nullable_htmlentities($row['location_name']);
+
+                                $asset_display_string = $asset_name;
+                                if (!empty($asset_location)) {
+                                    $asset_display_string = "$asset_name ($asset_location)";
+                                }
+
+                                ?>
+                                <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?>
+                                    value="<?php echo $asset_id_select; ?>"><?php echo $asset_display_string; ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <?php } ?>
+
+            <div class="tab-pane fade" id="pills-credential-notes">
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="note"></textarea>
+                </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="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 } ?>
+
+                        </select>
+                        <div class="input-group-append">
+                            <button class="btn btn-secondary ajax-modal" type="button"
+                                data-modal-url="../admin/modals/tag/tag_add.php?type=4">
+                                <i class="fas fa-plus"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/domain/domain_add.php b/agent/modals/domain/domain_add.php
index 1ad8371c..e8273d36 100644
--- a/agent/modals/domain/domain_add.php
+++ b/agent/modals/domain/domain_add.php
@@ -1,191 +1,198 @@
-<div class="modal" id="addDomainModal" 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-globe mr-2"></i>New Domain</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">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                        
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-details">
-
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
-
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
-
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
-
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Domain Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="example.com" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
-                                </div>
-                            </div>
-
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Registrar</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="registrar">
-                                        <option value="">- Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $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 class="form-group">
-                                <label>Webhost</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="webhost">
-                                        <option value="">- Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $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 class="form-group">
-                                <label>DNS Host</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="dnshost">
-                                        <option value="">- Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $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 class="form-group">
-                                <label>Mail Host</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="mailhost">
-                                        <option value="">- Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $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>
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Expire Date</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="expire" max="2999-12-31">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
-                    </div>
-                
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_domain" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-globe mr-2"></i>New Domain</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+            
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details">
+
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
+
+                    <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-user"></i></span>
+                            </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
+
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
+
+                                <?php } ?>
+                            </select>
+                        </div>
+                    </div>
+
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Domain Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="example.com" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Short Description">
+                    </div>
+                </div>
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Registrar</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <select class="form-control select2" name="registrar">
+                            <option value="">- Vendor -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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 class="form-group">
+                    <label>Webhost</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <select class="form-control select2" name="webhost">
+                            <option value="">- Vendor -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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 class="form-group">
+                    <label>DNS Host</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <select class="form-control select2" name="dnshost">
+                            <option value="">- Vendor -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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 class="form-group">
+                    <label>Mail Host</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                        </div>
+                        <select class="form-control select2" name="mailhost">
+                            <option value="">- Vendor -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Expire Date</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="expire" max="2999-12-31">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
+        </div>
+    
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_domain" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/network/network_add.php b/agent/modals/network/network_add.php
index 3edaa044..2c020908 100644
--- a/agent/modals/network/network_add.php
+++ b/agent/modals/network/network_add.php
@@ -1,200 +1,208 @@
-<div class="modal" id="addNetworkModal" 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-network-wired mr-2"></i>New Network</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">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-network">Network</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-dns">DNS</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
+$location_id = intval($_GET['location_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>New Network</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">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-network">Network</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-dns">DNS</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" maxlength="200" required autofocus>
-                                </div>
+                    <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-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short Description">
-                                </div>
-                            </div>
-
-                            <?php if ($client_url) { ?>
-                            <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="location">
-                                        <option value="">- Select Location -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT * 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 <?php if ($location_id == isset($_GET['location'])) { echo "selected"; } ?> value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-
-                                        <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-                            <?php } ?>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
+                                <?php } ?>
+                            </select>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-network">
-                            <div class="form-group">
-                                <label>vLAN</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" inputmode="numeric" pattern="[0-9]*" name="vlan" placeholder="ex. 20">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>IP / Network <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-network-wired"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="network" placeholder="Network or IP ex 192.168.1.0/24" maxlength="200" required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Subnet Mask</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-mask"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="subnet" placeholder="ex 255.255.255.0" maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Gateway <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-route"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="gateway" placeholder="ex 192.168.1.1" maxlength="200" data-inputmask="'alias': 'ip'" data-mask required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>DHCP Range / IPs</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>
-                                    <input type="text" class="form-control" name="dhcp_range" placeholder="ex 192.168.1.11-199"  maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-                        
-                        <div class="tab-pane fade" id="pills-dns">
-                            <div class="form-group">
-                                <label>Primary DNS</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="primary_dns" placeholder="ex 9.9.9.9"  maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Secondary DNS</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="secondary_dns" placeholder="ex 1.1.1.1"  maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
-                                </div>
-                            </div>
-                        </div>
-          
-                        <div class="tab-pane fade" id="pills-notes">
-                            <div class="form-group">
-                                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
                     </div>
 
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" maxlength="200" required autofocus>
+                    </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_network" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Short Description">
+                    </div>
                 </div>
-            </form>
+
+                <?php if ($client_id) { ?>
+                <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="location">
+                            <option value="">- Select Location -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT * 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_select = intval($row['location_id']);
+                                $location_name = nullable_htmlentities($row['location_name']);
+                            ?>
+                            <option <?php if ($location_id == $location_id_select) { echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo $location_name; ?></option>
+
+                            <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-network">
+                <div class="form-group">
+                    <label>vLAN</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" inputmode="numeric" pattern="[0-9]*" name="vlan" placeholder="ex. 20">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>IP / Network <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-network-wired"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="network" placeholder="Network or IP ex 192.168.1.0/24" maxlength="200" required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Subnet Mask</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-mask"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="subnet" placeholder="ex 255.255.255.0" maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Gateway <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-route"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="gateway" placeholder="ex 192.168.1.1" maxlength="200" data-inputmask="'alias': 'ip'" data-mask required>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>DHCP Range / IPs</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>
+                        <input type="text" class="form-control" name="dhcp_range" placeholder="ex 192.168.1.11-199"  maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+            
+            <div class="tab-pane fade" id="pills-dns">
+                <div class="form-group">
+                    <label>Primary DNS</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="primary_dns" placeholder="ex 9.9.9.9"  maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Secondary DNS</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="secondary_dns" placeholder="ex 1.1.1.1"  maxlength="200" data-inputmask="'alias': 'ip'" data-mask>
+                    </div>
+                </div>
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+                <div class="form-group">
+                    <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_network" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/service/service_add.php b/agent/modals/service/service_add.php
index 9a60bf2d..594c76c9 100644
--- a/agent/modals/service/service_add.php
+++ b/agent/modals/service/service_add.php
@@ -1,247 +1,254 @@
-<div class="modal" id="addServiceModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i>New Service</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
+<?php
 
-            <form action="post.php" method="post" autocomplete="off">
+require_once '../../../includes/modal_header.php';
 
-                <div class="modal-body">
-                    <?php if ($client_url) { ?>
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
-                        </li>
-                        
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-general">General</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-assets">Assets</a>
-                        </li>
-                        
-                    </ul>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <hr>
+ob_start();
 
-                    <?php } ?>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i>New Service</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
 
-                    <div class="tab-content">
+<form action="post.php" method="post" autocomplete="off">
 
-                        <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
+    <div class="modal-body">
+        <?php if ($client_id) { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-overview">Overview</a>
+            </li>
+            
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-general">General</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-assets">Assets</a>
+            </li>
+            
+        </ul>
 
-                        <div class="tab-pane fade show active" id="pills-overview">
+        <hr>
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <?php } ?>
 
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <div class="tab-content">
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+            <!-- //TODO: The multiple selects won't play nicely with the icons or just general formatting. I've just added blank <p> tags to format it better for now -->
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-overview">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-stream"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Name of Service" maxlength="200" required>
-                                </div>
+                    <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-user"></i></span>
                             </div>
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
+                                <?php
 
-                            <div class="form-group">
-                                <label>Description <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description of Service" maxlength="200" required>
-                                </div>
-                            </div>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
 
-                            <!--   //TODO: Integrate with company wide categories: /categories.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-info"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="category" placeholder="Category" maxlength="20">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Importance</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="importance" required>
-                                        <option>Low</option>
-                                        <option>Medium</option>
-                                        <option>High</option>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Backup</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="backup" placeholder="Backup strategy" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Notes</label>
-                                <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"></textarea>
-                            </div>
+                                <?php } ?>
+                            </select>
                         </div>
+                    </div>
 
-                        <?php if ($client_url) { ?>
-
-                        <div class="tab-pane fade" id="pills-general">
-                            <div class="form-group">
-                                <label for="contacts">Select related Contacts</label>
-                                <select class="form-control select2" id="contacts" name="contacts[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $contact_id = intval($row['contact_id']);
-                                        $contact_name = nullable_htmlentities($row['contact_name']);
-                                        echo "<option value=\"$contact_id\">$contact_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="vendors">Select related vendors</label>
-                                <select class="form-control select2" id="vendors" name="vendors[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $vendor_id = intval($row['vendor_id']);
-                                        $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                        echo "<option value=\"$vendor_id\">$vendor_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="documents">Select related documents</label>
-                                <select class="form-control select2" id="documents" name="documents[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $document_id = intval($row['document_id']);
-                                        $document_name = nullable_htmlentities($row['document_name']);
-                                        echo "<option value=\"$document_id\">$document_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <!-- TODO: Services related to other services -->
+                <?php } ?>
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-stream"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-assets">
-
-                            <div class="form-group">
-                                <label for="assets">Select related assets</label>
-                                <select class="form-control select2" id="assets" name="assets[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $asset_id = intval($row['asset_id']);
-                                        $asset_name = nullable_htmlentities($row['asset_name']);
-                                        echo "<option value=\"$asset_id\">$asset_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div> 
-
-                            <div class="form-group">
-                                <label for="logins">Select related Credentials</label>
-                                <select class="form-control select2" id="credentials" name="credentials[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $credential_id = intval($row['credential_id']);
-                                        $credential_name = nullable_htmlentities($row['credential_name']);
-                                        echo "<option value=\"$credential_id\">$credential_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="domains">Select related domains</label>
-                                <select class="form-control select2" id="domains" name="domains[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $domain_id = intval($row['domain_id']);
-                                        $domain_name = nullable_htmlentities($row['domain_name']);
-                                        echo "<option value=\"$domain_id\">$domain_name</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="certificates">Select related certificates</label>
-                                <select class="form-control select2" id="certificates" name="certificates[]" multiple>
-                                    <?php
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $cert_id = intval($row['certificate_id']);
-                                        $cert_name = nullable_htmlentities($row['certificate_name']);
-                                        $cert_domain = nullable_htmlentities($row['certificate_domain']);
-                                        echo "<option value=\"$cert_id\">$cert_name ($cert_domain)</option>";
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-
-                        </div>
-                        <?php } ?>
-
+                        <input type="text" class="form-control" name="name" placeholder="Name of Service" maxlength="200" required>
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_service" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group">
+                    <label>Description <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-info-circle"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of Service" maxlength="200" required>
+                    </div>
                 </div>
-            </form>
+
+                <!--   //TODO: Integrate with company wide categories: /categories.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-info"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="category" placeholder="Category" maxlength="20">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Importance</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="importance" required>
+                            <option>Low</option>
+                            <option>Medium</option>
+                            <option>High</option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Backup</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-hdd"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="backup" placeholder="Backup strategy" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Notes</label>
+                    <textarea class="form-control" rows="3" placeholder="Enter some notes" name="note"></textarea>
+                </div>
+            </div>
+
+            <?php if ($client_id) { ?>
+
+            <div class="tab-pane fade" id="pills-general">
+                <div class="form-group">
+                    <label for="contacts">Select related Contacts</label>
+                    <select class="form-control select2" id="contacts" name="contacts[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $contact_id = intval($row['contact_id']);
+                            $contact_name = nullable_htmlentities($row['contact_name']);
+                            echo "<option value=\"$contact_id\">$contact_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="vendors">Select related vendors</label>
+                    <select class="form-control select2" id="vendors" name="vendors[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $vendor_id = intval($row['vendor_id']);
+                            $vendor_name = nullable_htmlentities($row['vendor_name']);
+                            echo "<option value=\"$vendor_id\">$vendor_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="documents">Select related documents</label>
+                    <select class="form-control select2" id="documents" name="documents[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_archived_at IS NULL AND document_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $document_id = intval($row['document_id']);
+                            $document_name = nullable_htmlentities($row['document_name']);
+                            echo "<option value=\"$document_id\">$document_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+                <!-- TODO: Services related to other services -->
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-assets">
+
+                <div class="form-group">
+                    <label for="assets">Select related assets</label>
+                    <select class="form-control select2" id="assets" name="assets[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_archived_at IS NULL AND asset_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $asset_id = intval($row['asset_id']);
+                            $asset_name = nullable_htmlentities($row['asset_name']);
+                            echo "<option value=\"$asset_id\">$asset_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div> 
+
+                <div class="form-group">
+                    <label for="logins">Select related Credentials</label>
+                    <select class="form-control select2" id="credentials" name="credentials[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM credentials WHERE credential_archived_at IS NULL AND credential_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $credential_id = intval($row['credential_id']);
+                            $credential_name = nullable_htmlentities($row['credential_name']);
+                            echo "<option value=\"$credential_id\">$credential_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="domains">Select related domains</label>
+                    <select class="form-control select2" id="domains" name="domains[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM domains WHERE domain_archived_at IS NULL AND domain_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $domain_id = intval($row['domain_id']);
+                            $domain_name = nullable_htmlentities($row['domain_name']);
+                            echo "<option value=\"$domain_id\">$domain_name</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+                <div class="form-group">
+                    <label for="certificates">Select related certificates</label>
+                    <select class="form-control select2" id="certificates" name="certificates[]" multiple>
+                        <?php
+                        $sql = mysqli_query($mysqli, "SELECT * FROM certificates WHERE certificate_archived_at IS NULL AND certificate_client_id = $client_id");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $cert_id = intval($row['certificate_id']);
+                            $cert_name = nullable_htmlentities($row['certificate_name']);
+                            $cert_domain = nullable_htmlentities($row['certificate_domain']);
+                            echo "<option value=\"$cert_id\">$cert_name ($cert_domain)</option>";
+                        }
+                        ?>
+                    </select>
+                </div>
+
+            </div>
+            <?php } ?>
+
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_service" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/software/software_add.php b/agent/modals/software/software_add.php
index 18548180..23026366 100644
--- a/agent/modals/software/software_add.php
+++ b/agent/modals/software/software_add.php
@@ -1,299 +1,306 @@
-<div class="modal" id="addSoftwareModal" 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-cube mr-2"></i>New License</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">
+<?php
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-licensing">Licensing</a>
-                        </li>
-                        <?php if ($client_url) { // Dont show these when in global mode ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Devices</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-user-licenses">Users</a>
-                        </li>
-                        <?php } ?>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
+require_once '../../../includes/modal_header.php';
 
-                    <hr>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <div class="tab-content">
+ob_start();
 
-                        <div class="tab-pane fade show active" id="pills-details">
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License</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">
 
-                            <?php if ($client_url) { ?>
-                                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                            <?php } else { ?>
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-licensing">Licensing</a>
+            </li>
+            <?php if ($client_id) { // Dont show these when in global mode ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-device-licenses">Devices</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-user-licenses">Users</a>
+            </li>
+            <?php } ?>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
 
-                                <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-user"></i></span>
-                                        </div>
-                                        <select class="form-control select2" name="client_id" required>
-                                            <option value="">- Select Client -</option>
-                                            <?php
+        <hr>
 
-                                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
-                                            while ($row = mysqli_fetch_array($sql)) {
-                                                $client_id = intval($row['client_id']);
-                                                $client_name = nullable_htmlentities($row['client_name']); ?>
-                                                <option <?php if ($client_id == isset($_GET['client'])) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+        <div class="tab-content">
 
-                                            <?php } ?>
-                                        </select>
-                                    </div>
-                                </div>
+            <div class="tab-pane fade show active" id="pills-details">
 
-                            <?php } ?>
+                <?php if ($client_id) { ?>
+                    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } else { ?>
 
-                            <div class="form-group">
-                                <label>Software Name <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required>
-                                </div>
+                    <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-user"></i></span>
                             </div>
-
-                            <div class="form-group">
-                                <label>Version</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Short description">
-                                </div>
-                            </div>
-
-                            <?php if ($client_url) { ?>
-                            <div class="form-group">
-                                <label>Vendor</label>
-                                <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">
-                                        <option value="">- Select Vendor -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT vendor_name, vendor_id FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $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>
-                            <?php } ?>
-
-                            <div class="form-group">
-                                <label>Type <strong class="text-danger">*</strong></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="type" required>
-                                        <option value="">- Select Type -</option>
-                                        <?php foreach ($software_types_array as $software_type) { ?>
-                                            <option><?php echo $software_type; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-licensing">
-
-                            <div class="form-group">
-                                <label>License Type</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="license_type">
-                                        <option value="">- Select a License Type -</option>
-                                        <?php foreach ($license_types_array as $license_type) { ?>
-                                            <option><?php echo $license_type; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Seats</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-chair"></i></span>
-                                    </div>
-                                    <input type="text" inputmode="numeric" pattern="[0-9]*" class="form-control" name="seats" placeholder="Number of seats">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>License Key</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="key" placeholder="License key" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Purchase Reference</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Purchase Date</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="purchase" max="2999-12-31">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Expire</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
-                                    </div>
-                                    <input type="date" class="form-control" name="expire" max="2999-12-31">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <?php if ($client_url) { // Dont show these when in global mode ?>
-
-                        <div class="tab-pane fade" id="pills-device-licenses">
-
-                            <ul class="list-group">
-
-                                <li class="list-group-item bg-dark">
-                                    <div class="form-check">
-                                        <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.asset-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
-                                        <label class="form-check-label ml-3"><strong>Licensed Devices</strong></label>
-                                    </div>
-                                </li>
-
-
+                            <select class="form-control select2" name="client_id" required>
+                                <option value="">- Select Client -</option>
                                 <?php
-                                $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_archived_at ASC, asset_name ASC");
 
-                                while ($row = mysqli_fetch_array($sql_assets_select)) {
-                                    $asset_id_select = intval($row['asset_id']);
-                                    $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                    $asset_type_select = nullable_htmlentities($row['asset_type']);
-                                    $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
-                                    if (empty($asset_archived_at)) {
-                                        $asset_archived_display = "";
-                                    } else {
-                                        $asset_archived_display = "Archived - ";
-                                    }
-                                    $contact_name_select = nullable_htmlentities($row['contact_name']);
-
-                                    ?>
-                                    <li class="list-group-item">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input asset-checkbox" name="assets[]" value="<?php echo $asset_id_select; ?>">
-                                            <label class="form-check-label ml-2"><?php echo "$asset_archived_display$asset_name_select - $contact_name_select"; ?></label>
-                                        </div>
-                                    </li>
+                                $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                while ($row = mysqli_fetch_array($sql)) {
+                                    $client_id_select = intval($row['client_id']);
+                                    $client_name = nullable_htmlentities($row['client_name']); ?>
+                                    <option <?php if ($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
 
                                 <?php } ?>
-
-                            </ul>
-
+                            </select>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-user-licenses">
-
-                            <ul class="list-group">
-
-                                <li class="list-group-item bg-dark">
-                                    <div class="form-check">
-                                        <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.user-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
-                                        <label class="form-check-label ml-3"><strong>Licensed Users</strong></label>
-                                    </div>
-                                </li>
-
-                                <?php
-                                $sql_contacts_select = 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_contacts_select)) {
-                                    $contact_id_select = intval($row['contact_id']);
-                                    $contact_name_select = nullable_htmlentities($row['contact_name']);
-                                    $contact_email_select = nullable_htmlentities($row['contact_email']);
-
-                                    ?>
-                                    <li class="list-group-item">
-                                        <div class="form-check">
-                                            <input type="checkbox" class="form-check-input user-checkbox" name="contacts[]" value="<?php echo $contact_id_select; ?>">
-                                            <label class="form-check-label ml-2"><?php echo "$contact_name_select - $contact_email_select"; ?></label>
-                                        </div>
-                                    </li>
-
-                                <?php } ?>
-
-                            </ul>
-
-                        </div>
-
-                        <?php } ?>
-
-                        <div class="tab-pane fade" id="pills-notes">
-
-                            <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
-
-                        </div>
-
                     </div>
 
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Software Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required>
+                    </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_software" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+
+                <div class="form-group">
+                    <label>Version</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
+                    </div>
                 </div>
-            </form>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Short description">
+                    </div>
+                </div>
+
+                <?php if ($client_id) { ?>
+                <div class="form-group">
+                    <label>Vendor</label>
+                    <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">
+                            <option value="">- Select Vendor -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT vendor_name, vendor_id FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id ORDER BY vendor_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $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>
+                <?php } ?>
+
+                <div class="form-group">
+                    <label>Type <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach ($software_types_array as $software_type) { ?>
+                                <option><?php echo $software_type; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-licensing">
+
+                <div class="form-group">
+                    <label>License Type</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                        </div>
+                        <select class="form-control select2" name="license_type">
+                            <option value="">- Select a License Type -</option>
+                            <?php foreach ($license_types_array as $license_type) { ?>
+                                <option><?php echo $license_type; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Seats</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-chair"></i></span>
+                        </div>
+                        <input type="text" inputmode="numeric" pattern="[0-9]*" class="form-control" name="seats" placeholder="Number of seats">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>License Key</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="key" placeholder="License key" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Purchase Reference</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="purchase_reference" placeholder="eg. Invoice, PO Number">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Purchase Date</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-check"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="purchase" max="2999-12-31">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Expire</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar-times"></i></span>
+                        </div>
+                        <input type="date" class="form-control" name="expire" max="2999-12-31">
+                    </div>
+                </div>
+
+            </div>
+
+            <?php if ($client_id) { // Dont show these when in global mode ?>
+
+            <div class="tab-pane fade" id="pills-device-licenses">
+
+                <ul class="list-group">
+
+                    <li class="list-group-item bg-dark">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.asset-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
+                            <label class="form-check-label ml-3"><strong>Licensed Devices</strong></label>
+                        </div>
+                    </li>
+
+
+                    <?php
+                    $sql_assets_select = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id WHERE asset_archived_at IS NULL AND asset_client_id = $client_id ORDER BY asset_archived_at ASC, asset_name ASC");
+
+                    while ($row = mysqli_fetch_array($sql_assets_select)) {
+                        $asset_id_select = intval($row['asset_id']);
+                        $asset_name_select = nullable_htmlentities($row['asset_name']);
+                        $asset_type_select = nullable_htmlentities($row['asset_type']);
+                        $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
+                        if (empty($asset_archived_at)) {
+                            $asset_archived_display = "";
+                        } else {
+                            $asset_archived_display = "Archived - ";
+                        }
+                        $contact_name_select = nullable_htmlentities($row['contact_name']);
+
+                        ?>
+                        <li class="list-group-item">
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input asset-checkbox" name="assets[]" value="<?php echo $asset_id_select; ?>">
+                                <label class="form-check-label ml-2"><?php echo "$asset_archived_display$asset_name_select - $contact_name_select"; ?></label>
+                            </div>
+                        </li>
+
+                    <?php } ?>
+
+                </ul>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-user-licenses">
+
+                <ul class="list-group">
+
+                    <li class="list-group-item bg-dark">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input" onclick="this.closest('.tab-pane').querySelectorAll('.user-checkbox').forEach(checkbox => checkbox.checked = this.checked);">
+                            <label class="form-check-label ml-3"><strong>Licensed Users</strong></label>
+                        </div>
+                    </li>
+
+                    <?php
+                    $sql_contacts_select = 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_contacts_select)) {
+                        $contact_id_select = intval($row['contact_id']);
+                        $contact_name_select = nullable_htmlentities($row['contact_name']);
+                        $contact_email_select = nullable_htmlentities($row['contact_email']);
+
+                        ?>
+                        <li class="list-group-item">
+                            <div class="form-check">
+                                <input type="checkbox" class="form-check-input user-checkbox" name="contacts[]" value="<?php echo $contact_id_select; ?>">
+                                <label class="form-check-label ml-2"><?php echo "$contact_name_select - $contact_email_select"; ?></label>
+                            </div>
+                        </li>
+
+                    <?php } ?>
+
+                </ul>
+
+            </div>
+
+            <?php } ?>
+
+            <div class="tab-pane fade" id="pills-notes">
+
+                <textarea class="form-control" rows="12" placeholder="Enter some notes" name="notes"></textarea>
+
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_software" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/networks.php b/agent/networks.php
index c22a2162..758c0e85 100644
--- a/agent/networks.php
+++ b/agent/networks.php
@@ -78,7 +78,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-network-wired mr-2"></i>Networks</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-plus mr-2"></i>New Network</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/network/network_add.php?<?= $client_url ?>&location_id=<?= $location_filter ?>"><i class="fas fa-plus mr-2"></i>New Network</button>
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
@@ -358,7 +358,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/network/network_add.php";
 require_once "modals/network/network_export.php";
 
 ?>
diff --git a/agent/services.php b/agent/services.php
index 37978370..d62404f0 100644
--- a/agent/services.php
+++ b/agent/services.php
@@ -50,7 +50,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-stream mr-2"></i>Services</h3>
             <div class="card-tools">
                 <?php if (lookupUserPermission("module_support") >= 2) { ?>
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addServiceModal"><i class="fas fa-plus mr-2"></i>New Service</button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/service/service_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Service</button>
                 <?php } ?>
             </div>
         </div>
@@ -220,5 +220,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/service/service_add.php";
 require_once "../includes/footer.php";
diff --git a/agent/software.php b/agent/software.php
index 41f5e5e1..3fdd9cb9 100644
--- a/agent/software.php
+++ b/agent/software.php
@@ -66,7 +66,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-cube mr-2"></i>Software & Licenses</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal">
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/software/software_add.php?<?= $client_url ?>">
                         <i class="fas fa-plus mr-2"></i>New License
                     </button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -322,7 +322,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "modals/software/software_add.php";
 require_once "modals/software/software_add_from_template.php";
 require_once "modals/software/software_export.php";
 require_once "../includes/footer.php";