diff --git a/app/src/routes/system/status/+page.svelte b/app/src/routes/system/status/+page.svelte
index a8baff9..e60f77c 100644
--- a/app/src/routes/system/status/+page.svelte
+++ b/app/src/routes/system/status/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import SystemStatus from './SystemStatus.svelte';
+  import SystemStatus from './SystemStatus.svelte'
 </script>
 
 <div class="mx-0 my-1 flex flex-col space-y-4 sm:mx-8 sm:my-8">
-	<SystemStatus />
+  <SystemStatus />
 </div>
diff --git a/app/src/routes/system/status/+page.ts b/app/src/routes/system/status/+page.ts
index 1412b4e..7a58e83 100644
--- a/app/src/routes/system/status/+page.ts
+++ b/app/src/routes/system/status/+page.ts
@@ -1,5 +1,5 @@
-import type { PageLoad } from './$types';
+import type { PageLoad } from './$types'
 
 export const load = (async () => {
-	return { title: 'System Status' };
-}) satisfies PageLoad;
+  return { title: 'System Status' }
+}) satisfies PageLoad
diff --git a/app/src/routes/system/status/ActionButton.svelte b/app/src/routes/system/status/ActionButton.svelte
new file mode 100644
index 0000000..b032f6e
--- /dev/null
+++ b/app/src/routes/system/status/ActionButton.svelte
@@ -0,0 +1,10 @@
+<script>
+  const { icon, type, label, ...rest } = $props()
+
+  const Icon = $derived(icon)
+</script>
+
+<button class="btn btn-{type} inline-flex items-center" {...rest}>
+  <Icon class="mr-2 h-5 w-5" />
+  <span>{label}</span>
+</button>
diff --git a/app/src/routes/system/status/StatusItem.svelte b/app/src/routes/system/status/StatusItem.svelte
new file mode 100644
index 0000000..f3f1f03
--- /dev/null
+++ b/app/src/routes/system/status/StatusItem.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+  const { icon, title, description } = $props()
+
+  const Icon = $derived(icon)
+</script>
+
+<div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
+  <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
+    <Icon class="text-primary-content h-auto w-full scale-75" />
+  </div>
+  <div>
+    <div class="font-bold">{title}</div>
+    <div class="text-sm opacity-75">{description}</div>
+  </div>
+</div>
diff --git a/app/src/routes/system/status/SystemStatus.svelte b/app/src/routes/system/status/SystemStatus.svelte
index 27c4d0d..3c474ba 100644
--- a/app/src/routes/system/status/SystemStatus.svelte
+++ b/app/src/routes/system/status/SystemStatus.svelte
@@ -1,327 +1,246 @@
 <script lang="ts">
-    import { onDestroy, onMount } from 'svelte';
-    import { modals } from 'svelte-modals';
-    import ConfirmDialog from '$lib/components/ConfirmDialog.svelte';
-    import SettingsCard from '$lib/components/SettingsCard.svelte';
-    import Spinner from '$lib/components/Spinner.svelte';
-    import { slide } from 'svelte/transition';
-    import { cubicOut } from 'svelte/easing';
+  import { onDestroy, onMount } from 'svelte'
+  import { modals } from 'svelte-modals'
+  import ConfirmDialog from '$lib/components/ConfirmDialog.svelte'
+  import SettingsCard from '$lib/components/SettingsCard.svelte'
+  import Spinner from '$lib/components/Spinner.svelte'
+  import { slide } from 'svelte/transition'
+  import { cubicOut } from 'svelte/easing'
 
-    import type { SystemInformation, Analytics } from '$lib/types/models';
-    import { socket } from '$lib/stores/socket';
-    import { api } from '$lib/api';
-    import { convertSeconds } from '$lib/utilities';
+  import type { SystemInformation, Analytics } from '$lib/types/models'
+  import { socket } from '$lib/stores/socket'
+  import { api } from '$lib/api'
+  import { convertSeconds } from '$lib/utilities'
 
-    import { useFeatureFlags } from '$lib/stores/featureFlags';
-    import {
-        Cancel,
-        Power,
-        FactoryReset,
-        Sleep,
-        Health,
-        CPU,
-        SDK,
-        CPP,
-        Speed,
-        Heap,
-        Pyramid,
-        Sketch,
-        Flash,
-        Folder,
-        Temperature,
-        Stopwatch
-    } from '$lib/components/icons';
+  import { useFeatureFlags } from '$lib/stores/featureFlags'
+  import {
+    Cancel,
+    Power,
+    FactoryReset,
+    Sleep,
+    Health,
+    CPU,
+    SDK,
+    CPP,
+    Speed,
+    Heap,
+    Pyramid,
+    Sketch,
+    Flash,
+    Folder,
+    Temperature,
+    Stopwatch
+  } from '$lib/components/icons'
+  import StatusItem from './StatusItem.svelte'
+  import ActionButton from './ActionButton.svelte'
 
