diff --git a/resources/scripts/components/dashboard/DashboardContainer.tsx b/resources/scripts/components/dashboard/DashboardContainer.tsx
index 522c3f6e4..113e61d98 100644
--- a/resources/scripts/components/dashboard/DashboardContainer.tsx
+++ b/resources/scripts/components/dashboard/DashboardContainer.tsx
@@ -37,6 +37,11 @@ const DashboardContainer = () => {
     const uuid = useStoreState((state) => state.user.data!.uuid);
     const rootAdmin = useStoreState((state) => state.user.data!.rootAdmin);
     const [showOnlyAdmin, setShowOnlyAdmin] = usePersistedState(`${uuid}:show_all_servers`, false);
+    const [serverViewMode, setServerViewMode] = usePersistedState<'owner' | 'admin-all' | 'all'>(
+        `${uuid}:server_view_mode`,
+        'owner',
+    );
+
     const { setHeaderActions, clearHeaderActions } = useHeader();
 
     const [dashboardDisplayOption, setDashboardDisplayOption] = usePersistedState(
@@ -44,9 +49,17 @@ const DashboardContainer = () => {
         'list',
     );
 
+    const getApiType = (): string | undefined => {
+        if (serverViewMode === 'owner') return 'owner'; // Servers the User owns
+        if (serverViewMode === 'admin-all') return 'admin-all'; // All servers(Admin only)
+        if (serverViewMode === 'all') return 'all'; // All servers user has Access too. (Subusers and owned)
+        return undefined;
+    };
+
     const { data: servers, error } = useSWR<PaginatedResult<Server>>(
-        ['/api/client/servers', showOnlyAdmin && rootAdmin, page],
-        () => getServers({ page, type: showOnlyAdmin && rootAdmin ? 'admin' : undefined }),
+        ['/api/client/servers', serverViewMode, page],
+        () => getServers({ page, type: getApiType() }),
+        { revalidateOnFocus: false },
     );
 
     const handleFilterToggle = useCallback(() => {
@@ -56,7 +69,7 @@ const DashboardContainer = () => {
     const searchSection = useMemo(
         () => (
             <HeaderCentered>
-                <SearchSection className='max-w-128 xl:w-[30vw]' />
+                <SearchSection className='max-w-128 xl:w-[30vw] hidden md:flex ' />
             </HeaderCentered>
         ),
         [],
@@ -103,16 +116,33 @@ const DashboardContainer = () => {
                     </Button>
                 </DropdownMenuTrigger>
                 <DropdownMenuContent className='flex flex-col gap-1 z-99999' sideOffset={8}>
-                    <div className='text-xs opacity-50 text-center'>More filters coming soon!</div>
+                    <DropdownMenuItem
+                        onSelect={() => setServerViewMode('owner')}
+                        className={serverViewMode === 'owner' ? 'bg-accent/20' : ''}
+                    >
+                        Your Servers Only
+                    </DropdownMenuItem>
+
                     {rootAdmin && (
-                        <DropdownMenuItem onSelect={handleFilterToggle}>
-                            {showOnlyAdmin ? 'Show personal servers' : 'Show other servers'}
-                        </DropdownMenuItem>
+                        <>
+                            <DropdownMenuItem
+                                onSelect={() => setServerViewMode('admin-all')}
+                                className={serverViewMode === 'admin-all' ? 'bg-accent/20' : ''}
+                            >
+                                All Servers (Admin)
+                            </DropdownMenuItem>
+                        </>
                     )}
+                    <DropdownMenuItem
+                        onSelect={() => setServerViewMode('all')}
+                        className={serverViewMode === 'all' ? 'bg-accent/20' : ''}
+                    >
+                        All Servers
+                    </DropdownMenuItem>
                 </DropdownMenuContent>
             </DropdownMenu>
         ),
-        [rootAdmin, showOnlyAdmin, handleFilterToggle],
+        [rootAdmin, showOnlyAdmin],
     );
 
     useEffect(() => {
@@ -182,13 +212,20 @@ const DashboardContainer = () => {
                                 ))}
                             </div>
                         ) : (
-                            <p
+                            <div
                                 className={`text-center text-sm text-zinc-400 absolute w-full left-1/2 -translate-x-1/2`}
                             >
-                                {showOnlyAdmin
-                                    ? 'There are no other servers to display.'
-                                    : 'There are no servers associated with your account.'}
-                            </p>
+                                <p className='max-w-sm mx-auto mb-5'>
+                                    {serverViewMode === 'admin-all'
+                                        ? 'There are no other servers to display.'
+                                        : serverViewMode === 'all'
+                                            ? 'No Server Shared With your Account'
+                                            : 'There are no servers associated with your account.'}
+                                </p>
+                                <h3 className='text-lg font-medium text-zinc-200 mb-2'>
+                                    {serverViewMode === 'admin-all' ? 'No other servers found' : 'No servers found'}
+                                </h3>
+                            </div>
                         )
                     }
                 </Pagination>
diff --git a/resources/scripts/components/dashboard/ServerRow.tsx b/resources/scripts/components/dashboard/ServerRow.tsx
index eeda932d7..c2f437893 100644
--- a/resources/scripts/components/dashboard/ServerRow.tsx
+++ b/resources/scripts/components/dashboard/ServerRow.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 import { bytesToString, ip } from '@/lib/formatters';
 
-import { Server } from '@/api/server/getServer';
+import { Server, getGlobalDaemonType } from '@/api/server/getServer';
 import getServerResourceUsage, { ServerPowerState, ServerStats } from '@/api/server/getServerResourceUsage';
 
 // Determines if the current value is in an alarm threshold so we can show it in red rather
@@ -43,9 +43,9 @@ position: relative;
         } else if ($status === 'running') {
             return '0 0 12px 1px #43C760';
         } else if ($status === 'installing') {
-            return '0 0 12px 1px #4381c7'; // Blue color for installing
+            return '0 0 12px 1px #4381c7';
         } else {
-            return '0 0 12px 1px #c7aa43'; // Default for other statuses
+            return '0 0 12px 1px #c7aa43';
         }
     }};
 
diff --git a/resources/scripts/routers/UnifiedRouter.tsx b/resources/scripts/routers/UnifiedRouter.tsx
index a6a25ccd3..663b2e11d 100644
--- a/resources/scripts/routers/UnifiedRouter.tsx
+++ b/resources/scripts/routers/UnifiedRouter.tsx
@@ -2,7 +2,6 @@ import { HeaderProvider } from '@/contexts/HeaderContext';
 import { SidebarProvider } from '@/contexts/SidebarContext';
 import {
     Activity02Icon,
-    AiNetworkIcon,
     Cardiogram01Icon,
     ClockIcon,
     CloudUploadIcon,
@@ -11,13 +10,11 @@ import {
     Database02Icon,
     FolderIcon,
     GameControllerIcon,
-    Home03Icon,
     NoteIcon,
     ServerStack02Icon,
     Settings02Icon,
     Settings04Icon,
     UserMultiple02Icon,
-    WorkflowSquare01Icon,
 } from '@hugeicons/core-free-icons';
 import { useStoreState } from 'easy-peasy';
 import { Fragment, Suspense, useEffect, useRef, useState } from 'react';
@@ -187,6 +184,7 @@ const UnifiedRouter = () => {
                             end: false,
                             permission: 'file.*',
                         },
+
                         {
                             to: `/server/${id}/databases`,
                             icon: Database02Icon,