diff --git a/report_all_assets_by_client.php b/report_all_assets_by_client.php
deleted file mode 100644
index 623af604..00000000
--- a/report_all_assets_by_client.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-require_once "inc_all_reports.php";
-
-validateTechRole();
-
-
-if (isset($_GET['year'])) {
-    $year = intval($_GET['year']);
-} else {
-    $year = date('Y');
-}
-
-$sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
-
-?>
-
-<div class="card card-dark">
-    <div class="card-header py-2">
-        <h3 class="card-title mt-2"><i class="fas fa-fw fa-life-ring mr-2"></i>All Assets by Client</h3>
-        <div class="card-tools">
-            <button type="button" class="btn btn-primary d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</button>
-        </div>
-    </div>
-    <div class="card-body">
-        <div class="table-responsive-sm">
-            <table class="table table-striped">
-                <thead>
-                    <tr>
-                        <th>Client</th>
-                        <th>Asset Name</th>
-                        <th>Asset Type</thss=>
-                        <th>Asset Status</th=>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php
-                    while ($row = mysqli_fetch_array($sql_clients)) {
-                        $client_id = intval($row['client_id']);
-                        $client_name = nullable_htmlentities($row['client_name']);
-                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id ORDER BY asset_name ASC");
-
-                        foreach ($sql_assets as $asset) {
-                            $asset_id = intval($asset['asset_id']);
-                            $asset_name = nullable_htmlentities($asset['asset_name']);
-                            $asset_type = nullable_htmlentities($asset['asset_type']);
-                            $asset_status = nullable_htmlentities($asset['asset_status']);
-                    ?>
-
-                            <tr>
-                                <td>
-                                    <a href="/client_assets.php?client_id=<?php echo $client_id ?>">
-                                        <?php echo $client_name ?>
-                                    </a>
-                                </td>
-                                <td>
-                                    <a href="client_asset_details.php?client_id=<?php echo $client_id ?>&asset_id=<?php echo $asset_id ?>">
-                                        <?php echo $asset_name ?>
-                                    </a>
-                                </td>
-                                <td><?php echo $asset_type ?></td>
-                                <td><?php echo $asset_status ?></td>
-                            </tr>
-                    <?php
-                        }
-                    }
-                    ?>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-
-<?php
-require_once "footer.php";
-
diff --git a/report_all_assets_by_client_custom_columns.php b/report_all_assets_by_client_custom_columns.php
deleted file mode 100644
index 8742cea5..00000000
--- a/report_all_assets_by_client_custom_columns.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-require_once "inc_all_reports.php";
-
-validateTechRole();
-
-if (isset($_GET['year'])) {
-    $year = intval($_GET['year']);
-} else {
-    $year = date('Y');
-}
-
-
-// Custom columns
-if (isset($_POST['submit'])) {
-    $selected_columns = isset($_POST['columns']) ? $_POST['columns'] : [];
-} else {
-    // Set default columns if no selection is made
-    $selected_columns = ['client_name', 'asset_name', 'asset_type', 'asset_status'];  // Example default columns
-}
-
-$available_columns_sql = mysqli_query($mysqli, "SHOW COLUMNS FROM assets");
-while ($row = mysqli_fetch_array($available_columns_sql)) {
-    $available_columns[] = $row['Field'];
-}
-
-if (!empty($selected_columns)) {
-    $selected_columns = array_intersect($selected_columns, $available_columns); // Filter acceptable columns
-    $selected_columns = ['client_name', ...$selected_columns];
-
-    $columns_to_display = implode(", ", $selected_columns);
-    $query = "SELECT $columns_to_display FROM assets
-      LEFT JOIN clients on asset_client_id = client_id
-      ORDER BY asset_client_id, asset_name";
-} else {
-    $query = "SELECT client_name, asset_name, asset_type, asset_status FROM assets
-      LEFT JOIN clients on asset_client_id = client_id
-      ORDER BY asset_client_id, asset_name";  // Fallback to default columns
-}
-
-$assets_sql = mysqli_query($mysqli, $query);
-
-?>
-
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fas fa-fw fa-life-ring mr-2"></i>All Assets by Client - with custom columns</h3>
-            <div class="card-tools">
-                <button type="button" class="btn btn-primary d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</button>
-            </div>
-        </div>
-        <div class="card-body">
-            <div class="table-responsive-sm">
-                <table class="table table-striped">
-                    <thead>
-                    <tr>
-                        <?php
-                        foreach ($selected_columns as $col) {
-                            echo "<th>" . htmlspecialchars($col) . "</th>";
-                        }
-                        ?>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-                    while ($row = mysqli_fetch_assoc($assets_sql)) {
-                        echo "<tr>";
-                        foreach ($selected_columns as $col) {
-                            echo "<td>" . nullable_htmlentities($row[$col]) . "</td>";
-                        }
-                        echo "</tr>";
-                    }
-                    ?>
-                    </tbody>
-                </table>
-            </div>
-            <form method="post" action="">
-                <label><input type="checkbox" name="columns[]" value="client_name" checked>Client Name</label>
-                <label><input type="checkbox" name="columns[]" value="asset_name" checked>Name</label>
-                <label><input type="checkbox" name="columns[]" value="asset_type" checked>Type</label>
-                <label><input type="checkbox" name="columns[]" value="asset_make">Make</label>
-                <label><input type="checkbox" name="columns[]" value="asset_model">Model</label>
-                <label><input type="checkbox" name="columns[]" value="asset_serial">Serial</label>
-                <label><input type="checkbox" name="columns[]" value="asset_os">OS</label>
-                <label><input type="checkbox" name="columns[]" value="asset_status" checked>Status</label>
-                <label><input type="checkbox" name="columns[]" value="asset_purchase_date">Purchase</label>
-                <label><input type="checkbox" name="columns[]" value="asset_install_date">Install</label>
-                <label><input type="checkbox" name="columns[]" value="asset_warranty_expire">Warranty</label>
-                <label><input type="checkbox" name="columns[]" value="asset_archived_at">Archived</label>
-
-                <input type="submit" name="submit" value="Update Columns">
-            </form>
-        </div>
-    </div>
-
-<?php
-require_once "footer.php";
-
diff --git a/report_assets.php b/report_assets.php
new file mode 100644
index 00000000..98118b73
--- /dev/null
+++ b/report_assets.php
@@ -0,0 +1,576 @@
+<?php
+
+// Default Column Sortby Filter
+$sort = "asset_name";
+$order = "ASC";
+
+require_once "inc_all_reports.php";
+
+validateTechRole();
+
+//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-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 class="col-sm-12">
+                        <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>
+            </form>
+            <hr>
+            <form id="bulkActions" action="post.php" method="post">
+                <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</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</a></th>
+                            <?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</a></th>
+                            <?php }
+                            if ($_GET['type'] !== 'virtual') { ?>
+                                <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_serial&order=<?php echo $disp; ?>">Serial</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</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</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</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</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</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</a>
+                            </th>
+                            <?php } ?>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=location_name&order=<?php echo $disp; ?>">Location</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</a>
+                            </th>
+                            <?php } ?>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=asset_status&order=<?php echo $disp; ?>">Status</a></th>
+                            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client</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="modal" data-target="#editAssetModal<?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; ?>">
+                                                        <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
+                                                    </a>
+                                                    <?php } else { ?>
+                                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#transferAssetModal<?php echo $asset_id; ?>">
+                                                        <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer
+                                                    </a>
+                                                    <a class="dropdown-item text-danger confirm-link" href="post.php?archive_asset=<?php echo $asset_id; ?>">
+                                                        <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; ?>">
+                                                        <i class="fas fa-fw fa-archive mr-2"></i>Delete
+                                                    </a>
+                                                    <?php } ?>
+
+                                                <?php } ?>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <?php
+
+                            require "client_asset_edit_modal.php";
+
+                            require "client_asset_transfer_modal.php";
+
+                        }
+
+                        ?>
+
+                        </tbody>
+                    </table>
+                </div>
+                <?php require_once "client_asset_bulk_edit_status_modal.php"; ?>
+            </form>
+            <?php require_once "pagination.php"; ?>
+        </div>
+    </div>
+
+<script src="js/bulk_actions.js"></script>
+
+<?php
+
+require_once "footer.php";
+
diff --git a/reports_side_nav.php b/reports_side_nav.php
index b6bfe839..6f2a4961 100644
--- a/reports_side_nav.php
+++ b/reports_side_nav.php
@@ -115,8 +115,8 @@
                 <li class="nav-header">OVERVIEWS</li>
                 
                 <li class="nav-item">
-                    <a href="report_all_assets_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_all_assets_by_client.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-life-ring"></i>
+                    <a href="report_assets.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_assets.php") { echo "active"; } ?>">
+                        <i class="nav-icon fas fa-desktop"></i>
                         <p>All Assets</p>
                     </a>
                 </li>