diff --git a/admin_logs.php b/admin_logs.php
index 99cc103c..124968ef 100644
--- a/admin_logs.php
+++ b/admin_logs.php
@@ -16,6 +16,16 @@ if (isset($_GET['user']) & !empty($_GET['user'])) {
     $user = '';
 }
 
+// Client Filter
+if (isset($_GET['client']) & !empty($_GET['client'])) {
+    $client_query = 'AND (log_client_id = ' . intval($_GET['client']) . ')';
+    $client = intval($_GET['client']);
+} else {
+    // Default - any
+    $client_query = '';
+    $client = '';
+}
+
 // Log Type Filter
 if (isset($_GET['type']) & !empty($_GET['type'])) {
     $log_type_query = "AND (log_type  = '" . sanitizeInput($_GET['type']) . "')";
@@ -42,14 +52,15 @@ $url_query_strings_sort = http_build_query($get_copy);
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM logs
-  LEFT JOIN users ON log_user_id = user_id
-  LEFT JOIN clients ON log_client_id = client_id
-  WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%')
-  AND DATE(log_created_at) BETWEEN '$dtf' AND '$dtt'
-  $user_query
-  $log_type_query
-  $log_action_query
-  ORDER BY $sort $order LIMIT $record_from, $record_to"
+    LEFT JOIN users ON log_user_id = user_id
+    LEFT JOIN clients ON log_client_id = client_id
+    WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%')
+    AND DATE(log_created_at) BETWEEN '$dtf' AND '$dtt'
+    $user_query
+    $client_query
+    $log_type_query
+    $log_action_query
+    ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
@@ -72,6 +83,27 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             </div>
                         </div>
                     </div>
+                    
+                    <div class="col-sm-2">
+                        <div class="form-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 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-sm-2">
                         <div class="form-group">
                             <select class="form-control select2" name="user" onchange="this.form.submit()">
@@ -170,13 +202,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     <tr>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_created_at&order=<?php echo $disp; ?>">Timestamp</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">User</a></th>
+                        <?php if(empty($client)) { ?>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client</a></th>
+                        <?php } ?>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_type&order=<?php echo $disp; ?>">Type</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_action&order=<?php echo $disp; ?>">Action</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_description&order=<?php echo $disp; ?>">Description</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_ip&order=<?php echo $disp; ?>">IP Address</a></th>
                         <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_user_agent&order=<?php echo $disp; ?>">User Agent</a></th>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_entity_id&order=<?php echo $disp; ?>">Entity ID</a></th>
                     </tr>
                     </thead>
                     <tbody>
@@ -213,13 +246,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         <tr>
                             <td><?php echo $log_created_at; ?></td>
                             <td><?php echo $user_name_display; ?></td>
+                            <?php if(empty($client)) { ?>
                             <td><?php echo $client_name_display; ?></td>
+                            <?php } ?>
                             <td><?php echo $log_type; ?></td>
                             <td><?php echo $log_action; ?></td>
                             <td><?php echo $log_description; ?></td>
                             <td><?php echo $log_ip; ?></td>
                             <td><?php echo "$log_user_os<br>$log_user_browser"; ?></td>
-                            <td><?php echo $log_entity_id; ?></td>
                         </tr>
 
                         <?php
diff --git a/client_logs.php b/client_logs.php
deleted file mode 100644
index e3efc9bc..00000000
--- a/client_logs.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "log_id";
-$order = "DESC";
-
-require_once "inc_all_client.php";
-
-
-//Rebuild URL
-$url_query_strings_sort = http_build_query($get_copy);
-
-$sql = mysqli_query(
-    $mysqli,
-    "SELECT SQL_CALC_FOUND_ROWS * FROM logs
-    LEFT JOIN users ON log_user_id = user_id
-    WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%')
-    AND log_client_id = $client_id
-    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 py-3">
-        <h3 class="card-title"><i class="fa fa-fw fa-history mr-2"></i>Audit Logs</h3>
-    </div>
-
-    <div class="card-body">
-        <form autocomplete="off">
-            <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-            <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 Logs">
-                        <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>
-
-            </div>
-        </form>
-        <hr>
-        <div class="table-responsive-sm border">
-            <table class="table table-hover">
-                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                <tr>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_created_at&order=<?php echo $disp; ?>">Timestamp</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">User</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_type&order=<?php echo $disp; ?>">Type</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_action&order=<?php echo $disp; ?>">Action</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_description&order=<?php echo $disp; ?>">Description</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_ip&order=<?php echo $disp; ?>">IP Address</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_user_agent&order=<?php echo $disp; ?>">User Agent</a></th>
-                    <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=log_entity_id&order=<?php echo $disp; ?>">Entity ID</a></th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php
-
-                while ($row = mysqli_fetch_array($sql)) {
-                    $log_id = intval($row['log_id']);
-                    $log_type = nullable_htmlentities($row['log_type']);
-                    $log_action = nullable_htmlentities($row['log_action']);
-                    $log_description = nullable_htmlentities($row['log_description']);
-                    $log_ip = nullable_htmlentities($row['log_ip']);
-                    $log_user_agent = nullable_htmlentities($row['log_user_agent']);
-                    $log_user_os = getOS($log_user_agent);
-                    $log_user_browser = getWebBrowser($log_user_agent);
-                    $log_created_at = nullable_htmlentities($row['log_created_at']);
-                    $user_id = intval($row['user_id']);
-                    $user_name = nullable_htmlentities($row['user_name']);
-                    if (empty($user_name)) {
-                        $user_name_display = "-";
-                    } else {
-                        $user_name_display = $user_name;
-                    }
-                    $log_entity_id = intval($row['log_entity_id']);
-
-                    ?>
-
-                    <tr>
-                        <td><?php echo $log_created_at; ?></td>
-                        <td><?php echo $user_name_display; ?></td>
-                        <td><?php echo $log_type; ?></td>
-                        <td><?php echo $log_action; ?></td>
-                        <td><?php echo $log_description; ?></td>
-                        <td><?php echo $log_ip; ?></td>
-                        <td><?php echo "$log_user_os<br>$log_user_browser"; ?></td>
-                        <td><?php echo $log_entity_id; ?></td>
-                    </tr>
-
-                    <?php
-                }
-                ?>
-
-                </tbody>
-            </table>
-        </div>
-        <?php require_once "pagination.php";
- ?>
-    </div>
-</div>
-
-<?php
-require_once "footer.php";
-
diff --git a/client_overview.php b/client_overview.php
index 7428457a..326ddf98 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -332,6 +332,11 @@ $sql_asset_retire = mysqli_query(
                             </tbody>
                         </table>
                     </div>
+                    <?php if ($session_user_role == 3) { ?>
+                    <div class="card-footer">
+                        <a href="admin_logs.php?client=<?php echo $client_id; ?>">See More...</a>
+                    </div>
+                    <?php } ?>
                 </div>
             </div>
 
diff --git a/client_side_nav.php b/client_side_nav.php
index 4f3ebc52..074073be 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -339,19 +339,6 @@
                     </a>
                 </li>
 
-                <li class="nav-item">
-                    <a href="client_logs.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_logs.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-history"></i>
-                        <p>
-                            Audit Logs
-                            <?php
-                            if ($num_logs > 0) { ?>
-                                <span class="right badge text-light"><?php echo $num_logs; ?></span>
-                            <?php } ?>
-                        </p>
-                    </a>
-                </li>
-
             </ul>
         </nav>
         <!-- /.sidebar-menu -->
diff --git a/inc_all_client.php b/inc_all_client.php
index 0793590c..f1545712 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -213,9 +213,6 @@ if (isset($_GET['client_id'])) {
         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('item_id') AS num FROM shared_items WHERE item_client_id = $client_id"));
         $num_shared_links = $row['num'];
 
-        $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('log_id') AS num FROM logs WHERE log_client_id = $client_id"));
-        $num_logs = $row['num'];
-
         // Expiring Items
 
         // Count Domains Expiring within 30 Days