-    const features = useFeatureFlags();
+  const features = useFeatureFlags()
 
-    let systemInformation: SystemInformation = $state();
+  let systemInformation: SystemInformation = $state()
 
-    async function getSystemStatus() {
-        const result = await api.get<SystemInformation>('/api/system/status');
-        if (result.isErr()) {
-            console.error('Error:', result.inner);
-            return;
-        }
-        systemInformation = result.inner;
-        return systemInformation;
+  async function getSystemStatus() {
+    const result = await api.get<SystemInformation>('/api/system/status')
+    if (result.isErr()) {
+      console.error('Error:', result.inner)
+      return
     }
+    systemInformation = result.inner
+    return systemInformation
+  }
 
-    const postFactoryReset = async () => await api.post('/api/system/reset');
+  const postFactoryReset = async () => await api.post('/api/system/reset')
 
-    const postSleep = async () => await api.post('api/sleep');
+  const postSleep = async () => await api.post('api/sleep')
 
-    onMount(() => socket.on('analytics', handleSystemData));
+  onMount(() => socket.on('analytics', handleSystemData))
 
-    onDestroy(() => socket.off('analytics', handleSystemData));
+  onDestroy(() => socket.off('analytics', handleSystemData))
 
-    const handleSystemData = (data: Analytics) =>
-        (systemInformation = { ...systemInformation, ...data });
+  const handleSystemData = (data: Analytics) =>
+    (systemInformation = { ...systemInformation, ...data })
 
-    const postRestart = async () => await api.post('/api/system/restart');
+  const postRestart = async () => await api.post('/api/system/restart')
 
-    function confirmRestart() {
-        modals.open(ConfirmDialog, {
-            title: 'Confirm Restart',
-            message: 'Are you sure you want to restart the device?',
-            labels: {
-                cancel: { label: 'Abort', icon: Cancel },
-                confirm: { label: 'Restart', icon: Power }
-            },
-            onConfirm: () => {
-                modals.close();
-                postRestart();
-            }
-        });
-    }
-
-    function confirmReset() {
-        modals.open(ConfirmDialog, {
-            title: 'Confirm Factory Reset',
-            message: 'Are you sure you want to reset the device to its factory defaults?',
-            labels: {
-                cancel: { label: 'Abort', icon: Cancel },
-                confirm: { label: 'Factory Reset', icon: FactoryReset }
-            },
-            onConfirm: () => {
-                modals.close();
-                postFactoryReset();
-            }
-        });
-    }
-
-    function confirmSleep() {
-        modals.open(ConfirmDialog, {
-            title: 'Confirm Going to Sleep',
-            message: 'Are you sure you want to put the device into sleep?',
-            labels: {
-                cancel: { label: 'Abort', icon: Cancel },
-                confirm: { label: 'Sleep', icon: Sleep }
-            },
-            onConfirm: () => {
-                modals.close();
-                postSleep();
-            }
-        });
+  function confirmRestart() {
+    modals.open(ConfirmDialog, {
+      title: 'Confirm Restart',
+      message: 'Are you sure you want to restart the device?',
+      labels: {
+        cancel: { label: 'Abort', icon: Cancel },
+        confirm: { label: 'Restart', icon: Power }
+      },
+      onConfirm: () => {
+        modals.close()
+        postRestart()
+      }
+    })
+  }
+
+  function confirmReset() {
+    modals.open(ConfirmDialog, {
+      title: 'Confirm Factory Reset',
+      message: 'Are you sure you want to reset the device to its factory defaults?',
+      labels: {
+        cancel: { label: 'Abort', icon: Cancel },
+        confirm: { label: 'Factory Reset', icon: FactoryReset }
+      },
+      onConfirm: () => {
+        modals.close()
+        postFactoryReset()
+      }
+    })
+  }
+
+  function confirmSleep() {
+    modals.open(ConfirmDialog, {
+      title: 'Confirm Going to Sleep',
+      message: 'Are you sure you want to put the device into sleep?',
+      labels: {
+        cancel: { label: 'Abort', icon: Cancel },
+        confirm: { label: 'Sleep', icon: Sleep }
+      },
+      onConfirm: () => {
+        modals.close()
+        postSleep()
+      }
+    })
+  }
+
+  interface ActionButtonDef {
+    icon: any
+    label: string
+    onClick: () => void
+    type?: string
+    condition?: () => boolean
+  }
+
+  const actionButtons: ActionButtonDef[] = [
+    {
+      icon: Sleep,
+      label: 'Sleep',
+      onClick: confirmSleep,
+      condition: () => Boolean($features.sleep)
+    },
+    {
+      icon: Power,
+      label: 'Restart',
+      onClick: confirmRestart
+    },
+    {
+      icon: FactoryReset,
+      label: 'Factory Reset',
+      onClick: confirmReset,
+      type: 'secondary'
     }
+  ]
 </script>
 
 <SettingsCard collapsible={false}>
-    {#snippet icon()}
-        <Health class="lex-shrink-0 mr-2 h-6 w-6 self-end" />
-    {/snippet}
-    {#snippet title()}
-        <span>System Status</span>
-    {/snippet}
+  {#snippet icon()}
+    <Health class="lex-shrink-0 mr-2 h-6 w-6 self-end" />
+  {/snippet}
+  {#snippet title()}
+    <span>System Status</span>
+  {/snippet}
 
-    <div class="w-full overflow-x-auto">
-        {#await getSystemStatus()}
-            <Spinner />
-        {:then nothing}
-            <div
-                class="flex w-full flex-col space-y-1"
-                transition:slide|local={{ duration: 300, easing: cubicOut }}
-            >
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <CPU class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Chip</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.cpu_type} Rev {systemInformation.cpu_rev}
-                        </div>
-                    </div>
-                </div>
+  <div class="w-full overflow-x-auto">
+    {#await getSystemStatus()}
+      <Spinner />
+    {:then nothing}
+      <div
+        class="flex w-full flex-col space-y-1"
+        transition:slide|local={{ duration: 300, easing: cubicOut }}>
+        <StatusItem
+          icon={CPU}
+          title="Chip"
+          description={`${systemInformation.cpu_type} Rev ${systemInformation.cpu_rev}`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <SDK class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">SDK Version</div>
-                        <div class="text-sm opacity-75">
-                            ESP-IDF {systemInformation.sdk_version} / Arduino {systemInformation.arduino_version}
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={SDK}
+          title="SDK Version"
+          description={`ESP-IDF ${systemInformation.sdk_version} / Arduino ${systemInformation.arduino_version}`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <CPP class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Firmware Version</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.firmware_version}
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={CPP}
+          title="Firmware Version"
+          description={systemInformation.firmware_version} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Speed class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">CPU Frequency</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.cpu_freq_mhz} MHz {systemInformation.cpu_cores == 2 ?
-                                'Dual Core'
-                            :   'Single Core'}
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Speed}
+          title="CPU Frequency"
+          description={`${systemInformation.cpu_freq_mhz} MHz ${
+            systemInformation.cpu_cores == 2 ? 'Dual Core' : 'Single Core'
+          }`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Heap class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Heap (Free / Max Alloc)</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.free_heap.toLocaleString('en-US')} / {systemInformation.max_alloc_heap.toLocaleString(
-                                'en-US'
-                            )} bytes
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Heap}
+          title="Heap (Free / Max Alloc)"
+          description={`${systemInformation.free_heap} / ${systemInformation.max_alloc_heap} bytes`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Pyramid class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">PSRAM (Size / Free)</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.psram_size.toLocaleString('en-US')} / {systemInformation.psram_size.toLocaleString(
-                                'en-US'
-                            )} bytes
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Pyramid}
+          title="PSRAM (Size / Free)"
+          description={`${systemInformation.psram_size} / ${systemInformation.psram_size} bytes`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Sketch class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Sketch (Used / Free)</div>
-                        <div class="flex flex-wrap justify-start gap-1 text-sm opacity-75">
-                            <span>
-                                {(
-                                    (systemInformation.sketch_size /
-                                        systemInformation.free_sketch_space) *
-                                    100
-                                ).toFixed(1)} % of
-                                {(systemInformation.free_sketch_space / 1000000).toLocaleString(
-                                    'en-US'
-                                )} MB used
-                            </span>
+        <StatusItem
+          icon={Sketch}
+          title="Sketch (Used / Free)"
+          description={`${(
+            (systemInformation.sketch_size / systemInformation.free_sketch_space) *
+            100
+          ).toFixed(1)} % of
+                ${systemInformation.free_sketch_space / 1000000} MB used (${
+                  (systemInformation.free_sketch_space - systemInformation.sketch_size) / 1000000
+                } MB free)`} />
 
-                            <span>
-                                ({(
-                                    (systemInformation.free_sketch_space -
-                                        systemInformation.sketch_size) /
-                                    1000000
-                                ).toLocaleString('en-US')} MB free)
-                            </span>
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Flash}
+          title="Flash Chip (Size / Speed)"
+          description={`${systemInformation.flash_chip_size / 1000000} MB / ${
+            systemInformation.flash_chip_speed / 1000000
+          } MHz`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Flash class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Flash Chip (Size / Speed)</div>
-                        <div class="text-sm opacity-75">
-                            {(systemInformation.flash_chip_size / 1000000).toLocaleString('en-US')} MB
-                            / {(systemInformation.flash_chip_speed / 1000000).toLocaleString(
-                                'en-US'
-                            )} MHz
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Folder}
+          title="File System (Used / Total)"
+          description={`${((systemInformation.fs_used / systemInformation.fs_total) * 100).toFixed(
+            1
+          )} % of ${systemInformation.fs_total / 1000000} MB used (${
+            (systemInformation.fs_total - systemInformation.fs_used) / 1000000
+          }
+                MB free)`} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Folder class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">File System (Used / Total)</div>
-                        <div class="flex flex-wrap justify-start gap-1 text-sm opacity-75">
-                            <span
-                                >{(
-                                    (systemInformation.fs_used / systemInformation.fs_total) *
-                                    100
-                                ).toFixed(1)} % of {(
-                                    systemInformation.fs_total / 1000000
-                                ).toLocaleString('en-US')} MB used</span
-                            >
+        <StatusItem
+          icon={Temperature}
+          title="Core Temperature"
+          description={`${
+            systemInformation.core_temp == 53.33 ?
+              'NaN'
+            : systemInformation.core_temp.toFixed(2) + ' °C'
+          }`} />
 
-                            <span
-                                >({(
-                                    (systemInformation.fs_total - systemInformation.fs_used) /
-                                    1000000
-                                ).toLocaleString('en-US')}
-                                MB free)</span
-                            >
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Stopwatch}
+          title="Uptime"
+          description={convertSeconds(systemInformation.uptime)} />
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Temperature class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Core Temperature</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.core_temp == 53.33 ?
-                                'NaN'
-                            :   systemInformation.core_temp.toFixed(2) + ' °C'}
-                        </div>
-                    </div>
-                </div>
+        <StatusItem
+          icon={Power}
+          title="Reset Reason"
+          description={systemInformation.cpu_reset_reason} />
+      </div>
+    {/await}
+  </div>
 
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10">
-                        <Stopwatch class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Uptime</div>
-                        <div class="text-sm opacity-75">
-                            {convertSeconds(systemInformation.uptime)}
-                        </div>
-                    </div>
-                </div>
-
-                <div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
-                    <div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
-                        <Power class="text-primary-content h-auto w-full scale-75" />
-                    </div>
-                    <div>
-                        <div class="font-bold">Reset Reason</div>
-                        <div class="text-sm opacity-75">
-                            {systemInformation.cpu_reset_reason}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {/await}
-    </div>
-
-    <div class="mt-4 flex flex-wrap justify-end gap-2">
-        {#if $features.sleep}
-            <button class="btn btn-primary inline-flex items-center" onclick={confirmSleep}>
-                <Sleep class="mr-2 h-5 w-5" /><span>Sleep</span>
-            </button>
-        {/if}
-        <button class="btn btn-primary inline-flex items-center" onclick={confirmRestart}>
-            <Power class="mr-2 h-5 w-5" /><span>Restart</span>
-        </button>
-        <button class="btn btn-secondary inline-flex items-center" onclick={confirmReset}>
-            <FactoryReset class="mr-2 h-5 w-5" /><span>Factory Reset</span>
-        </button>
-    </div>
+  <div class="mt-4 flex flex-wrap justify-end gap-2">
+    {#each actionButtons as button}
+      {#if button.condition === undefined || button.condition()}
+        <ActionButton
+          on:click={button.onClick}
+          icon={button.icon}
+          label={button.label}
+          type={button.type || 'primary'} />
+      {/if}
+    {/each}
+  </div>
 </SettingsCard>