diff --git a/client_overview.php b/client_overview.php
index 326ddf98..2864b1b9 100644
--- a/client_overview.php
+++ b/client_overview.php
@@ -33,6 +33,16 @@ $sql_recent_logins = mysqli_query(
      ORDER BY login_updated_at DESC LIMIT 5"
 );
 
+$sql_shared_items = mysqli_query(
+    $mysqli,
+    "SELECT * FROM shared_items
+    WHERE item_client_id = $client_id
+    AND item_active = 1
+    AND item_views != item_view_limit
+    AND item_expire_at > NOW()
+    ORDER BY item_created_at DESC LIMIT 10"
+);
+
 /*
  * EXPIRING/ACTION ITEMS
  */
@@ -159,6 +169,88 @@ $sql_asset_retire = mysqli_query(
 
         <?php } ?>
 
+        <?php if (mysqli_num_rows($sql_shared_items) > 0) { ?>
+
+            <div class="col-md-4">
+
+                <div class="card card-dark mb-3">
+                    <div class="card-header">
+                        <h5 class="card-title"><i class="fa fa-fw fa-share-square mr-2"></i>Shared Items</h5>
+                    </div>
+                    <div class="card-body p-2">
+                        <table class="table table-borderless table-sm">
+                            <thead class="text-dark">
+                            <tr>
+                                <th>Item Name</th>
+                                <th>Item Type</th>
+                                <th>Share Note</th>
+                                <th>Views</th>
+                                <th>Expires</th>
+                                <th class="text-center">Action</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
+
+                            while ($row = mysqli_fetch_array($sql_shared_items)) {
+                                $item_id = intval($row['item_id']);
+                                $item_active = nullable_htmlentities($row['item_active']);
+                                $item_key = nullable_htmlentities($row['item_key']);
+                                $item_type = nullable_htmlentities($row['item_type']);
+                                $item_related_id = intval($row['item_related_id']);
+                                $item_note = nullable_htmlentities($row['item_note']);
+                                $item_views = nullable_htmlentities($row['item_views']);
+                                $item_view_limit = nullable_htmlentities($row['item_view_limit']);
+                                $item_created_at = nullable_htmlentities($row['item_created_at']);
+                                $item_expire_at = nullable_htmlentities($row['item_expire_at']);
+
+                                if ($item_type == 'Login') {
+                                    $share_item_sql = mysqli_query($mysqli, "SELECT login_name FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id'");
+                                    $share_item = mysqli_fetch_array($share_item_sql);
+                                    $item_name = nullable_htmlentities($share_item['login_name']);
+                                } elseif ($item_type == 'Document') {
+                                    $share_item_sql = mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = '$item_related_id' AND document_client_id = '$client_id'");
+                                    $share_item = mysqli_fetch_array($share_item_sql);
+                                    $item_name = nullable_htmlentities($share_item['document_name']);
+                                } elseif ($item_type == 'File') {
+                                    $share_item_sql = mysqli_query($mysqli, "SELECT file_name FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id'");
+                                    $share_item = mysqli_fetch_array($share_item_sql);
+                                    $item_name = nullable_htmlentities($share_item['file_name']);
+                                }
+                                ?>
+                                <tr>
+                                    <td><?php echo $item_name; ?></td>
+                                    <td><?php echo $item_type ?></td>
+                                    <td><?php echo $item_note ?></td>
+                                    <td><?php echo "$item_views / $item_view_limit" ?></td>
+                                    <td><?php echo $item_expire_at ?></td>
+                                    <td>
+                                        <?php if ($session_user_role == 3) { ?>
+                                            <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 text-danger confirm-link" href="post.php?deactivate_shared_item=<?php echo $item_id; ?>">
+                                                        <i class="fas fa-fw fa-times mr-2"></i>Deactivate
+                                                    </a>
+                                                </div>
+                                            </div>
+                                        <?php } ?>
+                                    </td>
+                                </tr>
+
+                                <?php } ?>
+
+                            </tbody>
+
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+        <?php } ?>
+
         <?php
         if (mysqli_num_rows($sql_domains_expiring) > 0
             || mysqli_num_rows($sql_asset_warranties_expiring) > 0
diff --git a/client_shared_items.php b/client_shared_items.php
deleted file mode 100644
index e9578d27..00000000
--- a/client_shared_items.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-// Default Column Sortby Filter
-$sort = "item_created_at";
-$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 shared_items
-    WHERE item_client_id = $client_id
-    AND item_active = '1'
-    AND item_views != item_view_limit
-    AND item_expire_at > NOW()
-    AND (item_note 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 py-3">
-            <h3 class="card-title"><i class="fa fa-fw fa-share mr-2"></i>Shared Items (Links)</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 Shared Items">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>Item Name</th>
-                        <th>Item Type</th>
-                        <th>Share Note</th>
-                        <th>Views</th>
-                        <th>Expires</th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $item_id = intval($row['item_id']);
-                        $item_active = nullable_htmlentities($row['item_active']);
-                        $item_key = nullable_htmlentities($row['item_key']);
-                        $item_type = nullable_htmlentities($row['item_type']);
-                        $item_related_id = intval($row['item_related_id']);
-                        $item_note = nullable_htmlentities($row['item_note']);
-                        $item_views = nullable_htmlentities($row['item_views']);
-                        $item_view_limit = nullable_htmlentities($row['item_view_limit']);
-                        $item_created_at = nullable_htmlentities($row['item_created_at']);
-                        $item_expire_at = nullable_htmlentities($row['item_expire_at']);
-
-                        if ($item_type == 'Login') {
-                            $share_item_sql = mysqli_query($mysqli, "SELECT login_name FROM logins WHERE login_id = '$item_related_id' AND login_client_id = '$client_id'");
-                            $share_item = mysqli_fetch_array($share_item_sql);
-                            $item_name = nullable_htmlentities($share_item['login_name']);
-                        } elseif ($item_type == 'Document') {
-                            $share_item_sql = mysqli_query($mysqli, "SELECT document_name FROM documents WHERE document_id = '$item_related_id' AND document_client_id = '$client_id'");
-                            $share_item = mysqli_fetch_array($share_item_sql);
-                            $item_name = nullable_htmlentities($share_item['document_name']);
-                        } elseif ($item_type == 'File') {
-                            $share_item_sql = mysqli_query($mysqli, "SELECT file_name FROM files WHERE file_id = '$item_related_id' AND file_client_id = '$client_id'");
-                            $share_item = mysqli_fetch_array($share_item_sql);
-                            $item_name = nullable_htmlentities($share_item['file_name']);
-                        }
-
-
-                        ?>
-                        <tr>
-                            <td><?php echo $item_name; ?></td>
-                            <td><?php echo $item_type ?></td>
-                            <td><?php echo $item_note ?></td>
-                            <td><?php echo "$item_views / $item_view_limit" ?></td>
-                            <td><?php echo $item_expire_at ?></td>
-                            <td>
-                                <?php if ($session_user_role == 3) { ?>
-                                    <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 text-danger confirm-link" href="post.php?deactivate_shared_item=<?php echo $item_id; ?>">
-                                                <i class="fas fa-fw fa-times mr-2"></i>Deactivate
-                                            </a>
-                                        </div>
-                                    </div>
-                                <?php } ?>
-                            </td>
-                        </tr>
-
-                    <?php } ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "pagination.php";
- ?>
-        </div>
-    </div>
-
-<?php
-require_once "footer.php";
-
diff --git a/client_side_nav.php b/client_side_nav.php
index 074073be..6d81d0a8 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -324,21 +324,6 @@
 
                 <?php } ?>
 
-                <li class="nav-header mt-3">MISC</li>
-
-                <li class="nav-item">
-                    <a href="client_shared_items.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_shared_items.php") { echo "active"; } ?>">
-                        <i class="nav-icon fas fa-share"></i>
-                        <p>
-                            Shared Links
-                            <?php
-                            if ($num_shared_links > 0) { ?>
-                                <span class="right badge text-light"><?php echo $num_shared_links; ?></span>
-                            <?php } ?>
-                        </p>
-                    </a>
-                </li>
-
             </ul>
         </nav>
         <!-- /.sidebar-menu -->
diff --git a/inc_all_client.php b/inc_all_client.php
index f1545712..5ae324e3 100644
--- a/inc_all_client.php
+++ b/inc_all_client.php
@@ -210,9 +210,6 @@ if (isset($_GET['client_id'])) {
         $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('trip_id') AS num FROM trips WHERE trip_archived_at IS NULL AND trip_client_id = $client_id"));
         $num_trips = $row['num'];
 
-        $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'];
-
         // Expiring Items
 
         // Count Domains Expiring within 30 Days