diff --git a/client_asset_details.php b/asset_details.php
similarity index 95%
rename from client_asset_details.php
rename to asset_details.php
index 3bc3f6f7..8c09d235 100644
--- a/client_asset_details.php
+++ b/asset_details.php
@@ -1,20 +1,32 @@
 <?php
 
-require_once "includes/inc_all_client.php";
+// If client_id is in URI then show client Side Bar and client header
+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&";
+} else {
+    require_once "includes/inc_client_overview_all.php";
+    $client_query = '';
+    $client_url = '';
+}
 
 
 if (isset($_GET['asset_id'])) {
     $asset_id = intval($_GET['asset_id']);
 
     $sql = mysqli_query($mysqli, "SELECT * FROM assets
+        LEFT JOIN clients ON client_id = asset_client_id 
         LEFT JOIN contacts ON asset_contact_id = contact_id 
         LEFT JOIN locations ON asset_location_id = location_id
         LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
         WHERE asset_id = $asset_id
-        AND asset_client_id = $client_id
+        $client_query
     ");
 
     $row = mysqli_fetch_array($sql);
+    $client_id = intval($row['asset_client_id']);
+    $client_name = nullable_htmlentities($row['client_name']);
     $asset_id = intval($row['asset_id']);
     $asset_type = nullable_htmlentities($row['asset_type']);
     $asset_name = nullable_htmlentities($row['asset_name']);
@@ -318,7 +330,7 @@ if (isset($_GET['asset_id'])) {
                     <a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a>
                 </li>
                 <li class="breadcrumb-item">
-                    <a href="client_assets.php?client_id=<?php echo $client_id; ?>">Assets</a>
+                    <a href="assets.php?client_id=<?php echo $client_id; ?>">Assets</a>
                 </li>
                 <li class="breadcrumb-item active"><?php echo $asset_name; ?></li>
             </ol>
@@ -569,7 +581,11 @@ if (isset($_GET['asset_id'])) {
                                 <tr>
                                     <td>
                                         <i class="fa fa-fw fa-key text-secondary"></i>
-                                        <a class="text-dark" href="#" data-toggle="modal" data-target="#editLoginModal<?php echo $login_id; ?>">
+                                        <a class="text-dark" href="#"
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_credential_edit.php"
+                                            data-ajax-id="<?php echo $login_id; ?>"
+                                            >
                                             <?php echo $login_name; ?>
                                         </a>
                                     </td>
@@ -589,7 +605,8 @@ if (isset($_GET['asset_id'])) {
                                                 <a class="dropdown-item" href="#"
                                                     data-toggle="ajax-modal"
                                                     data-ajax-url="ajax/ajax_credential_edit.php"
-                                                    data-ajax-id="<?php echo $login_id; ?>">
+                                                    data-ajax-id="<?php echo $login_id; ?>"
+                                                    >
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <a class="dropdown-item" href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'Login', $login_id"; ?>)">
@@ -676,7 +693,15 @@ if (isset($_GET['asset_id'])) {
 
                                 ?>
                                 <tr>
-                                    <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>"><?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?></a></td>
+                                    <td>
+                                        <a class="text-dark" href="#"
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_software_edit.php"
+                                            data-ajax-id="<?php echo $software_id; ?>"
+                                            >
+                                            <?php echo "$software_name<br><span class='text-secondary'>$software_version</span>"; ?>
+                                        </a>
+                                    </td>
                                     <td><?php echo $software_type; ?></td>
                                     <td><?php echo $software_license_type; ?></td>
                                     <td><?php echo "$seat_count / $software_seats"; ?></td>
@@ -871,7 +896,15 @@ if (isset($_GET['asset_id'])) {
                             ?>
 
                                 <tr>
-                                    <td class="text-bold"><a href="#" data-toggle="modal" data-target="#editRecurringTicketModal" onclick="populateRecurringTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)"> <?php echo $scheduled_ticket_subject ?></a></td>
+                                    <td class="text-bold">
+                                        <a href="#"
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_recurring_ticket_edit.php"
+                                            data-ajax-id="<?php echo $scheduled_ticket_id; ?>"
+                                            >
+                                            <?php echo $scheduled_ticket_subject ?>
+                                        </a>
+                                    </td>
 
                                     <td><?php echo $scheduled_ticket_priority ?></td>
 
@@ -885,8 +918,11 @@ if (isset($_GET['asset_id'])) {
                                                 <i class="fas fa-ellipsis-h"></i>
                                             </button>
                                             <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#" data-toggle="modal"
-                                                   data-target="#editRecurringTicketModal" onclick="populateRecurringTicketEditModal(<?php echo $client_id, ',', $scheduled_ticket_id ?>)">
+                                                <a class="dropdown-item" href="#"
+                                                    data-toggle="ajax-modal"
+                                                    data-ajax-url="ajax/ajax_recurring_ticket_edit.php"
+                                                    data-ajax-id="<?php echo $scheduled_ticket_id; ?>"
+                                                    >
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <div class="dropdown-divider"></div>
@@ -1050,11 +1086,10 @@ if (isset($_GET['asset_id'])) {
 
 <?php
 
-require_once "modals/client_asset_interface_add_modal.php";
-require_once "modals/client_asset_interface_multiple_add_modal.php";
-require_once "modals/client_asset_interface_import_modal.php";
-require_once "modals/client_asset_interface_export_modal.php";
+require_once "modals/asset_interface_add_modal.php";
+require_once "modals/asset_interface_multiple_add_modal.php";
+require_once "modals/asset_interface_import_modal.php";
+require_once "modals/asset_interface_export_modal.php";
 require_once "modals/ticket_add_modal.php";
 require_once "modals/recurring_ticket_add_modal.php";
-require_once "modals/recurring_ticket_edit_modal.php";
 require_once "includes/footer.php";
diff --git a/assets.php b/assets.php
new file mode 100644
index 00000000..2f6ed856
--- /dev/null
+++ b/assets.php
@@ -0,0 +1,727 @@
+<?php
+
+// Default Column Sortby Filter
+$sort = "asset_name";
+$order = "ASC";
+
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "includes/inc_all_client.php";
+    $client_query = "AND asset_client_id = $client_id";
+    $client_url = "client_id=$client_id&";
+} else {
+    require_once "includes/inc_client_overview_all.php";
+    $client_query = '';
+    $client_url = '';
+}
+
+// Perms
+enforceUserPermission('module_support');
+
+//Asset Type from GET
+if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
+    $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";
+} elseif (isset($_GET['type']) && ($_GET['type']) == 'server') {
+    $type_query = "asset_type = 'server'";
+} elseif (isset($_GET['type']) && ($_GET['type']) == 'virtual') {
+    $type_query = "asset_type = 'Virtual Machine'";
+} elseif (isset($_GET['type']) && ($_GET['type']) == 'network') {
+    $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'";
+} elseif (isset($_GET['type']) && ($_GET['type']) == 'other') {
+    $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'";
+} else {
+    $type_query = "asset_type LIKE '%'";
+    $_GET['type'] = '';
+}
+
+if (!$client_url) {
+    // Client Filter
+    if (isset($_GET['client']) & !empty($_GET['client'])) {
+        $client_query = 'AND (asset_client_id = ' . intval($_GET['client']) . ')';
+        $client = intval($_GET['client']);
+    } else {
+        // Default - any
+        $client_query = '';
+        $client = '';
+    }
+}
+
+if ($client_url) {
+    // Location Filter
+    if (isset($_GET['location']) & !empty($_GET['location'])) {
+        $location_query = 'AND (asset_location_id = ' . intval($_GET['location']) . ')';
+        $location_filter = intval($_GET['location']);
+    } else {
+        // Default - any
+        $location_query = '';
+        $location_filter = '';
+    }
+}
+
+//Get Asset Counts
+$row = mysqli_fetch_assoc(mysqli_query($mysqli, "
+    SELECT 
+        COUNT(*) AS all_count,
+        SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count,
+        SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count,
+        SUM(CASE WHEN asset_type = 'virtual machine' THEN 1 ELSE 0 END) AS virtual_count,
+        SUM(CASE WHEN asset_type IN ('Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS network_count,
+        SUM(CASE WHEN asset_type NOT IN ('laptop', 'desktop', 'server', 'virtual machine', 'Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS other_count
+    FROM (
+        SELECT assets.* FROM assets 
+        LEFT JOIN contacts ON asset_contact_id = contact_id 
+        LEFT JOIN locations ON asset_location_id = location_id 
+        LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+        WHERE asset_$archive_query
+        $client_query
+    ) AS filtered_assets;
+"));
+
+//All Asset Count
+$all_count = intval($row['all_count']);
+
+//Workstation Count
+$workstation_count = intval($row['workstation_count']);
+
+//Server Count
+$server_count = intval($row['server_count']);
+
+//Virtual Server Count
+$virtual_count = intval($row['virtual_count']);
+
+//Network Device Count
+$network_count = intval($row['network_count']);
+
+//Other Count
+$other_count = intval($row['other_count']);
+
+//Rebuild URL
+$url_query_strings_sort = http_build_query($get_copy);
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM assets
+    LEFT JOIN clients ON asset_client_id = client_id
+    LEFT JOIN contacts ON asset_contact_id = contact_id 
+    LEFT JOIN locations ON asset_location_id = location_id 
+    LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
+    WHERE asset_$archive_query
+    AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%' OR client_name LIKE '%$q%')
+    AND ($type_query)
+    $location_query
+    $client_query
+    ORDER BY $sort $order LIMIT $record_from, $record_to"
+);
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+
+// OS typeahead suggestions
+$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL");
+if (mysqli_num_rows($os_sql) > 0) {
+    while ($row = mysqli_fetch_array($os_sql)) {
+        $os_arr[] = $row;
+	 }
+    $json_os = json_encode($os_arr);
+}
+
+?>
+
+<div class="col-sm-12 mb-3">
+    <div class="btn-toolbar">
+        <div class="btn-group btn-block">
+            <?php if($all_count) { ?>
+            <a href="?<?php echo $url_query_strings_sort; ?>&type=" class="btn <?php if ($_GET['type'] == 'all' || empty($_GET['type'])) { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">All Assets<span class="right badge badge-light ml-2"><?php echo $all_count; ?></span></a>
+            <?php } ?>
+            <?php
+            if ($workstation_count > 0) { ?>
+                <a href="?<?php echo $url_query_strings_sort; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Workstations<span class="right badge badge-light ml-2"><?php echo $workstation_count; ?></span></a>
+                <?php
+            }
+            if ($server_count > 0) { ?>
+                <a href="?<?php echo $url_query_strings_sort; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server mr-2"></i>Servers<span class="right badge badge-light ml-2"><?php echo $server_count; ?></span></a>
+                <?php
+            }
+            if ($virtual_count > 0) { ?>
+                <a href="?<?php echo $url_query_strings_sort; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud mr-2"></i>Virtual<span class="right badge badge-light ml-2"><?php echo $virtual_count; ?></span></a>
+                <?php
+            }
+            if ($network_count > 0) { ?>
+                <a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired mr-2"></i>Network<span class="right badge badge-light ml-2"><?php echo $network_count; ?></span></a>
+                <?php
+            }
+            if ($other_count > 0) { ?>
+                <a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag mr-2"></i>Other<span class="right badge badge-light ml-2"><?php echo $other_count; ?></span></a>
+                <?php
+            } ?>
+        </div>
+    </div>
+</div>
+
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fas fa-fw fa-desktop mr-2"></i>Asset Management</h3>
+        <div class="card-tools">
+            <?php if (lookupUserPermission("module_support") >= 2) { ?>
+            <div class="btn-group">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetModal">
+                    <i class="fas fa-plus mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
+                <div class="dropdown-menu">
+                    <?php if ($client_url) { ?>
+                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importAssetModal">
+                        <i class="fa fa-fw fa-upload mr-2"></i>Import
+                    </a>
+                    <?php } ?>
+                    <?php if ($num_rows[0] > 0) { ?>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
+                            <i class="fa fa-fw fa-download mr-2"></i>Export
+                        </a>
+                    <?php } ?>
+                </div>
+            </div>
+            <?php } ?>
+        </div>
+    </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <?php if ($client_url) { ?>
+            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+            <?php } ?>
+            <input type="hidden" name="type" value="<?php echo stripslashes(nullable_htmlentities($_GET['type'])); ?>">
+            <input type="hidden" name="archived" value="<?php echo $archived; ?>">
+            <div class="row">
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?php if (!empty($_GET['type'])) { echo ucwords(stripslashes(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>s">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <?php if ($client_url) { ?>
+                <div class="col-md-2">
+                    <div class="input-group">
+                        <select class="form-control select2" name="location" onchange="this.form.submit()">
+                            <option value="">- All Locations -</option>
+
+                            <?php
+                            $sql_locations_filter = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_client_id = $client_id AND location_archived_at IS NULL ORDER BY location_name ASC");
+                            while ($row = mysqli_fetch_array($sql_locations_filter)) {
+                                $location_id = intval($row['location_id']);
+                                $location_name = nullable_htmlentities($row['location_name']);
+                            ?>
+                                <option <?php if ($location_filter == $location_id) { echo "selected"; } ?> value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
+                            <?php
+                            }
+                            ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } else { ?>
+                <div class="col-md-2">
+                    <div class="input-group">
+                        <select class="form-control select2" name="client" onchange="this.form.submit()">
+                            <option value="" <?php if ($client == "") { echo "selected"; } ?>>- All Clients -</option>
+
+                            <?php
+                            $sql_clients_filter = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                            while ($row = mysqli_fetch_array($sql_clients_filter)) {
+                                $client_id = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                                <option <?php if ($client == $client_id) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                            <?php
+                            }
+                            ?>
+
+                        </select>
+                    </div>
+                </div>
+                <?php } ?>
+                <div class="col-md-3">
+                    <div class="form-group">
+                        <select onchange="this.form.submit()" class="form-control select2" name="show_column[]" data-placeholder="- Show Additional Columns -" multiple>
+                            <option
+                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { echo 'selected'; } ?>>OS
+                            </option>
+                            <option
+                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Purchase_Date
+                            </option>
+                            <option
+                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Install_Date
+                            </option>
+                            <option
+                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { echo 'selected'; } ?>>Warranty_Expire
+                            </option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-md-3">
+                    <div class="btn-group float-right">
+                        <a href="?<?php echo $client_url; ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                            class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
+                            <i class="fa fa-fw fa-archive mr-2"></i>Archived
+                        </a>
+                        <div class="dropdown ml-2" id="bulkActionButton" hidden>
+                            <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
+                                <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount"></span>)
+                            </button>
+                            <div class="dropdown-menu">
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
+                                    <i class="fas fa-fw fa-user mr-2"></i>Assign Contact
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkTransferAssetClientModal">
+                                    <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer to Client
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
+                                    <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
+                                    <i class="fas fa-fw fa-info mr-2"></i>Set Status
+                                </a>
+                                <div class="dropdown-divider"></div>
+                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
+                                    <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
+                                </a>
+                                <?php if ($archived) { ?>
+                                <div class="dropdown-divider"></div>
+                                <button class="dropdown-item text-info"
+                                    type="submit" form="bulkActions" name="bulk_unarchive_assets">
+                                    <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                </button>
+                                <?php } else { ?>
+                                <div class="dropdown-divider"></div>
+                                <button class="dropdown-item text-danger confirm-link"
+                                    type="submit" form="bulkActions" name="bulk_archive_assets">
+                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                </button>
+                                <?php } ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+            </div>
+        </form>
+        <hr>
+        <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
+            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+            <div class="table-responsive">
+                <table class="table border table-hover">
+                    <thead class="thead-light <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
+                    <tr>
+                        <td class="bg-light pr-0">
+                            <div class="form-check">
+                                <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
+                            </div>
+                        </td>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">
+                                Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">
+                                    Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <?php if ($_GET['type'] !== 'virtual') { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">
+                                    Model <?php if ($sort == 'asset_make') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">
+                                    Serial <?php if ($sort == 'asset_serial') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
+                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
+                                <th>
+                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">
+                                        OS <?php if ($sort == 'asset_os') { echo $order_icon; } ?>
+                                    </a>
+                                </th>
+                            <?php } ?>
+                        <?php } ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_ip&order=<?php echo $disp; ?>">
+                                    IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_purchase_date&order=<?php echo $disp; ?>">
+                                    Purchase Date <?php if ($sort == 'asset_purchase_date') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">
+                                    Install Date <?php if ($sort == 'asset_install_date') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_warranty_expire&order=<?php echo $disp; ?>">
+                                    Warranty Expire <?php if ($sort == 'asset_warranty_expire') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
+                                    Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                        <?php } ?>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
+                                Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">
+                                Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php if (!$client_url) { ?>
+                        <th>
+                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php } ?>
+                        <th class="text-center">Action</th>
+                    </tr>
+
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $client_id = intval($row['client_id']);
+                        $client_name = nullable_htmlentities($row['client_name']);
+                        $asset_id = intval($row['asset_id']);
+                        $asset_type = nullable_htmlentities($row['asset_type']);
+                        $asset_name = nullable_htmlentities($row['asset_name']);
+                        $asset_description = nullable_htmlentities($row['asset_description']);
+                        if ($asset_description) {
+                            $asset_description_display = "-";
+                        } else {
+                            $asset_description_display = $asset_description;
+                        }
+                        $asset_make = nullable_htmlentities($row['asset_make']);
+                        $asset_model = nullable_htmlentities($row['asset_model']);
+                        $asset_serial = nullable_htmlentities($row['asset_serial']);
+                        if ($asset_serial) {
+                            $asset_serial_display = $asset_serial;
+                        } else {
+                            $asset_serial_display = "-";
+                        }
+                        $asset_os = nullable_htmlentities($row['asset_os']);
+                        if ($asset_os) {
+                            $asset_os_display = $asset_os;
+                        } else {
+                            $asset_os_display = "-";
+                        }
+                        $asset_ip = nullable_htmlentities($row['interface_ip']);
+                        if ($asset_ip) {
+                            $asset_ip_display = $asset_ip;
+                        } else {
+                            $asset_ip_display = "-";
+                        }
+                        $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']);
+                        $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']);
+                        $asset_mac = nullable_htmlentities($row['interface_mac']);
+                        $asset_uri = nullable_htmlentities($row['asset_uri']);
+                        $asset_uri_2 = nullable_htmlentities($row['asset_uri_2']);
+                        $asset_status = nullable_htmlentities($row['asset_status']);
+                        $asset_purchase_reference = nullable_htmlentities($row['asset_purchase_reference']);
+                        $asset_purchase_date = nullable_htmlentities($row['asset_purchase_date']);
+                        if ($asset_purchase_date) {
+                            $asset_purchase_date_display = $asset_purchase_date;
+                        } else {
+                            $asset_purchase_date_display = "-";
+                        }
+                        $asset_warranty_expire = nullable_htmlentities($row['asset_warranty_expire']);
+                        if ($asset_warranty_expire) {
+                            $asset_warranty_expire_display = $asset_warranty_expire;
+                        } else {
+                            $asset_warranty_expire_display = "-";
+                        }
+                        $asset_install_date = nullable_htmlentities($row['asset_install_date']);
+                        if ($asset_install_date) {
+                            $asset_install_date_display = $asset_install_date;
+                        } else {
+                            $asset_install_date_display = "-";
+                        }
+                        $asset_photo = nullable_htmlentities($row['asset_photo']);
+                        $asset_physical_location = nullable_htmlentities($row['asset_physical_location']);
+                        if ($asset_physical_location) {
+                            $asset_physical_location_display = "<div class='text-secondary'>$asset_physical_location</div>";
+                        } else {
+                            $asset_physical_location_display = "";
+                        }
+                        $asset_notes = nullable_htmlentities($row['asset_notes']);
+                        $asset_created_at = nullable_htmlentities($row['asset_created_at']);
+                        $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
+                        $asset_vendor_id = intval($row['asset_vendor_id']);
+                        $asset_location_id = intval($row['asset_location_id']);
+                        $asset_contact_id = intval($row['asset_contact_id']);
+                        $asset_network_id = intval($row['interface_network_id']);
+
+                        $device_icon = getAssetIcon($asset_type);
+
+                        $contact_name = nullable_htmlentities($row['contact_name']);
+                        if (empty($contact_name)) {
+                            $contact_name = "-";
+                        }
+                        $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
+                        if ($contact_archived_at) {
+                            $contact_name_display = "<div class='text-danger' title='Archived'><s>$contact_name</s></div>";
+                        } else {
+                            $contact_name_display = $contact_name;
+                        }
+
+                        $location_name = nullable_htmlentities($row['location_name']);
+                        if (empty($location_name)) {
+                            $location_name = "-";
+                        }
+                        $location_archived_at = nullable_htmlentities($row['location_archived_at']);
+                        if ($location_archived_at) {
+                            $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
+                        } else {
+                            $location_name_display = $location_name;
+                        }
+
+                        $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id");
+                        $login_count = mysqli_num_rows($sql_logins);
+
+                        ?>
+                        <tr>
+                            <td class="pr-0 bg-light">
+                                <div class="form-check">
+                                    <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
+                                </div>
+                            </td>
+                            <td>
+                                <a href="asset_details.php?<?php echo $client_url; ?>asset_id=<?php echo $asset_id; ?>" class="text-dark">
+                                    <div class="media">
+                                        <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
+                                        <div class="media-body">
+                                            <div><?php echo $asset_name; ?></div>
+                                            <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </td>
+
+                            <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
+                                <td><?php echo $asset_type; ?></td>
+                            <?php } ?>
+                            <?php if ($_GET['type'] !== 'virtual') { ?>
+                                <td>
+                                    <?php echo $asset_make; ?>
+                                    <div class="mt-0">
+                                        <small class="text-muted"><?php echo $asset_model; ?></small>
+                                    </div>
+                                </td>
+                            <?php } ?>
+                            <?php if ($_GET['type'] !== 'virtual') { ?>
+                                <td><?php echo $asset_serial_display; ?></td>
+                            <?php } ?>
+                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
+                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
+                                <td><?php echo $asset_os_display; ?></td>
+                            <?php } ?>
+                            <?php } ?>
+                                <td><?php echo $asset_ip_display; ?></td>
+                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
+                                <td><?php echo $asset_purchase_date_display; ?></td>
+                            <?php } ?>
+                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
+                                <td><?php echo $asset_install_date_display; ?></td>
+                            <?php } ?>
+                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
+                                <td><?php echo $asset_warranty_expire_display; ?></td>
+                            <?php } ?>
+                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?>
+                                <td><?php echo $contact_name_display; ?></td>
+                            <?php } ?>
+                            <td>
+                                <?php echo $location_name_display; ?>
+                                <?php echo $asset_physical_location_display; ?>
+                            </td>
+                            <td><?php echo $asset_status; ?></td>
+                            <?php if (!$client_url) { ?>
+                            <td><a href="assets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                            <?php } ?>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <?php if ($login_count > 0) { ?>
+                                    <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $asset_id; ?>"><i class="fas fa-key text-dark"></i></button>
+
+                                    <div class="modal" id="viewPasswordModal<?php echo $asset_id; ?>" tabindex="-1">
+                                        <div class="modal-dialog">
+                                            <div class="modal-content bg-dark">
+                                                <div class="modal-header">
+                                                    <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
+                                                    <button type="button" class="close text-white" data-dismiss="modal">
+                                                        <span>&times;</span>
+                                                    </button>
+                                                </div>
+                                                <div class="modal-body bg-white">
+
+                                                    <?php while ($row = mysqli_fetch_array($sql_logins)) {
+                                                        $login_id = intval($row['login_id']);
+                                                        $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
+                                                        $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
+                                                        ?>
+
+                                                        <div class="form-group">
+                                                            <div class="input-group">
+                                                                <div class="input-group-prepend">
+                                                                    <span class="input-group-text"><i class="fa fa-user"></i></span>
+                                                                </div>
+                                                                <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
+                                                                <div class="input-group-append">
+                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div class="form-group">
+                                                            <div class="input-group">
+                                                                <div class="input-group-prepend">
+                                                                    <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                                                                </div>
+                                                                <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
+                                                                <div class="input-group-append">
+                                                                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                    <?php } ?>
+
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <?php } ?>
+                                    <?php if ( !empty($asset_uri) || !empty($asset_uri_2) ) { ?>
+                                    <div class="dropdown dropleft text-center">
+                                        <button class="btn btn-default btn-sm" type="button" data-toggle="dropdown">
+                                            <i class="fa fa-fw fa-external-link-alt"></i>
+                                        </button>
+                                        <div class="dropdown-menu">
+                                            <?php if ($asset_uri) { ?>
+                                            <a href="<?php echo $asset_uri; ?>" alt="<?php echo $asset_uri; ?>" target="_blank" class="dropdown-item" >
+                                                <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri,40); ?>
+                                            </a>
+                                            <?php } ?>
+                                            <?php if ($asset_uri_2) { ?>
+                                            <div class="dropdown-divider"></div>
+                                            <a href="<?php echo $asset_uri_2; ?>" target="_blank" class="dropdown-item" >
+                                                <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri_2,40); ?>
+                                            </a>
+                                            <?php } ?>
+                                        </div>
+                                    </div>
+                                    <?php } ?>
+                                    <div class="dropdown dropleft text-center">
+                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
+                                        <div class="dropdown-menu">
+                                            <a class="dropdown-item" href="#"
+                                                data-toggle="ajax-modal"
+                                                data-ajax-url="ajax/ajax_asset_edit.php"
+                                                data-ajax-id="<?php echo $asset_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                            </a>
+                                            <a class="dropdown-item" href="#"
+                                                data-toggle="ajax-modal"
+                                                data-ajax-url="ajax/ajax_asset_copy.php"
+                                                data-ajax-id="<?php echo $asset_id; ?>">
+                                                <i class="fas fa-fw fa-copy mr-2"></i>Copy
+                                            </a>
+                                            <?php if ($session_user_role > 2) { ?>
+                                                <?php if ($asset_archived_at) { ?>
+                                                <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                    <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                                </a>
+                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                </a>
+                                                <?php } else { ?>
+                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                                </a>
+                                                <?php } ?>
+
+                                            <?php } ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once "modals/asset_bulk_assign_location_modal.php"; ?>
+            <?php require_once "modals/asset_bulk_assign_contact_modal.php"; ?>
+            <?php require_once "modals/asset_bulk_transfer_client_modal.php"; ?>
+            <?php require_once "modals/asset_bulk_edit_status_modal.php"; ?>
+            <?php require_once "modals/asset_bulk_add_ticket_modal.php"; ?>
+        </form>
+        <?php require_once "includes/filter_footer.php"; ?>
+    </div>
+</div>
+
+<script src="js/bulk_actions.js"></script>
+
+<?php
+require_once "modals/asset_add_modal.php";
+require_once "modals/asset_import_modal.php";
+require_once "modals/asset_export_modal.php";
+require_once "includes/footer.php";
+
+?>
+
+<!-- JSON Autocomplete / type ahead -->
+<link rel="stylesheet" href="plugins/jquery-ui/jquery-ui.min.css">
+<script src="plugins/jquery-ui/jquery-ui.min.js"></script>
+<script>
+    $(function() {
+        var operatingSystems = <?php echo $json_os; ?>;
+        $("#os").autocomplete({
+            source: operatingSystems,  // Should be an array of objects with 'label' and 'value'
+            select: function(event, ui) {
+                $("#os").val(ui.item.label); // Set the input field value to the selected label
+                return false;
+            }
+        });
+    });
+</script>
diff --git a/client_assets.php b/client_assets.php
deleted file mode 100644
index 29b23d74..00000000
--- a/client_assets.php
+++ /dev/null
@@ -1,648 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "asset_name";
-$order = "ASC";
-
-require_once "includes/inc_all_client.php";
-
-// Perms
-enforceUserPermission('module_support');
-
-//Asset Type from GET
-if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
-    $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'server') {
-    $type_query = "asset_type = 'server'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'virtual') {
-    $type_query = "asset_type = 'Virtual Machine'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'network') {
-    $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'other') {
-    $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'";
-} else {
-    $type_query = "asset_type LIKE '%'";
-    $_GET['type'] = '';
-}
-
-// Location Filter
-if (isset($_GET['location']) & !empty($_GET['location'])) {
-    $location_query = 'AND (asset_location_id = ' . intval($_GET['location']) . ')';
-    $location_filter = intval($_GET['location']);
-} else {
-    // Default - any
-    $location_query = '';
-    $location_filter = '';
-}
-
-//Get Asset Counts
-$row = mysqli_fetch_assoc(mysqli_query($mysqli, "
-    SELECT 
-        COUNT(*) AS all_count,
-        SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count,
-        SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count,
-        SUM(CASE WHEN asset_type = 'virtual machine' THEN 1 ELSE 0 END) AS virtual_count,
-        SUM(CASE WHEN asset_type IN ('Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS network_count,
-        SUM(CASE WHEN asset_type NOT IN ('laptop', 'desktop', 'server', 'virtual machine', 'Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS other_count
-    FROM (
-        SELECT assets.* FROM assets 
-        LEFT JOIN contacts ON asset_contact_id = contact_id 
-        LEFT JOIN locations ON asset_location_id = location_id 
-        LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
-        WHERE asset_client_id = $client_id
-        AND asset_$archive_query
-    ) AS filtered_assets;
-"));
-
-//All Asset Count
-$all_count = intval($row['all_count']);
-
-//Workstation Count
-$workstation_count = intval($row['workstation_count']);
-
-//Server Count
-$server_count = intval($row['server_count']);
-
-//Virtual Server Count
-$virtual_count = intval($row['virtual_count']);
-
-//Network Device Count
-$network_count = intval($row['network_count']);
-
-//Other Count
-$other_count = intval($row['other_count']);
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM assets 
-    LEFT JOIN contacts ON asset_contact_id = contact_id 
-    LEFT JOIN locations ON asset_location_id = location_id 
-    LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
-    WHERE asset_client_id = $client_id
-    AND asset_$archive_query
-    AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%')
-    AND ($type_query)
-    $location_query
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
-);
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-
-// OS typeahead suggestions
-$os_sql = mysqli_query($mysqli, "SELECT DISTINCT asset_os AS label FROM assets WHERE asset_archived_at IS NULL");
-if (mysqli_num_rows($os_sql) > 0) {
-    while ($row = mysqli_fetch_array($os_sql)) {
-        $os_arr[] = $row;
-	 }
-    $json_os = json_encode($os_arr);
-}
-
-?>
-
-    <div class="col-sm-12 mb-3">
-        <div class="btn-group btn-block">
-            <a href="?client_id=<?php echo $client_id; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Workstations<span class="right badge badge-light ml-2"><?php echo $workstation_count; ?></span></a>
-         
-            <a href="?client_id=<?php echo $client_id; ?>&<?php echo $url_query_strings_sort; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server mr-2"></i>Servers<span class="right badge badge-light ml-2"><?php echo $server_count; ?></span></a>
- 
-            <a href="?client_id=<?php echo $client_id; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud mr-2"></i>Virtual<span class="right badge badge-light ml-2"><?php echo $virtual_count; ?></span></a>
-      
-            <a href="?client_id=<?php echo $client_id; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired mr-2"></i>Network<span class="right badge badge-light ml-2"><?php echo $network_count; ?></span></a>
-      
-            <a href="?client_id=<?php echo $client_id; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag mr-2"></i>Other<span class="right badge badge-light ml-2"><?php echo $other_count; ?></span></a>
-        </div>
-    </div>
-
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</h3>
-            <div class="card-tools">
-                <?php if (lookupUserPermission("module_support") >= 2) { ?>
-                <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetModal">
-                        <i class="fas fa-plus mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>
-                    </button>
-                    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
-                    <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#importAssetModal">
-                            <i class="fa fa-fw fa-upload mr-2"></i>Import
-                        </a>
-                        <?php if ($num_rows[0] > 0) { ?>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportAssetModal">
-                                <i class="fa fa-fw fa-download mr-2"></i>Export
-                            </a>
-                        <?php } ?>
-                    </div>
-                </div>
-                <?php } ?>
-            </div>
-        </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="type" value="<?php echo stripslashes(nullable_htmlentities($_GET['type'])); ?>">
-                <input type="hidden" name="archived" value="<?php echo $archived; ?>">
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?php if (!empty($_GET['type'])) { echo ucwords(stripslashes(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>s">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="input-group">
-                            <select class="form-control select2" name="location" onchange="this.form.submit()">
-                                <option value="">- All Locations -</option>
-
-                                <?php
-                                $sql_locations_filter = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_client_id = $client_id AND location_archived_at IS NULL ORDER BY location_name ASC");
-                                while ($row = mysqli_fetch_array($sql_locations_filter)) {
-                                    $location_id = intval($row['location_id']);
-                                    $location_name = nullable_htmlentities($row['location_name']);
-                                ?>
-                                    <option <?php if ($location_filter == $location_id) { echo "selected"; } ?> value="<?php echo $location_id; ?>"><?php echo $location_name; ?></option>
-                                <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <select onchange="this.form.submit()" class="form-control select2" name="show_column[]" data-placeholder="- Show Additional Columns -" multiple>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { echo 'selected'; } ?>>OS
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Purchase_Date
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Install_Date
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { echo 'selected'; } ?>>Warranty_Expire
-                                </option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="btn-group float-right">
-                            <a href="?client_id=<?php echo $client_id; ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
-                                class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
-                                <i class="fa fa-fw fa-archive mr-2"></i>Archived
-                            </a>
-                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount"></span>)
-                                </button>
-                                <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignContactModal">
-                                        <i class="fas fa-fw fa-user mr-2"></i>Assign Contact
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkTransferAssetClientModal">
-                                        <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer to Client
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAssignLocationModal">
-                                        <i class="fas fa-fw fa-map-marker-alt mr-2"></i>Assign Location
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
-                                        <i class="fas fa-fw fa-info mr-2"></i>Set Status
-                                    </a>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkAddTicketModal">
-                                        <i class="fas fa-fw fa-life-ring mr-2"></i>Create Tickets
-                                    </a>
-                                    <?php if ($archived) { ?>
-                                    <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-info"
-                                        type="submit" form="bulkActions" name="bulk_unarchive_assets">
-                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                    </button>
-                                    <?php } else { ?>
-                                    <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-danger confirm-link"
-                                        type="submit" form="bulkActions" name="bulk_archive_assets">
-                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                    </button>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    
-                </div>
-            </form>
-            <hr>
-            <form id="bulkActions" action="post.php" method="post" enctype="multipart/form-data">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="table-responsive">
-                    <table class="table border table-hover">
-                        <thead class="thead-light <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
-                        <tr>
-                            <td class="bg-light pr-0">
-                                <div class="form-check">
-                                    <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
-                                </div>
-                            </td>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">
-                                    Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">
-                                        Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">
-                                        Model <?php if ($sort == 'asset_make') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">
-                                        Serial <?php if ($sort == 'asset_serial') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                    <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">
-                                            OS <?php if ($sort == 'asset_os') { echo $order_icon; } ?>
-                                        </a>
-                                    </th>
-                                <?php } ?>
-                            <?php } ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_ip&order=<?php echo $disp; ?>">
-                                        IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_purchase_date&order=<?php echo $disp; ?>">
-                                        Purchase Date <?php if ($sort == 'asset_purchase_date') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">
-                                        Install Date <?php if ($sort == 'asset_install_date') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_warranty_expire&order=<?php echo $disp; ?>">
-                                        Warranty Expire <?php if ($sort == 'asset_warranty_expire') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
-                                        Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
-                                    Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">
-                                    Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th class="text-center">Action</th>
-                        </tr>
-
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $asset_id = intval($row['asset_id']);
-                            $asset_type = nullable_htmlentities($row['asset_type']);
-                            $asset_name = nullable_htmlentities($row['asset_name']);
-                            $asset_description = nullable_htmlentities($row['asset_description']);
-                            if ($asset_description) {
-                                $asset_description_display = "-";
-                            } else {
-                                $asset_description_display = $asset_description;
-                            }
-                            $asset_make = nullable_htmlentities($row['asset_make']);
-                            $asset_model = nullable_htmlentities($row['asset_model']);
-                            $asset_serial = nullable_htmlentities($row['asset_serial']);
-                            if ($asset_serial) {
-                                $asset_serial_display = $asset_serial;
-                            } else {
-                                $asset_serial_display = "-";
-                            }
-                            $asset_os = nullable_htmlentities($row['asset_os']);
-                            if ($asset_os) {
-                                $asset_os_display = $asset_os;
-                            } else {
-                                $asset_os_display = "-";
-                            }
-                            $asset_ip = nullable_htmlentities($row['interface_ip']);
-                            if ($asset_ip) {
-                                $asset_ip_display = $asset_ip;
-                            } else {
-                                $asset_ip_display = "-";
-                            }
-                            $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']);
-                            $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']);
-                            $asset_mac = nullable_htmlentities($row['interface_mac']);
-                            $asset_uri = nullable_htmlentities($row['asset_uri']);
-                            $asset_uri_2 = nullable_htmlentities($row['asset_uri_2']);
-                            $asset_status = nullable_htmlentities($row['asset_status']);
-                            $asset_purchase_reference = nullable_htmlentities($row['asset_purchase_reference']);
-                            $asset_purchase_date = nullable_htmlentities($row['asset_purchase_date']);
-                            if ($asset_purchase_date) {
-                                $asset_purchase_date_display = $asset_purchase_date;
-                            } else {
-                                $asset_purchase_date_display = "-";
-                            }
-                            $asset_warranty_expire = nullable_htmlentities($row['asset_warranty_expire']);
-                            if ($asset_warranty_expire) {
-                                $asset_warranty_expire_display = $asset_warranty_expire;
-                            } else {
-                                $asset_warranty_expire_display = "-";
-                            }
-                            $asset_install_date = nullable_htmlentities($row['asset_install_date']);
-                            if ($asset_install_date) {
-                                $asset_install_date_display = $asset_install_date;
-                            } else {
-                                $asset_install_date_display = "-";
-                            }
-                            $asset_photo = nullable_htmlentities($row['asset_photo']);
-                            $asset_physical_location = nullable_htmlentities($row['asset_physical_location']);
-                            if ($asset_physical_location) {
-                                $asset_physical_location_display = "<div class='text-secondary'>$asset_physical_location</div>";
-                            } else {
-                                $asset_physical_location_display = "";
-                            }
-                            $asset_notes = nullable_htmlentities($row['asset_notes']);
-                            $asset_created_at = nullable_htmlentities($row['asset_created_at']);
-                            $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
-                            $asset_vendor_id = intval($row['asset_vendor_id']);
-                            $asset_location_id = intval($row['asset_location_id']);
-                            $asset_contact_id = intval($row['asset_contact_id']);
-                            $asset_network_id = intval($row['interface_network_id']);
-
-                            $device_icon = getAssetIcon($asset_type);
-
-                            $contact_name = nullable_htmlentities($row['contact_name']);
-                            if (empty($contact_name)) {
-                                $contact_name = "-";
-                            }
-                            $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
-                            if ($contact_archived_at) {
-                                $contact_name_display = "<div class='text-danger' title='Archived'><s>$contact_name</s></div>";
-                            } else {
-                                $contact_name_display = $contact_name;
-                            }
-
-                            $location_name = nullable_htmlentities($row['location_name']);
-                            if (empty($location_name)) {
-                                $location_name = "-";
-                            }
-                            $location_archived_at = nullable_htmlentities($row['location_archived_at']);
-                            if ($location_archived_at) {
-                                $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
-                            } else {
-                                $location_name_display = $location_name;
-                            }
-
-                            $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id");
-                            $login_count = mysqli_num_rows($sql_logins);
-
-                            ?>
-                            <tr>
-                                <td class="pr-0 bg-light">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
-                                    </div>
-                                </td>
-                                <td>
-                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="text-dark">
-                                        <div class="media">
-                                            <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
-                                            <div class="media-body">
-                                                <div><?php echo $asset_name; ?></div>
-                                                <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
-                                            </div>
-                                        </div>
-                                    </a>
-                                </td>
-
-                                <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
-                                    <td><?php echo $asset_type; ?></td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'virtual') { ?>
-                                    <td>
-                                        <?php echo $asset_make; ?>
-                                        <div class="mt-0">
-                                            <small class="text-muted"><?php echo $asset_model; ?></small>
-                                        </div>
-                                    </td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'virtual') { ?>
-                                    <td><?php echo $asset_serial_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                    <td><?php echo $asset_os_display; ?></td>
-                                <?php } ?>
-                                <?php } ?>
-                                    <td><?php echo $asset_ip_display; ?></td>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_purchase_date_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_install_date_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_warranty_expire_display; ?></td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?>
-                                    <td><?php echo $contact_name_display; ?></td>
-                                <?php } ?>
-                                <td>
-                                    <?php echo $location_name_display; ?>
-                                    <?php echo $asset_physical_location_display; ?>
-                                </td>
-                                <td><?php echo $asset_status; ?></td>
-                                <td class="text-center">
-                                    <div class="btn-group">
-                                        <?php if ($login_count > 0) { ?>
-                                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $asset_id; ?>"><i class="fas fa-key text-dark"></i></button>
-
-                                        <div class="modal" id="viewPasswordModal<?php echo $asset_id; ?>" tabindex="-1">
-                                            <div class="modal-dialog">
-                                                <div class="modal-content bg-dark">
-                                                    <div class="modal-header">
-                                                        <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
-                                                        <button type="button" class="close text-white" data-dismiss="modal">
-                                                            <span>&times;</span>
-                                                        </button>
-                                                    </div>
-                                                    <div class="modal-body bg-white">
-
-                                                        <?php while ($row = mysqli_fetch_array($sql_logins)) {
-                                                            $login_id = intval($row['login_id']);
-                                                            $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
-                                                            $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
-                                                            ?>
-
-                                                            <div class="form-group">
-                                                                <div class="input-group">
-                                                                    <div class="input-group-prepend">
-                                                                        <span class="input-group-text"><i class="fa fa-user"></i></span>
-                                                                    </div>
-                                                                    <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
-                                                                    <div class="input-group-append">
-                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="form-group">
-                                                                <div class="input-group">
-                                                                    <div class="input-group-prepend">
-                                                                        <span class="input-group-text"><i class="fa fa-lock"></i></span>
-                                                                    </div>
-                                                                    <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
-                                                                    <div class="input-group-append">
-                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                        <?php } ?>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-
-                                        <?php } ?>
-                                        <?php if ( !empty($asset_uri) || !empty($asset_uri_2) ) { ?>
-                                        <div class="dropdown dropleft text-center">
-                                            <button class="btn btn-default btn-sm" type="button" data-toggle="dropdown">
-                                                <i class="fa fa-fw fa-external-link-alt"></i>
-                                            </button>
-                                            <div class="dropdown-menu">
-                                                <?php if ($asset_uri) { ?>
-                                                <a href="<?php echo $asset_uri; ?>" alt="<?php echo $asset_uri; ?>" target="_blank" class="dropdown-item" >
-                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri,40); ?>
-                                                </a>
-                                                <?php } ?>
-                                                <?php if ($asset_uri_2) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a href="<?php echo $asset_uri_2; ?>" target="_blank" class="dropdown-item" >
-                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri_2,40); ?>
-                                                </a>
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                        <?php } ?>
-                                        <div class="dropdown dropleft text-center">
-                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
-                                            <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#"
-                                                    data-toggle="ajax-modal"
-                                                    data-ajax-url="ajax/ajax_asset_edit.php"
-                                                    data-ajax-id="<?php echo $asset_id; ?>">
-                                                    <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                                </a>
-                                                <a class="dropdown-item" href="#"
-                                                    data-toggle="ajax-modal"
-                                                    data-ajax-url="ajax/ajax_asset_copy.php"
-                                                    data-ajax-id="<?php echo $asset_id; ?>">
-                                                    <i class="fas fa-fw fa-copy mr-2"></i>Copy
-                                                </a>
-                                                <?php if ($session_user_role > 2) { ?>
-                                                    <?php if ($asset_archived_at) { ?>
-                                                    <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                                    </a>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                    </a>
-                                                    <?php } else { ?>
-                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                    </a>
-                                                    <?php } ?>
-
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <?php
-
-                        }
-
-                        ?>
-
-                        </tbody>
-                    </table>
-                </div>
-                <?php require_once "modals/client_asset_bulk_assign_location_modal.php"; ?>
-                <?php require_once "modals/client_asset_bulk_assign_contact_modal.php"; ?>
-                <?php require_once "modals/client_asset_bulk_transfer_client_modal.php"; ?>
-                <?php require_once "modals/client_asset_bulk_edit_status_modal.php"; ?>
-                <?php require_once "modals/client_asset_bulk_add_ticket_modal.php"; ?>
-            </form>
-            <?php require_once "includes/filter_footer.php"; ?>
-        </div>
-    </div>
-
-<script src="js/bulk_actions.js"></script>
-
-<?php
-require_once "modals/client_asset_add_modal.php";
-require_once "modals/client_asset_import_modal.php";
-require_once "modals/client_asset_export_modal.php";
-require_once "includes/footer.php";
-
-?>
-
-<!-- JSON Autocomplete / type ahead -->
-<link rel="stylesheet" href="plugins/jquery-ui/jquery-ui.min.css">
-<script src="plugins/jquery-ui/jquery-ui.min.js"></script>
-<script>
-    $(function() {
-        var operatingSystems = <?php echo $json_os; ?>;
-        $("#os").autocomplete({
-            source: operatingSystems,  // Should be an array of objects with 'label' and 'value'
-            select: function(event, ui) {
-                $("#os").val(ui.item.label); // Set the input field value to the selected label
-                return false;
-            }
-        });
-    });
-</script>
diff --git a/client_document_details.php b/client_document_details.php
index 256e138d..33b1dfe0 100644
--- a/client_document_details.php
+++ b/client_document_details.php
@@ -268,7 +268,7 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
+                    <a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" target="_blank"><?php echo $asset_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
                         <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
@@ -330,7 +330,7 @@ $page_title = $row['document_name'];
 
                 ?>
                 <div class="ml-2">
-                    <a href="client_vendors.php?client_id=<?php echo $client_id; ?>&q=<?php echo $vendor_name; ?>" target="_blank"><?php echo $vendor_name; ?></a>
+                    <a href="vendors.php?client_id=<?php echo $client_id; ?>&q=<?php echo $vendor_name; ?>" target="_blank"><?php echo $vendor_name; ?></a>
                     <a class="confirm-link float-right" href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
                         <i class="fas fa-fw fa-trash-alt text-secondary"></i>
                     </a>
diff --git a/client_domains.php b/domains.php
similarity index 90%
rename from client_domains.php
rename to domains.php
index bb7ca38c..2c95a9bb 100644
--- a/client_domains.php
+++ b/domains.php
@@ -4,7 +4,16 @@
 $sort = "domain_name";
 $order = "ASC";
 
-require_once "includes/inc_all_client.php";
+// If client_id is in URI then show client Side Bar and client header
+if (isset($_GET['client_id'])) {
+    require_once "includes/inc_all_client.php";
+    $client_query = "AND domain_client_id = $client_id";
+    $client_url = "client_id=$client_id&";
+} else {
+    require_once "includes/inc_client_overview_all.php";
+    $client_query = '';
+    $client_url = '';
+}
 
 // Perms
 enforceUserPermission('module_support');
@@ -12,19 +21,20 @@ enforceUserPermission('module_support');
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*,
+$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*, clients.*,
     registrar.vendor_name AS registrar_name,
     dnshost.vendor_name AS dnshost_name,
     mailhost.vendor_name AS mailhost_name,
     webhost.vendor_name AS webhost_name
     FROM domains
+    LEFT JOIN clients ON client_id = domain_client_id
     LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id
     LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id
     LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id
     LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id
-    WHERE domain_client_id = $client_id
     AND domain_$archive_query
-    AND (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%') 
+    AND (domains.domain_name LIKE '%$q%' OR domains.domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%')
+    $client_query
     ORDER BY $sort $order LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -33,7 +43,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
     <div class="card card-dark">
         <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domain Management</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>
@@ -64,7 +74,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <div class="col-md-8">
                         <div class="btn-group float-right">
-                            <a href="?client_id=<?php echo $client_id; ?>&archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
+                            <a href="?<?php echo $client_url; ?>archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
                                 class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
                                 <i class="fa fa-fw fa-archive mr-2"></i>Archived
                             </a>
@@ -101,8 +111,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                 <form id="bulkActions" action="post.php" method="post">
                     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                    <?php if ($client_url) { ?>
                     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-
+                    <?php } ?>
                     <table class="table table-striped table-borderless table-hover">
                         <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
                         <tr>
@@ -141,6 +152,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Expires <?php if ($sort == 'domain_expire') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            <?php if (!$client_url) { ?>
+                            <th>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
+                            <?php } ?>
                             <th class="text-center">Action</th>
                         </tr>
                         </thead>
@@ -181,6 +199,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']);
                             $domain_created_at = nullable_htmlentities($row['domain_created_at']);
                             $domain_archived_at = nullable_htmlentities($row['domain_archived_at']);
+                            $client_id = intval($row['domain_client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
                             // Add - if empty on the table
                             $domain_registrar_name_display = $domain_registrar_name ? $domain_registrar_name : "-";
                             $domain_webhost_name_display = $domain_webhost_name ? $domain_webhost_name : "-";
@@ -198,7 +218,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <a class="text-dark" href="#"
                                         data-toggle="ajax-modal"
                                         data-modal-size="lg"
-                                        data-ajax-url="ajax/ajax_domain_edit.php"
+                                        data-ajax-url="ajax/ajax_domain_edit.php?<?php echo $client_url; ?>"
                                         data-ajax-id="<?php echo $domain_id; ?>"
                                         >
                                         <div class="media">
@@ -218,6 +238,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <div><?php echo $domain_expire; ?></div>
                                     <div><small><?php echo $domain_expire_ago; ?></small></div>
                                 </td>
+                                <?php if (!$client_url) { ?>
+                                <td><?php echo $client_name; ?></td>
+                                <?php } ?>
                                 <td>
                                     <div class="dropdown dropleft text-center">
                                         <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
@@ -227,7 +250,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             <a class="dropdown-item" href="#"
                                                 data-toggle="ajax-modal"
                                                 data-modal-size="lg"
-                                                data-ajax-url="ajax/ajax_domain_edit.php"
+                                                data-ajax-url="ajax/ajax_domain_edit.php?<?php echo $client_url; ?>"
                                                 data-ajax-id="<?php echo $domain_id; ?>"
                                                 >
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
@@ -269,8 +292,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/client_domain_add_modal.php";
-require_once "modals/client_domain_export_modal.php";
+require_once "modals/domain_add_modal.php";
+require_once "modals/domain_export_modal.php";
 ?>
 
 <script src="js/bulk_actions.js"></script>
diff --git a/global_search.php b/global_search.php
index 0ddb1edd..59b1c126 100644
--- a/global_search.php
+++ b/global_search.php
@@ -324,7 +324,7 @@ if (isset($_GET['query'])) {
 
                                 ?>
                                 <tr>
-                                    <td><a href="client_domains.php?client_id=<?php echo $client_id; ?>&domain_id=<?php echo $domain_id; ?>"><?php echo $domain_name; ?></a>
+                                    <td><a href="domains.php?client_id=<?php echo $client_id; ?>&domain_id=<?php echo $domain_id; ?>"><?php echo $domain_name; ?></a>
                                     <td><?php echo $domain_expiry; ?></td>
                                     <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                                 </tr>
@@ -750,7 +750,7 @@ if (isset($_GET['query'])) {
                                     </td>
                                     <td><?php echo $asset_type; ?></td>
                                     <td><?php echo $asset_serial_display; ?></td>
-                                    <td><a href="client_assets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                                    <td><a href="assets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                                     <td><?php echo $contact_name_display; ?></td>
                                 </tr>
 
diff --git a/includes/client_overview_side_nav.php b/includes/client_overview_side_nav.php
new file mode 100644
index 00000000..ff9c5ae6
--- /dev/null
+++ b/includes/client_overview_side_nav.php
@@ -0,0 +1,46 @@
+<!-- Main Sidebar Container -->
+<aside class="main-sidebar sidebar-dark-primary d-print-none">
+
+    <a class="pb-1 mt-1 brand-link" href="clients.php">
+        <p class="h6"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
+            <span class="brand-text ">Back | <strong>Client Overview</strong>
+        </p>
+    </a>
+
+    <!-- Sidebar -->
+    <div class="sidebar">
+
+        <!-- Sidebar Menu -->
+        <nav>
+
+            <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
+
+                <li class="nav-header">OVERVIEWS</li>
+
+                <?php  if (lookupUserPermission("module_support") >= 1) { ?>
+                    <li class="nav-item">
+                        <a href="assets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-desktop"></i>
+                            <p><strong>ALL</strong> Assets</p>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a href="domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
+                            <i class="nav-icon fas fa-globe"></i>
+                            <p><strong>ALL</strong> Domains</p>
+                        </a>
+                    </li>
+                <?php } ?>
+
+            </ul>
+
+        </nav>
+        <!-- /.sidebar-menu -->
+
+        <div class="sidebar-custom mb-3">
+
+        </div>
+
+    </div>
+    <!-- /.sidebar -->
+</aside>
diff --git a/includes/client_side_nav.php b/includes/client_side_nav.php
index 5fc84c4c..2e9e6210 100644
--- a/includes/client_side_nav.php
+++ b/includes/client_side_nav.php
@@ -116,7 +116,7 @@
 
                     <?php if (lookupUserPermission("module_support") >= 1) { ?>
                         <li class="nav-item">
-                            <a href="client_assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_assets.php" || basename($_SERVER["PHP_SELF"]) == "client_asset_details.php") { echo "active"; } ?>">
+                            <a href="assets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "assets.php" || basename($_SERVER["PHP_SELF"]) == "client_asset_details.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-desktop"></i>
                                 <p>
                                     Assets
@@ -195,7 +195,7 @@
                         </li>
 
                         <li class="nav-item">
-                            <a href="client_domains.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_domains.php") { echo "active"; } ?>">
+                            <a href="domains.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "domains.php") { echo "active"; } ?>">
                                 <i class="nav-icon fas fa-globe"></i>
                                 <p>
                                     Domains
diff --git a/includes/inc_client_overview_all.php b/includes/inc_client_overview_all.php
new file mode 100644
index 00000000..f266c9f6
--- /dev/null
+++ b/includes/inc_client_overview_all.php
@@ -0,0 +1,12 @@
+<?php
+
+require_once "config.php";
+require_once "functions.php";
+require_once "check_login.php";
+require_once "page_title.php";
+require_once "header.php";
+require_once "top_nav.php";
+require_once "client_overview_side_nav.php";
+require_once "inc_wrapper.php";
+require_once "inc_alert_feedback.php";
+require_once "filter_header.php";
diff --git a/includes/reports_side_nav.php b/includes/reports_side_nav.php
index 05ede460..ea178871 100644
--- a/includes/reports_side_nav.php
+++ b/includes/reports_side_nav.php
@@ -115,12 +115,6 @@
                             <p>All Assets</p>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a href="report_domains.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_domains.php") { echo "active"; } ?>">
-                            <i class="nav-icon fas fa-globe"></i>
-                            <p>All Domains</p>
-                        </a>
-                    </li>
                 <?php } ?>
 
             </ul>
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 24ac45e4..9b0b86ce 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -6,6 +6,11 @@
         <li class="nav-item">
             <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i class="fas fa-bars"></i></a>
         </li>
+        <li class="nav-item" title="Client Overview">
+            <a href="domains.php" class="nav-link">
+                <i class="fas fa-users nav-icon mr-2"></i>Client Overview
+            </a>
+        </li>
     </ul>
 
     <!-- Center navbar links -->
diff --git a/modals/client_asset_add_modal.php b/modals/asset_add_modal.php
similarity index 100%
rename from modals/client_asset_add_modal.php
rename to modals/asset_add_modal.php
diff --git a/modals/client_asset_bulk_add_ticket_modal.php b/modals/asset_bulk_add_ticket_modal.php
similarity index 100%
rename from modals/client_asset_bulk_add_ticket_modal.php
rename to modals/asset_bulk_add_ticket_modal.php
diff --git a/modals/client_asset_bulk_assign_contact_modal.php b/modals/asset_bulk_assign_contact_modal.php
similarity index 100%
rename from modals/client_asset_bulk_assign_contact_modal.php
rename to modals/asset_bulk_assign_contact_modal.php
diff --git a/modals/client_asset_bulk_assign_location_modal.php b/modals/asset_bulk_assign_location_modal.php
similarity index 100%
rename from modals/client_asset_bulk_assign_location_modal.php
rename to modals/asset_bulk_assign_location_modal.php
diff --git a/modals/client_asset_bulk_edit_status_modal.php b/modals/asset_bulk_edit_status_modal.php
similarity index 100%
rename from modals/client_asset_bulk_edit_status_modal.php
rename to modals/asset_bulk_edit_status_modal.php
diff --git a/modals/client_asset_bulk_transfer_client_modal.php b/modals/asset_bulk_transfer_client_modal.php
similarity index 100%
rename from modals/client_asset_bulk_transfer_client_modal.php
rename to modals/asset_bulk_transfer_client_modal.php
diff --git a/modals/client_asset_export_modal.php b/modals/asset_export_modal.php
similarity index 81%
rename from modals/client_asset_export_modal.php
rename to modals/asset_export_modal.php
index be26f8fd..8860ba99 100644
--- a/modals/client_asset_export_modal.php
+++ b/modals/asset_export_modal.php
@@ -9,13 +9,15 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
 
                 <div class="modal-body bg-white">
 
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="export_client_assets_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="submit" name="export_assets_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
diff --git a/modals/client_asset_import_modal.php b/modals/asset_import_modal.php
similarity index 77%
rename from modals/client_asset_import_modal.php
rename to modals/asset_import_modal.php
index cc10bd7b..512958e9 100644
--- a/modals/client_asset_import_modal.php
+++ b/modals/asset_import_modal.php
@@ -9,7 +9,10 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+                
+                <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body bg-white">
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location</p>
                     <hr>
@@ -17,10 +20,10 @@
                         <input type="file" class="form-control-file" name="file" accept=".csv" required>
                     </div>
                     <hr>
-                    <div>Download <a href="post.php?download_client_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
+                    <div>Download <a href="post.php?download_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="import_client_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
+                    <button type="submit" name="import_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
                 </div>
             </form>
         </div>
diff --git a/modals/client_asset_interface_add_modal.php b/modals/asset_interface_add_modal.php
similarity index 100%
rename from modals/client_asset_interface_add_modal.php
rename to modals/asset_interface_add_modal.php
diff --git a/modals/client_asset_interface_export_modal.php b/modals/asset_interface_export_modal.php
similarity index 100%
rename from modals/client_asset_interface_export_modal.php
rename to modals/asset_interface_export_modal.php
diff --git a/modals/client_asset_interface_import_modal.php b/modals/asset_interface_import_modal.php
similarity index 100%
rename from modals/client_asset_interface_import_modal.php
rename to modals/asset_interface_import_modal.php
diff --git a/modals/client_asset_interface_multiple_add_modal.php b/modals/asset_interface_multiple_add_modal.php
similarity index 100%
rename from modals/client_asset_interface_multiple_add_modal.php
rename to modals/asset_interface_multiple_add_modal.php
diff --git a/modals/client_domain_add_modal.php b/modals/domain_add_modal.php
similarity index 81%
rename from modals/client_domain_add_modal.php
rename to modals/domain_add_modal.php
index 70049ea8..6b3cc90b 100644
--- a/modals/client_domain_add_modal.php
+++ b/modals/domain_add_modal.php
@@ -8,7 +8,6 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <div class="modal-body bg-white">
 
                     <ul class="nav nav-pills nav-justified mb-3">
@@ -47,6 +46,38 @@
                                 </div>
                             </div>
 
+                            <?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> / <span class="text-secondary">Use Primary 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="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 value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+
+                                            <?php } ?>
+                                        </select>
+                                        <div class="input-group-append">
+                                            <div class="input-group-text">
+                                                <input type="checkbox" name="use_primary_contact" value="1">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Registrar</label>
                                 <div class="input-group">
diff --git a/modals/client_domain_export_modal.php b/modals/domain_export_modal.php
similarity index 79%
rename from modals/client_domain_export_modal.php
rename to modals/domain_export_modal.php
index cb743669..7b985881 100644
--- a/modals/client_domain_export_modal.php
+++ b/modals/domain_export_modal.php
@@ -8,12 +8,14 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
+                <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+                <?php } ?>
                 <div class="modal-body bg-white">
 
                 </div>
                 <div class="modal-footer bg-white">
-                    <button type="submit" name="export_client_domains_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
+                    <button type="submit" name="export_domains_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
             </form>
diff --git a/post/user/asset.php b/post/user/asset.php
index 52709ede..727d1040 100644
--- a/post/user/asset.php
+++ b/post/user/asset.php
@@ -496,7 +496,7 @@ if (isset($_POST['bulk_unarchive_assets'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_POST["import_client_assets_csv"])) {
+if (isset($_POST["import_assets_csv"])) {
 
     enforceUserPermission('module_support', 2);
 
@@ -622,7 +622,7 @@ if (isset($_POST["import_client_assets_csv"])) {
     }
 }
 
-if (isset($_GET['download_client_assets_csv_template'])) {
+if (isset($_GET['download_assets_csv_template'])) {
     $client_id = intval($_GET['download_client_assets_csv_template']);
 
     //get records from database
@@ -654,16 +654,21 @@ if (isset($_GET['download_client_assets_csv_template'])) {
 
 }
 
-if (isset($_POST['export_client_assets_csv'])) {
+if (isset($_POST['export_assets_csv'])) {
 
     enforceUserPermission('module_support');
 
     validateCSRFToken($_POST['csrf_token']);
 
-    $client_id = intval($_POST['client_id']);
+    if (isset($_POST['client_id'])) {
+        $client_id = intval($_POST['client_id']);
+        $client_query = "AND asset_client_id = $client_id";
+    } else {
+        $client_query = '';
+    }
 
     //get records from database
-    $sql = mysqli_query($mysqli,"SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 LEFT JOIN clients ON asset_client_id = client_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+    $sql = mysqli_query($mysqli,"SELECT * FROM assets LEFT JOIN contacts ON asset_contact_id = contact_id LEFT JOIN locations ON asset_location_id = location_id LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1 LEFT JOIN clients ON asset_client_id = client_id WHERE asset_archived_at IS NULL $client_query ORDER BY asset_name ASC");
     $row = mysqli_fetch_array($sql);
 
     $client_name = $row['client_name'];
diff --git a/post/user/domain.php b/post/user/domain.php
index 28807307..3be8bb02 100644
--- a/post/user/domain.php
+++ b/post/user/domain.php
@@ -329,25 +329,24 @@ if (isset($_POST['bulk_delete_domains'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_POST['export_client_domains_csv'])) {
+if (isset($_POST['export_domains_csv'])) {
 
     enforceUserPermission('module_support');
 
-    $client_id = intval($_POST['client_id']);
+    if (isset($_POST['client_id'])) {
+        $client_id = intval($_POST['client_id']);
+        $client_query = "WHERE domain_client_id = $client_id";
+    } else {
+        $client_query = '';
+    }
 
-    //get records from database
-    $sql = mysqli_query($mysqli,"SELECT client_name FROM clients WHERE client_id = $client_id");
-    $row = mysqli_fetch_array($sql);
-
-    $client_name = $row['client_name'];
-
-    $sql = mysqli_query($mysqli,"SELECT * FROM domains WHERE domain_client_id = $client_id ORDER BY domain_name ASC");
+    $sql = mysqli_query($mysqli,"SELECT * FROM domains $client_query ORDER BY domain_name ASC");
 
     $num_rows = mysqli_num_rows($sql);
 
     if ($num_rows > 0) {
         $delimiter = ",";
-        $filename = $client_name . "-Domains-" . date('Y-m-d') . ".csv";
+        $filename = "Domains-" . date('Y-m-d') . ".csv";
 
         //create a file pointer
         $f = fopen('php://memory', 'w');
@@ -374,7 +373,7 @@ if (isset($_POST['export_client_domains_csv'])) {
     }
 
     // Logging
-    logAction("Domain", "Export", "$session_name exported $num_rows domain(s)", $client_id);
+    logAction("Domain", "Export", "$session_name exported $num_rows domain(s)");
 
     exit;
 
diff --git a/report_assets.php b/report_assets.php
deleted file mode 100644
index 24c3bbeb..00000000
--- a/report_assets.php
+++ /dev/null
@@ -1,618 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "asset_name";
-$order = "ASC";
-
-require_once "includes/inc_all_reports.php";
-
-// Perms
-enforceUserPermission('module_support');
-
-//Asset Type from GET
-if (isset($_GET['type']) && ($_GET['type']) == 'workstation') {
-    $type_query = "asset_type = 'desktop' OR asset_type = 'laptop'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'server') {
-    $type_query = "asset_type = 'server'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'virtual') {
-    $type_query = "asset_type = 'Virtual Machine'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'network') {
-    $type_query = "asset_type = 'Firewall/Router' OR asset_type = 'Switch' OR asset_type = 'Access Point'";
-} elseif (isset($_GET['type']) && ($_GET['type']) == 'other') {
-    $type_query = "asset_type NOT LIKE 'laptop' AND asset_type NOT LIKE 'desktop' AND asset_type NOT LIKE 'server' AND asset_type NOT LIKE 'virtual machine' AND asset_type NOT LIKE 'firewall/router' AND asset_type NOT LIKE 'switch' AND asset_type NOT LIKE 'access point'";
-} else {
-    $type_query = "asset_type LIKE '%'";
-    $_GET['type'] = '';
-}
-
-// Client Filter
-if (isset($_GET['client']) & !empty($_GET['client'])) {
-    $client_query = 'AND (asset_client_id = ' . intval($_GET['client']) . ')';
-    $client = intval($_GET['client']);
-} else {
-    // Default - any
-    $client_query = '';
-    $client = '';
-}
-
-//Get Asset Counts
-$row = mysqli_fetch_assoc(mysqli_query($mysqli, "
-    SELECT 
-        COUNT(*) AS all_count,
-        SUM(CASE WHEN asset_type IN ('laptop', 'desktop') THEN 1 ELSE 0 END) AS workstation_count,
-        SUM(CASE WHEN asset_type = 'server' THEN 1 ELSE 0 END) AS server_count,
-        SUM(CASE WHEN asset_type = 'virtual machine' THEN 1 ELSE 0 END) AS virtual_count,
-        SUM(CASE WHEN asset_type IN ('Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS network_count,
-        SUM(CASE WHEN asset_type NOT IN ('laptop', 'desktop', 'server', 'virtual machine', 'Firewall/Router', 'switch', 'access point') THEN 1 ELSE 0 END) AS other_count
-    FROM (
-        SELECT assets.* FROM assets
-        LEFT JOIN contacts ON asset_contact_id = contact_id 
-        LEFT JOIN locations ON asset_location_id = location_id
-        LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
-        WHERE asset_$archive_query
-        AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%')
-        $client_query
-    ) AS filtered_assets;
-"));
-
-//All Asset Count
-$all_count = intval($row['all_count']);
-
-//Workstation Count
-$workstation_count = intval($row['workstation_count']);
-
-//Server Count
-$server_count = intval($row['server_count']);
-
-//Virtual Server Count
-$virtual_count = intval($row['virtual_count']);
-
-//Network Device Count
-$network_count = intval($row['network_count']);
-
-//Other Count
-$other_count = intval($row['other_count']);
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM assets
-    LEFT JOIN clients ON asset_client_id = client_id
-    LEFT JOIN contacts ON asset_contact_id = contact_id 
-    LEFT JOIN locations ON asset_location_id = location_id
-    LEFT JOIN asset_interfaces ON interface_asset_id = asset_id AND interface_primary = 1
-    WHERE asset_$archive_query
-    AND (asset_name LIKE '%$q%' OR asset_description LIKE '%$q%' OR asset_type LIKE '%$q%' OR interface_ip LIKE '%$q%' OR interface_ipv6 LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR client_name LIKE '%$q%' OR contact_name LIKE '%$q%' OR location_name LIKE '%$q%')
-    AND ($type_query)
-    $client_query
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
-);
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-?>
-
-    <div class="card card-dark">
-        <div class="card-header">
-            <h3 class="card-title"><i class="fa fa-fw fa-desktop mr-2"></i>All Assets</h3>
-            <div class="card-tools">
-            </div>
-        </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <input type="hidden" name="type" value="<?php echo stripslashes(nullable_htmlentities($_GET['type'])); ?>">
-                <input type="hidden" name="archived" value="<?php echo $archived; ?>">
-                <div class="row">
-                    <div class="col-sm-12 mb-3">
-                        <div class="btn-toolbar">
-                            <div class="btn-group btn-block">
-                                <?php if($all_count) { ?>
-                                <a href="?<?php echo $url_query_strings_sort; ?>&type=" class="btn <?php if ($_GET['type'] == 'all' || empty($_GET['type'])) { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">All Assets<span class="right badge badge-light ml-2"><?php echo $all_count; ?></span></a>
-                                <?php } ?>
-                                <?php
-                                if ($workstation_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=workstation" class="btn <?php if ($_GET['type'] == 'workstation') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Workstations<span class="right badge badge-light ml-2"><?php echo $workstation_count; ?></span></a>
-                                    <?php
-                                }
-                                if ($server_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=server" class="btn <?php if ($_GET['type'] == 'server') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-server mr-2"></i>Servers<span class="right badge badge-light ml-2"><?php echo $server_count; ?></span></a>
-                                    <?php
-                                }
-                                if ($virtual_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=virtual" class="btn <?php if ($_GET['type'] == 'virtual') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-cloud mr-2"></i>Virtual<span class="right badge badge-light ml-2"><?php echo $virtual_count; ?></span></a>
-                                    <?php
-                                }
-                                if ($network_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired mr-2"></i>Network<span class="right badge badge-light ml-2"><?php echo $network_count; ?></span></a>
-                                    <?php
-                                }
-                                if ($other_count > 0) { ?>
-                                    <a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag mr-2"></i>Other<span class="right badge badge-light ml-2"><?php echo $other_count; ?></span></a>
-                                    <?php
-                                } ?>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search <?php if (!empty($_GET['type'])) { echo ucwords(stripslashes(nullable_htmlentities($_GET['type']))); } else { echo "Asset"; } ?>s">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="input-group">
-                            <select class="form-control select2" name="client" onchange="this.form.submit()">
-                                <option value="" <?php if ($client == "") { echo "selected"; } ?>>- All Clients -</option>
-
-                                <?php
-                                $sql_clients_filter = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                while ($row = mysqli_fetch_array($sql_clients_filter)) {
-                                    $client_id = intval($row['client_id']);
-                                    $client_name = nullable_htmlentities($row['client_name']);
-                                ?>
-                                    <option <?php if ($client == $client_id) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                                <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-md-3">
-                        <div class="form-group">
-                            <select onchange="this.form.submit()" class="form-control select2" name="show_column[]" data-placeholder="- Show Additional Columns -" multiple>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { echo 'selected'; } ?>>OS
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('IP', $_GET['show_column'])) { echo 'selected'; } ?>>IP
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Purchase_Date
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { echo 'selected'; } ?>>Install_Date
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { echo 'selected'; } ?>>Warranty_Expire
-                                </option>
-                                <option
-                                    <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { echo 'selected'; } ?>>Physical_Location
-                                </option>
-                            </select>
-                        </div>
-                    </div>
-                    
-                    <div class="col-md-2">
-                        <div class="btn-group float-right">
-                            <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>"
-                                class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
-                                <i class="fa fa-fw fa-archive mr-2"></i>Archived
-                            </a>
-                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
-                                </button>
-                                <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#bulkEditStatusModal">
-                                        <i class="fas fa-fw fa-info mr-2"></i>Set Status
-                                    </a>
-                                    <?php if ($archived) { ?>
-                                    <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-info"
-                                        type="submit" form="bulkActions" name="bulk_unarchive_assets">
-                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                    </button>
-                                    <?php } else { ?>
-                                    <div class="dropdown-divider"></div>
-                                    <button class="dropdown-item text-danger confirm-link"
-                                        type="submit" form="bulkActions" name="bulk_archive_assets">
-                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                    </button>
-                                    <?php } ?>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    
-                </div>
-            </form>
-            <hr>
-            <form id="bulkActions" action="post.php" method="post">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="table-responsive">
-                    <table class="table border table-hover">
-                        <thead class="thead-light <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
-                        <tr>
-                            <td class="bg-light pr-0">
-                                <div class="form-check">
-                                    <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
-                                </div>
-                            </td>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_name&order=<?php echo $disp; ?>">
-                                    Name <?php if ($sort == 'asset_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_type&order=<?php echo $disp; ?>">
-                                        Type <?php if ($sort == 'asset_type') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_make&order=<?php echo $disp; ?>">
-                                        Model <?php if ($sort == 'asset_make') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">
-                                        Serial <?php if ($sort == 'asset_serial') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                    <th>
-                                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_os&order=<?php echo $disp; ?>">
-                                            OS <?php if ($sort == 'asset_os') { echo $order_icon; } ?>
-                                        </a>
-                                    </th>
-                                <?php } ?>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('IP', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=interface_ip&order=<?php echo $disp; ?>">
-                                        IP <?php if ($sort == 'interface_ip') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_purchase_date&order=<?php echo $disp; ?>">
-                                        Purchase Date <?php if ($sort == 'asset_purchase_date') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_install_date&order=<?php echo $disp; ?>">
-                                        Install Date <?php if ($sort == 'asset_install_date') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_warranty_expire&order=<?php echo $disp; ?>">
-                                        Warranty Expire <?php if ($sort == 'asset_warranty_expire') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'servers' && $_GET['type'] !== 'other') { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=contact_name&order=<?php echo $disp; ?>">
-                                        Assigned To <?php if ($sort == 'contact_name') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">
-                                    Location <?php if ($sort == 'location_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { ?>
-                                <th>
-                                    <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_physical_location&order=<?php echo $disp; ?>">
-                                        Physical Location <?php if ($sort == 'asset_physical_location') { echo $order_icon; } ?>
-                                    </a>
-                                </th>
-                            <?php } ?>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">
-                                    Status <?php if ($sort == 'asset_status') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $client_id = intval($row['client_id']);
-                            $client_name = nullable_htmlentities($row['client_name']);
-                            $asset_id = intval($row['asset_id']);
-                            $asset_type = nullable_htmlentities($row['asset_type']);
-                            $asset_name = nullable_htmlentities($row['asset_name']);
-                            $asset_description = nullable_htmlentities($row['asset_description']);
-                            if ($asset_description) {
-                                $asset_description_display = "-";
-                            } else {
-                                $asset_description_display = $asset_description;
-                            }
-                            $asset_make = nullable_htmlentities($row['asset_make']);
-                            $asset_model = nullable_htmlentities($row['asset_model']);
-                            $asset_serial = nullable_htmlentities($row['asset_serial']);
-                            if ($asset_serial) {
-                                $asset_serial_display = $asset_serial;
-                            } else {
-                                $asset_serial_display = "-";
-                            }
-                            $asset_os = nullable_htmlentities($row['asset_os']);
-                            if ($asset_os) {
-                                $asset_os_display = $asset_os;
-                            } else {
-                                $asset_os_display = "-";
-                            }
-                            $asset_ip = nullable_htmlentities($row['interface_ip']);
-                            if ($asset_ip) {
-                                $asset_ip_display = $asset_ip;
-                            } else {
-                                $asset_ip_display = "-";
-                            }
-                            $asset_ipv6 = nullable_htmlentities($row['interface_ipv6']);
-                            $asset_nat_ip = nullable_htmlentities($row['interface_nat_ip']);
-                            $asset_mac = nullable_htmlentities($row['interface_mac']);
-                            $asset_uri = nullable_htmlentities($row['asset_uri']);
-                            $asset_uri_2 = nullable_htmlentities($row['asset_uri_2']);
-                            $asset_status = nullable_htmlentities($row['asset_status']);
-                            $asset_purchase_date = nullable_htmlentities($row['asset_purchase_date']);
-                            if ($asset_purchase_date) {
-                                $asset_purchase_date_display = $asset_purchase_date;
-                            } else {
-                                $asset_purchase_date_display = "-";
-                            }
-                            $asset_warranty_expire = nullable_htmlentities($row['asset_warranty_expire']);
-                            if ($asset_warranty_expire) {
-                                $asset_warranty_expire_display = $asset_warranty_expire;
-                            } else {
-                                $asset_warranty_expire_display = "-";
-                            }
-                            $asset_install_date = nullable_htmlentities($row['asset_install_date']);
-                            if ($asset_install_date) {
-                                $asset_install_date_display = $asset_install_date;
-                            } else {
-                                $asset_install_date_display = "-";
-                            }
-                            $asset_photo = nullable_htmlentities($row['asset_photo']);
-                            $asset_physical_location = nullable_htmlentities($row['asset_physical_location']);
-                            if ($asset_physical_location) {
-                                $asset_physical_location_display = $asset_physical_location;
-                            } else {
-                                $asset_physical_location_display = "-";
-                            }
-                            $asset_notes = nullable_htmlentities($row['asset_notes']);
-                            $asset_created_at = nullable_htmlentities($row['asset_created_at']);
-                            $asset_archived_at = nullable_htmlentities($row['asset_archived_at']);
-                            $asset_vendor_id = intval($row['asset_vendor_id']);
-                            $asset_location_id = intval($row['asset_location_id']);
-                            $asset_contact_id = intval($row['asset_contact_id']);
-                            $asset_network_id = intval($row['interface_network_id']);
-
-                            $device_icon = getAssetIcon($asset_type);
-
-                            $contact_name = nullable_htmlentities($row['contact_name']);
-                            if (empty($contact_name)) {
-                                $contact_name = "-";
-                            }
-                            $contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
-                            if ($contact_archived_at) {
-                                $contact_name_display = "<div class='text-danger' title='Archived'><s>$contact_name</s></div>";
-                            } else {
-                                $contact_name_display = $contact_name;
-                            }
-
-                            $location_name = nullable_htmlentities($row['location_name']);
-                            if (empty($location_name)) {
-                                $location_name = "-";
-                            }
-                            $location_archived_at = nullable_htmlentities($row['location_archived_at']);
-                            if ($location_archived_at) {
-                                $location_name_display = "<div class='text-danger' title='Archived'><s>$location_name</s></div>";
-                            } else {
-                                $location_name_display = $location_name;
-                            }
-
-                            $sql_logins = mysqli_query($mysqli, "SELECT * FROM logins WHERE login_asset_id = $asset_id");
-                            $login_count = mysqli_num_rows($sql_logins);
-
-                            ?>
-                            <tr>
-                                <td class="pr-0 bg-light">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="asset_ids[]" value="<?php echo $asset_id ?>">
-                                    </div>
-                                </td>
-                                <td>
-                                    <a href="client_asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="text-dark">
-                                        <div class="media">
-                                            <i class="fa fa-fw fa-2x fa-<?php echo $device_icon; ?> mr-3 mt-1"></i>
-                                            <div class="media-body">
-                                                <div><?php echo $asset_name; ?></div>
-                                                <div><small class="text-secondary"><?php echo $asset_description; ?></small></div>
-                                            </div>
-                                        </div>
-                                    </a>
-                                </td>
-
-                                <?php if ($_GET['type'] !== 'virtual' && $_GET['type'] !== 'servers') { ?>
-                                    <td><?php echo $asset_type; ?></td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'virtual') { ?>
-                                    <td>
-                                        <?php echo $asset_make; ?>
-                                        <div class="mt-0">
-                                            <small class="text-muted"><?php echo $asset_model; ?></small>
-                                        </div>
-                                    </td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'virtual') { ?>
-                                    <td><?php echo $asset_serial_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('OS', $_GET['show_column'])) { ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other') { ?>
-                                    <td><?php echo $asset_os_display; ?></td>
-                                <?php } ?>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('IP', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_ip_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Purchase_Date', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_purchase_date_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Install_Date', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_install_date_display; ?></td>
-                                <?php } ?>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Warranty_Expire', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_warranty_expire_display; ?></td>
-                                <?php } ?>
-                                <?php if ($_GET['type'] !== 'network' && $_GET['type'] !== 'other' && $_GET['type'] !== 'servers') { ?>
-                                    <td><?php echo $contact_name_display; ?></td>
-                                <?php } ?>
-                                <td><?php echo $location_name_display; ?></td>
-                                <?php if (isset($_GET['show_column']) && is_array($_GET['show_column']) && in_array('Physical_Location', $_GET['show_column'])) { ?>
-                                    <td><?php echo $asset_physical_location_display; ?></td>
-                                <?php } ?>
-                                <td><?php echo $asset_status; ?></td>
-                                <td><a href="client_assets.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
-                                <td class="text-center">
-                                    <div class="btn-group">
-                                        <?php if ($login_count > 0) { ?>
-                                        <button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#viewPasswordModal<?php echo $asset_id; ?>"><i class="fas fa-key text-dark"></i></button>
-
-                                        <div class="modal" id="viewPasswordModal<?php echo $asset_id; ?>" tabindex="-1">
-                                            <div class="modal-dialog">
-                                                <div class="modal-content bg-dark">
-                                                    <div class="modal-header">
-                                                        <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
-                                                        <button type="button" class="close text-white" data-dismiss="modal">
-                                                            <span>&times;</span>
-                                                        </button>
-                                                    </div>
-                                                    <div class="modal-body bg-white">
-
-                                                        <?php while ($row = mysqli_fetch_array($sql_logins)) {
-                                                            $login_id = intval($row['login_id']);
-                                                            $login_username = nullable_htmlentities(decryptLoginEntry($row['login_username']));
-                                                            $login_password = nullable_htmlentities(decryptLoginEntry($row['login_password']));
-                                                            ?>
-
-                                                            <div class="form-group">
-                                                                <div class="input-group">
-                                                                    <div class="input-group-prepend">
-                                                                        <span class="input-group-text"><i class="fa fa-user"></i></span>
-                                                                    </div>
-                                                                    <input type="text" class="form-control" value="<?php echo $login_username; ?>" readonly>
-                                                                    <div class="input-group-append">
-                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_username; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="form-group">
-                                                                <div class="input-group">
-                                                                    <div class="input-group-prepend">
-                                                                        <span class="input-group-text"><i class="fa fa-lock"></i></span>
-                                                                    </div>
-                                                                    <input type="text" class="form-control" value="<?php echo $login_password; ?>" readonly autocomplete="off">
-                                                                    <div class="input-group-append">
-                                                                        <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                        <?php } ?>
-
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-
-                                        <?php } ?>
-                                        <?php if ( !empty($asset_uri) || !empty($asset_uri_2) ) { ?>
-                                        <div class="dropdown dropleft text-center">
-                                            <button class="btn btn-default btn-sm" type="button" data-toggle="dropdown">
-                                                <i class="fa fa-fw fa-external-link-alt"></i>
-                                            </button>
-                                            <div class="dropdown-menu">
-                                                <?php if ($asset_uri) { ?>
-                                                <a href="<?php echo $asset_uri; ?>" alt="<?php echo $asset_uri; ?>" target="_blank" class="dropdown-item" >
-                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri,40); ?>
-                                                </a>
-                                                <?php } ?>
-                                                <?php if ($asset_uri_2) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a href="<?php echo $asset_uri_2; ?>" target="_blank" class="dropdown-item" >
-                                                    <i class="fa fa-fw fa-external-link-alt"></i> <?php echo truncate($asset_uri_2,40); ?>
-                                                </a>
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                        <?php } ?>
-                                        <div class="dropdown dropleft text-center">
-                                            <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
-                                            <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#"
-                                                    data-toggle="ajax-modal"
-                                                    data-ajax-url="ajax/ajax_asset_edit.php"
-                                                    data-ajax-id="<?php echo $asset_id; ?>">
-                                                    <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                                </a>
-                                                <?php if ($session_user_role > 2) { ?>
-                                                    <?php if ($asset_archived_at) { ?>
-                                                    <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
-                                                    </a>
-                                                    <?php } else { ?>
-                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                    </a>
-                                                    <?php } ?>
-                                                    <?php if ($config_destructive_deletes_enable) { ?>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Delete
-                                                    </a>
-                                                    <?php } ?>
-
-                                                <?php } ?>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <?php
-
-                        }
-
-                        ?>
-
-                        </tbody>
-                    </table>
-                </div>
-                <?php require_once "modals/client_asset_bulk_edit_status_modal.php"; ?>
-            </form>
-            <?php require_once "includes/filter_footer.php"; ?>
-        </div>
-    </div>
-
-<script src="js/bulk_actions.js"></script>
-
-<?php
-
-require_once "includes/footer.php";
-
diff --git a/report_domains.php b/report_domains.php
deleted file mode 100644
index d1b07a06..00000000
--- a/report_domains.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "domain_name";
-$order = "ASC";
-
-require_once "includes/inc_all_reports.php";
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS domains.*,
-    clients.*,
-    registrar.vendor_name AS registrar_name,
-    dnshost.vendor_name AS dnshost_name,
-    mailhost.vendor_name AS mailhost_name,
-    webhost.vendor_name AS webhost_name
-    FROM domains
-    LEFT JOIN clients ON client_id = domain_client_id
-    LEFT JOIN vendors AS registrar ON domains.domain_registrar = registrar.vendor_id
-    LEFT JOIN vendors AS dnshost ON domains.domain_dnshost = dnshost.vendor_id
-    LEFT JOIN vendors AS mailhost ON domains.domain_mailhost = mailhost.vendor_id
-    LEFT JOIN vendors AS webhost ON domains.domain_webhost = webhost.vendor_id
-    WHERE domain_archived_at IS NULL
-    AND (domain_name LIKE '%$q%' OR domain_description LIKE '%$q%' OR registrar.vendor_name LIKE '%$q%' OR dnshost.vendor_name LIKE '%$q%' OR mailhost.vendor_name LIKE '%$q%' OR webhost.vendor_name LIKE '%$q%' OR client_name LIKE '%$q%')
-    ORDER BY $sort $order LIMIT $record_from, $record_to"
-);
-
-$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
-
-?>
-
-    <div class="card card-dark">
-        <div class="card-header">
-            <h3 class="card-title mt-1"><i class="fa fa-fw fa-globe mr-2"></i>Domain Management</h3>
-            <div class="card-tools">
-                <div class="btn-group">
-                    
-                </div>
-            </div>
-        </div>
-
-        <div class="card-body">
-            <form autocomplete="off">
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Domains">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="col-md-8">
-                        <div class="btn-group float-right">
-                            <div class="dropdown ml-2" id="bulkActionButton" hidden>
-                                <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown">
-                                    <i class="fas fa-fw fa-layer-group mr-2"></i>Bulk Action (<span id="selectedCount">0</span>)
-                                </button>
-                                <div class="dropdown-menu">
-                                    <button class="dropdown-item text-danger text-bold"
-                                            type="submit" form="bulkActions" name="bulk_delete_domains">
-                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-
-                <form id="bulkActions" action="post.php" method="post">
-                    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                    <table class="table table-striped table-borderless table-hover">
-                        <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                        <tr>
-                            <td class="pr-0">
-                                <div class="form-check">
-                                    <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
-                                </div>
-                            </td>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_name&order=<?php echo $disp; ?>">
-                                    Domain <?php if ($sort == 'domain_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=registrar_name&order=<?php echo $disp; ?>">
-                                    Registrar <?php if ($sort == 'registrar_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=webhost_name&order=<?php echo $disp; ?>">
-                                    Web Host <?php if ($sort == 'webhost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=dnshost_name&order=<?php echo $disp; ?>">
-                                    DNS Host <?php if ($sort == 'dnshost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=mailhost_name&order=<?php echo $disp; ?>">
-                                    Mail Host <?php if ($sort == 'mailhost_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=domain_expire&order=<?php echo $disp; ?>">
-                                    Expires <?php if ($sort == 'domain_expire') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th>
-                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                    Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
-                            <th class="text-center">Action</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <?php
-
-                        while ($row = mysqli_fetch_array($sql)) {
-                            $domain_id = intval($row['domain_id']);
-                            $domain_name = nullable_htmlentities($row['domain_name']);
-                            $domain_description = nullable_htmlentities($row['domain_description']);
-                            $domain_expire = nullable_htmlentities($row['domain_expire']);
-
-                            $domain_expire_ago = timeAgo($domain_expire);
-                            // Convert the expiry date to a timestamp
-                            $domain_expire_timestamp = strtotime($row['domain_expire']);
-                            $current_timestamp = time(); // Get current timestamp
-
-                            // Calculate the difference in days
-                            $days_until_expiry = ($domain_expire_timestamp - $current_timestamp) / (60 * 60 * 24);
-
-                            // Determine the class based on the number of days until expiry
-                            if ($days_until_expiry <= 0) {
-                                $tr_class = "table-secondary";
-                            } elseif ($days_until_expiry <= 14) {
-                                $tr_class = "table-danger";
-                            } elseif ($days_until_expiry <= 90) {
-                                $tr_class = "table-warning";
-                            } else {
-                                $tr_class = '';
-                            }
-
-                            $domain_registrar_name = nullable_htmlentities($row['registrar_name']);
-                            if ($domain_registrar_name) {
-                                $domain_registrar_name_display = $domain_registrar_name;
-                            } else {
-                                $domain_registrar_name_display = "-";
-                            }
-                            $domain_webhost_name = nullable_htmlentities($row['webhost_name']);
-                            $domain_dnshost_name = nullable_htmlentities($row['dnshost_name']);
-                            $domain_mailhost_name = nullable_htmlentities($row['mailhost_name']);
-                            $domain_created_at = nullable_htmlentities($row['domain_created_at']);
-                            // Add - if empty on the table
-                            $domain_registrar_name_display = $domain_registrar_name ? $domain_registrar_name : "-";
-                            $domain_webhost_name_display = $domain_webhost_name ? $domain_webhost_name : "-";
-                            $domain_dnshost_name_display = $domain_dnshost_name ? $domain_dnshost_name : "-";
-                            $domain_mailhost_name_display = $domain_mailhost_name ? $domain_mailhost_name : "-";
-                            $client_id = intval($row['client_id']);
-                            $client_name = nullable_htmlentities($row['client_name']);
-
-                            ?>
-                            <tr class="<?php echo $tr_class; ?>">
-                                <td class="pr-0">
-                                    <div class="form-check">
-                                        <input class="form-check-input bulk-select" type="checkbox" name="domain_ids[]" value="<?php echo $domain_id ?>">
-                                        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                                    </div>
-                                </td>
-                                <td>
-                                    <a class="text-dark">
-                                        <div class="media">
-                                            <i class="fa fa-fw fa-2x fa-globe mr-3"></i>
-                                            <div class="media-body">
-                                                <div><?php echo $domain_name; ?></div>
-                                                <div><small class="text-secondary"><?php echo $domain_description; ?></small></div>
-                                            </div>
-                                        </div>
-                                    </a>
-                                </td>
-                                <td><?php echo $domain_registrar_name_display; ?></td>
-                                <td><?php echo $domain_webhost_name_display; ?></td>
-                                <td><?php echo $domain_dnshost_name_display; ?></td>
-                                <td><?php echo $domain_mailhost_name_display; ?></td>
-                                <td>
-                                    <div><?php echo $domain_expire; ?></div>
-                                    <div><small><?php echo $domain_expire_ago; ?></small></div>
-                                </td>
-                                <td><?php echo $client_name; ?></td>
-                                <td>
-                                    <div class="dropdown dropleft text-center">
-                                        <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                            <i class="fas fa-ellipsis-h"></i>
-                                        </button>
-                                        <div class="dropdown-menu">
-                                            <?php if ($session_user_role > 1) { ?>
-                                                <a class="dropdown-item text-danger confirm-link" href="post.php?archive_domain=<?php echo $domain_id; ?>">
-                                                    <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                                </a>
-                                            <?php } ?>
-                                            <?php if ($session_user_role == 3) { ?>
-                                                <div class="dropdown-divider"></div>
-                                                <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_domain=<?php echo $domain_id; ?>">
-                                                    <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                                </a>
-                                            <?php } ?>
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <?php
-                        }
-                        ?>
-
-                        </tbody>
-                    </table>
-
-                </form>
-            </div>
-            <?php require_once "includes/filter_footer.php";
-            ?>
-        </div>
-    </div>
-
-<script src="js/bulk_actions.js"></script>
-
-<?php require_once "includes/footer.php";
-