diff --git a/beszel/site/src/components/add-system.tsx b/beszel/site/src/components/add-system.tsx
index 85f2567..a420cff 100644
--- a/beszel/site/src/components/add-system.tsx
+++ b/beszel/site/src/components/add-system.tsx
@@ -13,12 +13,13 @@ import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '@/comp
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { $publicKey, pb } from '@/lib/stores'
-import { Copy, Plus } from 'lucide-react'
+import { Copy, PlusIcon } from 'lucide-react'
 import { useState, useRef, MutableRefObject } from 'react'
 import { useStore } from '@nanostores/react'
-import { copyToClipboard } from '@/lib/utils'
+import { cn, copyToClipboard, isReadOnlyUser } from '@/lib/utils'
+import { navigate } from './router'
 
-export function AddSystemButton() {
+export function AddSystemButton({ className }: { className?: string }) {
 	const [open, setOpen] = useState(false)
 	const port = useRef() as MutableRefObject<HTMLInputElement>
 	const publicKey = useStore($publicKey)
@@ -46,6 +47,7 @@ export function AddSystemButton() {
 		try {
 			setOpen(false)
 			await pb.collection('systems').create(data)
+			navigate('/')
 			// console.log(record)
 		} catch (e) {
 			console.log(e)
@@ -55,8 +57,11 @@ export function AddSystemButton() {
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
 			<DialogTrigger asChild>
-				<Button variant="outline" className="flex gap-1">
-					<Plus className="h-4 w-4 mr-auto" />
+				<Button
+					variant="outline"
+					className={cn('flex gap-1 max-xs:h-[2.4rem]', className, isReadOnlyUser() && 'hidden')}
+				>
+					<PlusIcon className="h-4 w-4 -ml-1" />
 					Add <span className="hidden sm:inline">System</span>
 				</Button>
 			</DialogTrigger>
diff --git a/beszel/site/src/components/command-palette.tsx b/beszel/site/src/components/command-palette.tsx
index fddd2ca..739285a 100644
--- a/beszel/site/src/components/command-palette.tsx
+++ b/beszel/site/src/components/command-palette.tsx
@@ -43,7 +43,7 @@ export default function CommandPalette() {
 
 	return (
 		<CommandDialog open={open} onOpenChange={setOpen}>
-			<CommandInput placeholder="Type a command or search..." />
+			<CommandInput placeholder="Search for systems or settings..." />
 			<CommandList>
 				<CommandEmpty>No results found.</CommandEmpty>
 				<CommandGroup heading="Suggestions">
diff --git a/beszel/site/src/components/mode-toggle.tsx b/beszel/site/src/components/mode-toggle.tsx
index c0b404f..106c4f7 100644
--- a/beszel/site/src/components/mode-toggle.tsx
+++ b/beszel/site/src/components/mode-toggle.tsx
@@ -15,7 +15,7 @@ export function ModeToggle() {
 	return (
 		<DropdownMenu>
 			<DropdownMenuTrigger asChild>
-				<Button variant={'ghost'} size="icon">
+				<Button className="max-sm:w-9" variant={'ghost'} size="icon">
 					<Sun className="h-[1.2rem] w-[1.2rem] dark:opacity-0" />
 					<MoonStarIcon className="absolute h-[1.2rem] w-[1.2rem] opacity-0 dark:opacity-100" />
 					<span className="sr-only">Toggle theme</span>
diff --git a/beszel/site/src/components/routes/home.tsx b/beszel/site/src/components/routes/home.tsx
index d08bd0b..18e652b 100644
--- a/beszel/site/src/components/routes/home.tsx
+++ b/beszel/site/src/components/routes/home.tsx
@@ -1,20 +1,25 @@
-import { Suspense, lazy, useEffect } from 'react'
+import { Suspense, lazy, useEffect, useState } from 'react'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../ui/card'
 import { $alerts, $hubVersion, $systems, pb } from '@/lib/stores'
 import { useStore } from '@nanostores/react'
 import { GithubIcon } from 'lucide-react'
 import { Separator } from '../ui/separator'
-import { updateRecordList } from '@/lib/utils'
+import { updateRecordList, updateSystemList } from '@/lib/utils'
 import { AlertRecord, SystemRecord } from '@/types'
+import { Input } from '../ui/input'
 
 const SystemsTable = lazy(() => import('../systems-table/systems-table'))
 
 export default function () {
 	const hubVersion = useStore($hubVersion)
+	const [filter, setFilter] = useState<string>()
 
 	useEffect(() => {
 		document.title = 'Dashboard / Beszel'
 
+		// make sure we have the latest list of systems
+		updateSystemList()
+
 		// subscribe to real time updates for systems / alerts
 		pb.collection<SystemRecord>('systems').subscribe('*', (e) => {
 			updateRecordList(e, $systems)
@@ -31,19 +36,29 @@ export default function () {
 	return (
 		<>
 			<Card>
-				<CardHeader className="pb-2 md:pb-5 px-4 sm:px-7 max-sm:pt-5">
-					<CardTitle className="mb-1.5">All Systems</CardTitle>
-					<CardDescription>
-						Updated in real time. Press{' '}
-						<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-0.5 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100">
-							<span className="text-xs">⌘</span>K
-						</kbd>{' '}
-						to open the command palette.
-					</CardDescription>
+				<CardHeader className="pb-5 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
+					<div className="grid md:flex gap-3 w-full items-end">
+						<div className="px-2 sm:px-1">
+							<CardTitle className="mb-2.5">All Systems</CardTitle>
+							<CardDescription>
+								Updated in real time. Press{' '}
+								<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-0.5 rounded border bg-muted px-1.5 font-mono text-[10px] font-medium text-muted-foreground opacity-100">
+									<span className="text-xs">⌘</span>K
+								</kbd>{' '}
+								to open the command palette.
+							</CardDescription>
+						</div>
+						<Input
+							// @ts-ignore
+							placeholder="Filter..."
+							onChange={(e) => setFilter(e.target.value)}
+							className="w-full md:w-56 lg:w-80 ml-auto"
+						/>
+					</div>
 				</CardHeader>
 				<CardContent className="max-sm:p-2">
 					<Suspense>
-						<SystemsTable />
+						<SystemsTable filter={filter} />
 					</Suspense>
 				</CardContent>
 			</Card>
diff --git a/beszel/site/src/components/systems-table/systems-table.tsx b/beszel/site/src/components/systems-table/systems-table.tsx
index d091e38..5da8c86 100644
--- a/beszel/site/src/components/systems-table/systems-table.tsx
+++ b/beszel/site/src/components/systems-table/systems-table.tsx
@@ -57,10 +57,9 @@ import {
 	Trash2Icon,
 	WifiIcon,
 } from 'lucide-react'
-import { useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { $hubVersion, $systems, pb } from '@/lib/stores'
 import { useStore } from '@nanostores/react'
-import { AddSystemButton } from '../add-system'
 import { cn, copyToClipboard, isReadOnlyUser } from '@/lib/utils'
 import AlertsButton from '../table-alerts'
 import { navigate } from '../router'
@@ -102,12 +101,18 @@ function sortableHeader(
 	)
 }
 
-export default function SystemsTable() {
+export default function SystemsTable({ filter }: { filter?: string }) {
 	const data = useStore($systems)
 	const hubVersion = useStore($hubVersion)
 	const [sorting, setSorting] = useState<SortingState>([])
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 
+	useEffect(() => {
+		if (filter !== undefined) {
+			table.getColumn('name')?.setFilterValue(filter)
+		}
+	}, [filter])
+
 	const columns: ColumnDef<SystemRecord>[] = useMemo(() => {
 		return [
 			{
@@ -166,7 +171,7 @@ export default function SystemsTable() {
 						return null
 					}
 					return (
-						<span className="flex gap-2 items-center md:pr-5 tabular-nums pl-1.5">
+						<span className="flex gap-2 items-center md:pr-5 tabular-nums pl-1">
 							<span
 								className={cn(
 									'w-2 h-2 left-0 rounded-full',
@@ -278,80 +283,64 @@ export default function SystemsTable() {
 	})
 
 	return (
-		<>
-			<div className="w-full">
-				<div className="flex items-center mb-4 gap-2">
-					<Input
-						// @ts-ignore
-						placeholder="Filter..."
-						value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
-						onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
-						className="max-w-sm"
-					/>
-					<div className={cn('ml-auto flex gap-2', isReadOnlyUser() && 'hidden')}>
-						<AddSystemButton />
-					</div>
-				</div>
-				<div className="rounded-md border overflow-hidden">
-					<Table>
-						<TableHeader className="bg-muted/40">
-							{table.getHeaderGroups().map((headerGroup) => (
-								<TableRow key={headerGroup.id}>
-									{headerGroup.headers.map((header) => {
-										return (
-											<TableHead className="px-2" key={header.id}>
-												{header.isPlaceholder
-													? null
-													: flexRender(header.column.columnDef.header, header.getContext())}
-											</TableHead>
-										)
-									})}
-								</TableRow>
-							))}
-						</TableHeader>
-						<TableBody>
-							{table.getRowModel().rows?.length ? (
-								table.getRowModel().rows.map((row) => (
-									<TableRow
-										key={row.original.id}
-										data-state={row.getIsSelected() && 'selected'}
-										className={cn('cursor-pointer transition-opacity', {
-											'opacity-50': row.original.status === 'paused',
-										})}
-										onClick={(e) => {
-											const target = e.target as HTMLElement
-											if (!target.closest('[data-nolink]') && e.currentTarget.contains(target)) {
-												navigate(`/system/${encodeURIComponent(row.original.name)}`)
-											}
+		<div className="rounded-md border overflow-hidden">
+			<Table>
+				<TableHeader className="bg-muted/40">
+					{table.getHeaderGroups().map((headerGroup) => (
+						<TableRow key={headerGroup.id}>
+							{headerGroup.headers.map((header) => {
+								return (
+									<TableHead className="px-2" key={header.id}>
+										{header.isPlaceholder
+											? null
+											: flexRender(header.column.columnDef.header, header.getContext())}
+									</TableHead>
+								)
+							})}
+						</TableRow>
+					))}
+				</TableHeader>
+				<TableBody>
+					{table.getRowModel().rows?.length ? (
+						table.getRowModel().rows.map((row) => (
+							<TableRow
+								key={row.original.id}
+								data-state={row.getIsSelected() && 'selected'}
+								className={cn('cursor-pointer transition-opacity', {
+									'opacity-50': row.original.status === 'paused',
+								})}
+								onClick={(e) => {
+									const target = e.target as HTMLElement
+									if (!target.closest('[data-nolink]') && e.currentTarget.contains(target)) {
+										navigate(`/system/${encodeURIComponent(row.original.name)}`)
+									}
+								}}
+							>
+								{row.getVisibleCells().map((cell) => (
+									<TableCell
+										key={cell.id}
+										style={{
+											width:
+												cell.column.getSize() === Number.MAX_SAFE_INTEGER
+													? 'auto'
+													: cell.column.getSize(),
 										}}
+										className={'overflow-hidden relative py-2.5'}
 									>
-										{row.getVisibleCells().map((cell) => (
-											<TableCell
-												key={cell.id}
-												style={{
-													width:
-														cell.column.getSize() === Number.MAX_SAFE_INTEGER
-															? 'auto'
-															: cell.column.getSize(),
-												}}
-												className={'overflow-hidden relative py-2.5'}
-											>
-												{flexRender(cell.column.columnDef.cell, cell.getContext())}
-											</TableCell>
-										))}
-									</TableRow>
-								))
-							) : (
-								<TableRow>
-									<TableCell colSpan={columns.length} className="h-24 text-center">
-										No systems found
+										{flexRender(cell.column.columnDef.cell, cell.getContext())}
 									</TableCell>
-								</TableRow>
-							)}
-						</TableBody>
-					</Table>
-				</div>
-			</div>
-		</>
+								))}
+							</TableRow>
+						))
+					) : (
+						<TableRow>
+							<TableCell colSpan={columns.length} className="h-24 text-center">
+								No systems found
+							</TableCell>
+						</TableRow>
+					)}
+				</TableBody>
+			</Table>
+		</div>
 	)
 }
diff --git a/beszel/site/src/main.tsx b/beszel/site/src/main.tsx
index c316c1d..d98292e 100644
--- a/beszel/site/src/main.tsx
+++ b/beszel/site/src/main.tsx
@@ -28,9 +28,9 @@ import {
 	DropdownMenuTrigger,
 	DropdownMenuLabel,
 } from './components/ui/dropdown-menu.tsx'
-import { AlertRecord, SystemRecord } from './types'
 import { $router, Link, navigate } from './components/router.tsx'
 import SystemDetail from './components/routes/system.tsx'
+import { AddSystemButton } from './components/add-system.tsx'
 
 // const ServerDetail = lazy(() => import('./components/routes/system.tsx'))
 const CommandPalette = lazy(() => import('./components/command-palette.tsx'))
@@ -101,7 +101,7 @@ const Layout = () => {
 	return (
 		<>
 			<div className="container">
-				<div className="flex items-center h-14 md:h-16 bg-card px-6 border bt-0 rounded-md my-4">
+				<div className="flex items-center h-14 md:h-16 bg-card px-4 pr-3 sm:px-6 border bt-0 rounded-md my-4">
 					<Link
 						href="/"
 						aria-label="Home"
@@ -114,18 +114,18 @@ const Layout = () => {
 						<Logo className="h-[1.15em] fill-foreground" />
 					</Link>
 
-					<div className={'flex ml-auto'}>
+					<div className={'flex ml-auto items-center'}>
 						<ModeToggle />
 						<DropdownMenu>
 							<DropdownMenuTrigger asChild>
 								<button
 									aria-label="User Actions"
-									className={cn('', buttonVariants({ variant: 'ghost', size: 'icon' }))}
+									className={cn('max-sm:w-9', buttonVariants({ variant: 'ghost', size: 'icon' }))}
 								>
 									<UserIcon className="h-[1.2rem] w-[1.2rem]" />
 								</button>
 							</DropdownMenuTrigger>
-							<DropdownMenuContent align="end" className="min-w-44">
+							<DropdownMenuContent className="min-w-44">
 								<DropdownMenuLabel>{pb.authStore.model?.email}</DropdownMenuLabel>
 								<DropdownMenuSeparator />
 								<DropdownMenuGroup>
@@ -171,6 +171,7 @@ const Layout = () => {
 								</DropdownMenuItem>
 							</DropdownMenuContent>
 						</DropdownMenu>
+						<AddSystemButton className="ml-2" />
 					</div>
 				</div>
 			</div>