diff --git a/ui/src/components/Combobox.tsx b/ui/src/components/Combobox.tsx
index 8055043..661b77b 100644
--- a/ui/src/components/Combobox.tsx
+++ b/ui/src/components/Combobox.tsx
@@ -1,7 +1,14 @@
 import { useRef } from "react";
 import clsx from "clsx";
-import { Combobox as HeadlessCombobox, ComboboxInput, ComboboxOption, ComboboxOptions } from "@headlessui/react";
+import {
+  Combobox as HeadlessCombobox,
+  ComboboxInput,
+  ComboboxOption,
+  ComboboxOptions,
+} from "@headlessui/react";
+
 import { cva } from "@/cva.config";
+
 import Card from "./Card";
 
 export interface ComboboxOption {
@@ -22,7 +29,7 @@ const comboboxVariants = cva({
 
 type BaseProps = React.ComponentProps<typeof HeadlessCombobox>;
 
-interface ComboboxProps extends Omit<BaseProps, 'displayValue'> {
+interface ComboboxProps extends Omit<BaseProps, "displayValue"> {
   displayValue: (option: ComboboxOption) => string;
   onInputChange: (option: string) => void;
   options: () => ComboboxOption[];
@@ -48,72 +55,68 @@ export function Combobox({
   const classes = comboboxVariants({ size });
 
   return (
-    <HeadlessCombobox 
-      onChange={onChange}
-      {...otherProps}
-    >
+    <HeadlessCombobox onChange={onChange} {...otherProps}>
       {() => (
         <>
           <Card className="w-auto !border border-solid !border-slate-800/30 shadow outline-0 dark:!border-slate-300/30">
             <ComboboxInput
-            ref={inputRef}
-            className={clsx(
-              classes,
-              
-              // General styling
-              "block w-full cursor-pointer rounded border-none py-0 font-medium shadow-none outline-0 transition duration-300",
-              
-              // Hover
-              "hover:bg-blue-50/80 active:bg-blue-100/60",
-              
-              // Dark mode
-              "dark:bg-slate-800 dark:text-white dark:hover:bg-slate-700 dark:active:bg-slate-800/60",
-              
-              // Focus
-              "focus:outline-blue-600 focus:ring-2 focus:ring-blue-700 focus:ring-offset-2 dark:focus:outline-blue-500 dark:focus:ring-blue-500",
-              
-              // Disabled
-              disabled && "pointer-events-none select-none bg-slate-50 text-slate-500/80 dark:bg-slate-800 dark:text-slate-400/80 disabled:hover:bg-white dark:disabled:hover:bg-slate-800"
-            )}
-            placeholder={disabled ? disabledMessage : placeholder}
-            displayValue={displayValue}
-            onChange={(event) => onInputChange(event.target.value)}
-            disabled={disabled}
+              ref={inputRef}
+              className={clsx(
+                classes,
+
+                // General styling
+                "block w-full cursor-pointer rounded border-none py-0 font-medium shadow-none outline-0 transition duration-300",
+
+                // Hover
+                "hover:bg-blue-50/80 active:bg-blue-100/60",
+
+                // Dark mode
+                "dark:bg-slate-800 dark:text-white dark:hover:bg-slate-700 dark:active:bg-slate-800/60",
+
+                // Focus
+                "focus:outline-blue-600 focus:ring-2 focus:ring-blue-700 focus:ring-offset-2 dark:focus:outline-blue-500 dark:focus:ring-blue-500",
+
+                // Disabled
+                disabled &&
+                  "pointer-events-none select-none bg-slate-50 text-slate-500/80 disabled:hover:bg-white dark:bg-slate-800 dark:text-slate-400/80 dark:disabled:hover:bg-slate-800",
+              )}
+              placeholder={disabled ? disabledMessage : placeholder}
+              displayValue={displayValue}
+              onChange={event => onInputChange(event.target.value)}
+              disabled={disabled}
             />
           </Card>
-          
+
           {options().length > 0 && (
-            <ComboboxOptions className="absolute left-0 z-[100] mt-1 w-full max-h-60 overflow-auto rounded-md bg-white py-1 text-sm shadow-lg ring-1 ring-black/5 dark:bg-slate-800 dark:ring-slate-700 hide-scrollbar">
-              {options().map((option) => (
-                <ComboboxOption 
-                key={option.value} 
-                value={option}
-                className={clsx(
-                  // General styling
-                  "cursor-default select-none py-2 px-4",
-                  
-                  // Hover and active states
-                  "hover:bg-blue-50/80 ui-active:bg-blue-50/80 ui-active:text-blue-900",
-                  
-                  // Dark mode
-                  "dark:text-slate-300 dark:hover:bg-slate-700 dark:ui-active:bg-slate-700 dark:ui-active:text-blue-200"
-                )}
+            <ComboboxOptions className="hide-scrollbar absolute left-0 z-[100] mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-sm shadow-lg ring-1 ring-black/5 dark:bg-slate-800 dark:ring-slate-700">
+              {options().map(option => (
+                <ComboboxOption
+                  key={option.value}
+                  value={option}
+                  className={clsx(
+                    // General styling
+                    "cursor-default select-none px-4 py-2",
+
+                    // Hover and active states
+                    "hover:bg-blue-50/80 ui-active:bg-blue-50/80 ui-active:text-blue-900",
+
+                    // Dark mode
+                    "dark:text-slate-300 dark:hover:bg-slate-700 dark:ui-active:bg-slate-700 dark:ui-active:text-blue-200",
+                  )}
                 >
                   {option.label}
                 </ComboboxOption>
               ))}
             </ComboboxOptions>
           )}
-          
+
           {options().length === 0 && inputRef.current?.value && (
-            <div className="absolute left-0 z-[100] mt-1 w-full rounded-md bg-white dark:bg-slate-800 py-2 px-4 text-sm shadow-lg ring-1 ring-black/5 dark:ring-slate-700">
-              <div className="text-slate-500 dark:text-slate-400">
-                {emptyMessage}
-              </div>
+            <div className="absolute left-0 z-[100] mt-1 w-full rounded-md bg-white px-4 py-2 text-sm shadow-lg ring-1 ring-black/5 dark:bg-slate-800 dark:ring-slate-700">
+              <div className="text-slate-500 dark:text-slate-400">{emptyMessage}</div>
             </div>
           )}
         </>
       )}
     </HeadlessCombobox>
   );
-}
\ No newline at end of file
+}
diff --git a/ui/src/components/ConfirmDialog.tsx b/ui/src/components/ConfirmDialog.tsx
index 57391e2..3771096 100644
--- a/ui/src/components/ConfirmDialog.tsx
+++ b/ui/src/components/ConfirmDialog.tsx
@@ -1,4 +1,9 @@
-import { ExclamationTriangleIcon, CheckCircleIcon, InformationCircleIcon } from "@heroicons/react/24/outline";
+import {
+  ExclamationTriangleIcon,
+  CheckCircleIcon,
+  InformationCircleIcon,
+} from "@heroicons/react/24/outline";
+
 import { cx } from "@/cva.config";
 import { Button } from "@/components/Button";
 import Modal from "@/components/Modal";
@@ -42,12 +47,15 @@ const variantConfig = {
     iconBgClass: "bg-blue-100",
     buttonTheme: "primary",
   },
-} as Record<Variant, {
+} as Record<
+  Variant,
+  {
     icon: React.ElementType;
     iconClass: string;
     iconBgClass: string;
     buttonTheme: "danger" | "primary" | "blank" | "light" | "lightDanger";
-}>;
+  }
+>;
 
 export function ConfirmDialog({
   open,
@@ -65,13 +73,18 @@ export function ConfirmDialog({
   return (
     <Modal open={open} onClose={onClose}>
       <div className="mx-auto max-w-xl px-4 transition-all duration-300 ease-in-out">
-        <div className="relative w-full overflow-hidden rounded-lg bg-white p-6 text-left align-middle shadow-xl transition-all dark:bg-slate-800 pointer-events-auto">
+        <div className="pointer-events-auto relative w-full overflow-hidden rounded-lg bg-white p-6 text-left align-middle shadow-xl transition-all dark:bg-slate-800">
           <div className="space-y-4">
             <div className="sm:flex sm:items-start">
-              <div className={cx("mx-auto flex size-12 shrink-0 items-center justify-center rounded-full sm:mx-0 sm:size-10", iconBgClass)}>
+              <div
+                className={cx(
+                  "mx-auto flex size-12 shrink-0 items-center justify-center rounded-full sm:mx-0 sm:size-10",
+                  iconBgClass,
+                )}
+              >
                 <Icon aria-hidden="true" className={cx("size-6", iconClass)} />
               </div>
-              <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+              <div className="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
                 <h2 className="text-lg font-bold leading-tight text-black dark:text-white">
                   {title}
                 </h2>
@@ -83,12 +96,7 @@ export function ConfirmDialog({
 
             <div className="flex justify-end gap-x-2">
               {cancelText && (
-                <Button
-                  size="SM"
-                  theme="blank"
-                  text={cancelText}
-                  onClick={onClose}
-                />
+                <Button size="SM" theme="blank" text={cancelText} onClick={onClose} />
               )}
               <Button
                 size="SM"
@@ -103,4 +111,4 @@ export function ConfirmDialog({
       </div>
     </Modal>
   );
-} 
\ No newline at end of file
+}
diff --git a/ui/src/components/MacroForm.tsx b/ui/src/components/MacroForm.tsx
index 135817c..f74c4ae 100644
--- a/ui/src/components/MacroForm.tsx
+++ b/ui/src/components/MacroForm.tsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-
 import { LuPlus } from "react-icons/lu";
 
 import { KeySequence } from "@/hooks/stores";
@@ -7,16 +6,23 @@ import { Button } from "@/components/Button";
 import { InputFieldWithLabel, FieldError } from "@/components/InputField";
 import Fieldset from "@/components/Fieldset";
 import { MacroStepCard } from "@/components/MacroStepCard";
-import { DEFAULT_DELAY, MAX_STEPS_PER_MACRO, MAX_KEYS_PER_STEP } from "@/constants/macros";
+import {
+  DEFAULT_DELAY,
+  MAX_STEPS_PER_MACRO,
+  MAX_KEYS_PER_STEP,
+} from "@/constants/macros";
 import FieldLabel from "@/components/FieldLabel";
 
 interface ValidationErrors {
   name?: string;
-  steps?: Record<number, {
-    keys?: string;
-    modifiers?: string;
-    delay?: string;
-  }>;
+  steps?: Record<
+    number,
+    {
+      keys?: string;
+      modifiers?: string;
+      delay?: string;
+    }
+  >;
 }
 
 interface MacroFormProps {
@@ -53,16 +59,18 @@ export function MacroForm({
     } else if (macro.name.trim().length > 50) {
       newErrors.name = "Name must be less than 50 characters";
     }
-  
+
     if (!macro.steps?.length) {
       newErrors.steps = { 0: { keys: "At least one step is required" } };
     } else {
-      const hasKeyOrModifier = macro.steps.some(step => 
-        (step.keys?.length || 0) > 0 || (step.modifiers?.length || 0) > 0
+      const hasKeyOrModifier = macro.steps.some(
+        step => (step.keys?.length || 0) > 0 || (step.modifiers?.length || 0) > 0,
       );
 
       if (!hasKeyOrModifier) {
-        newErrors.steps = { 0: { keys: "At least one step must have keys or modifiers" } };
+        newErrors.steps = {
+          0: { keys: "At least one step must have keys or modifiers" },
+        };
       }
     }
 
@@ -87,7 +95,10 @@ export function MacroForm({
     }
   };
 
-  const handleKeySelect = (stepIndex: number, option: { value: string | null; keys?: string[] }) => {
+  const handleKeySelect = (
+    stepIndex: number,
+    option: { value: string | null; keys?: string[] },
+  ) => {
     const newSteps = [...(macro.steps || [])];
     if (!newSteps[stepIndex]) return;
 
@@ -97,7 +108,9 @@ export function MacroForm({
       if (!newSteps[stepIndex].keys) {
         newSteps[stepIndex].keys = [];
       }
-      const keysArray = Array.isArray(newSteps[stepIndex].keys) ? newSteps[stepIndex].keys : [];
+      const keysArray = Array.isArray(newSteps[stepIndex].keys)
+        ? newSteps[stepIndex].keys
+        : [];
       if (keysArray.length >= MAX_KEYS_PER_STEP) {
         showTemporaryError(`Maximum of ${MAX_KEYS_PER_STEP} keys per step allowed`);
         return;
@@ -105,7 +118,7 @@ export function MacroForm({
       newSteps[stepIndex].keys = [...keysArray, option.value];
     }
     setMacro({ ...macro, steps: newSteps });
-    
+
     if (errors.steps?.[stepIndex]?.keys) {
       const newErrors = { ...errors };
       delete newErrors.steps?.[stepIndex].keys;
@@ -127,7 +140,7 @@ export function MacroForm({
     const newSteps = [...(macro.steps || [])];
     newSteps[stepIndex].modifiers = modifiers;
     setMacro({ ...macro, steps: newSteps });
-    
+
     // Clear step errors when modifiers are added
     if (errors.steps?.[stepIndex]?.keys && modifiers.length > 0) {
       const newErrors = { ...errors };
@@ -148,9 +161,9 @@ export function MacroForm({
     setMacro({ ...macro, steps: newSteps });
   };
 
-  const handleStepMove = (stepIndex: number, direction: 'up' | 'down') => {
+  const handleStepMove = (stepIndex: number, direction: "up" | "down") => {
     const newSteps = [...(macro.steps || [])];
-    const newIndex = direction === 'up' ? stepIndex - 1 : stepIndex + 1;
+    const newIndex = direction === "up" ? stepIndex - 1 : stepIndex + 1;
     [newSteps[stepIndex], newSteps[newIndex]] = [newSteps[newIndex], newSteps[stepIndex]];
     setMacro({ ...macro, steps: newSteps });
   };
@@ -181,7 +194,10 @@ export function MacroForm({
         <div>
           <div className="flex items-center justify-between text-sm">
             <div className="flex items-center gap-1">
-              <FieldLabel label="Steps" description={`Keys/modifiers executed in sequence with a delay between each step.`} />
+              <FieldLabel
+                label="Steps"
+                description={`Keys/modifiers executed in sequence with a delay between each step.`}
+              />
             </div>
             <span className="text-slate-500 dark:text-slate-400">
               {macro.steps?.length || 0}/{MAX_STEPS_PER_MACRO} steps
@@ -199,18 +215,24 @@ export function MacroForm({
                   key={stepIndex}
                   step={step}
                   stepIndex={stepIndex}
-                  onDelete={macro.steps && macro.steps.length > 1 ? () => {
-                    const newSteps = [...(macro.steps || [])];
-                    newSteps.splice(stepIndex, 1);
-                    setMacro(prev => ({ ...prev, steps: newSteps }));
-                  } : undefined}
-                  onMoveUp={() => handleStepMove(stepIndex, 'up')}
-                  onMoveDown={() => handleStepMove(stepIndex, 'down')}
-                  onKeySelect={(option) => handleKeySelect(stepIndex, option)}
-                  onKeyQueryChange={(query) => handleKeyQueryChange(stepIndex, query)}
-                  keyQuery={keyQueries[stepIndex] || ''}
-                  onModifierChange={(modifiers) => handleModifierChange(stepIndex, modifiers)}
-                  onDelayChange={(delay) => handleDelayChange(stepIndex, delay)}
+                  onDelete={
+                    macro.steps && macro.steps.length > 1
+                      ? () => {
+                          const newSteps = [...(macro.steps || [])];
+                          newSteps.splice(stepIndex, 1);
+                          setMacro(prev => ({ ...prev, steps: newSteps }));
+                        }
+                      : undefined
+                  }
+                  onMoveUp={() => handleStepMove(stepIndex, "up")}
+                  onMoveDown={() => handleStepMove(stepIndex, "down")}
+                  onKeySelect={option => handleKeySelect(stepIndex, option)}
+                  onKeyQueryChange={query => handleKeyQueryChange(stepIndex, query)}
+                  keyQuery={keyQueries[stepIndex] || ""}
+                  onModifierChange={modifiers =>
+                    handleModifierChange(stepIndex, modifiers)
+                  }
+                  onDelayChange={delay => handleDelayChange(stepIndex, delay)}
                   isLastStep={stepIndex === (macro.steps?.length || 0) - 1}
                 />
               ))}
@@ -223,18 +245,20 @@ export function MacroForm({
               theme="light"
               fullWidth
               LeadingIcon={LuPlus}
-              text={`Add Step ${isMaxStepsReached ? `(${MAX_STEPS_PER_MACRO} max)` : ''}`}
+              text={`Add Step ${isMaxStepsReached ? `(${MAX_STEPS_PER_MACRO} max)` : ""}`}
               onClick={() => {
                 if (isMaxStepsReached) {
-                  showTemporaryError(`You can only add a maximum of ${MAX_STEPS_PER_MACRO} steps per macro.`);
+                  showTemporaryError(
+                    `You can only add a maximum of ${MAX_STEPS_PER_MACRO} steps per macro.`,
+                  );
                   return;
                 }
-                
+
                 setMacro(prev => ({
                   ...prev,
                   steps: [
-                    ...(prev.steps || []), 
-                    { keys: [], modifiers: [], delay: DEFAULT_DELAY }
+                    ...(prev.steps || []),
+                    { keys: [], modifiers: [], delay: DEFAULT_DELAY },
                   ],
                 }));
                 setErrors({});
@@ -257,15 +281,10 @@ export function MacroForm({
               onClick={handleSubmit}
               disabled={isSubmitting}
             />
-            <Button
-              size="SM"
-              theme="light"
-              text="Cancel"
-              onClick={onCancel}
-            />
+            <Button size="SM" theme="light" text="Cancel" onClick={onCancel} />
           </div>
         </div>
       </div>
     </>
   );
-}
\ No newline at end of file
+}
diff --git a/ui/src/components/VideoOverlay.tsx b/ui/src/components/VideoOverlay.tsx
index 0d71dcd..ada8f20 100644
--- a/ui/src/components/VideoOverlay.tsx
+++ b/ui/src/components/VideoOverlay.tsx
@@ -3,11 +3,11 @@ import { ExclamationTriangleIcon } from "@heroicons/react/24/solid";
 import { ArrowPathIcon, ArrowRightIcon } from "@heroicons/react/16/solid";
 import { motion, AnimatePresence } from "framer-motion";
 import { LuPlay } from "react-icons/lu";
+import { BsMouseFill } from "react-icons/bs";
 
 import { Button, LinkButton } from "@components/Button";
 import LoadingSpinner from "@components/LoadingSpinner";
 import Card, { GridCard } from "@components/Card";
-import { BsMouseFill } from "react-icons/bs";
 
 interface OverlayContentProps {
   children: React.ReactNode;
@@ -242,8 +242,8 @@ export function HDMIErrorOverlay({ show, hdmiState }: HDMIErrorOverlayProps) {
                           Ensure source device is powered on and outputting a signal
                         </li>
                         <li>
-                          If using an adapter, ensure it&apos;s compatible and
-                          functioning correctly
+                          If using an adapter, ensure it&apos;s compatible and functioning
+                          correctly
                         </li>
                       </ul>
                     </div>
diff --git a/ui/src/components/WebRTCVideo.tsx b/ui/src/components/WebRTCVideo.tsx
index b73135b..2b4cac6 100644
--- a/ui/src/components/WebRTCVideo.tsx
+++ b/ui/src/components/WebRTCVideo.tsx
@@ -151,7 +151,7 @@ export default function WebRTCVideo() {
     const isKeyboardLockGranted = await checkNavigatorPermissions("keyboard-lock");
     if (isKeyboardLockGranted) {
       if ("keyboard" in navigator) {
-        // @ts-ignore
+        // @ts-expect-error - keyboard lock is not supported in all browsers
         await navigator.keyboard.lock();
       }
     }
diff --git a/ui/src/hooks/stores.ts b/ui/src/hooks/stores.ts
index db1fd04..045655e 100644
--- a/ui/src/hooks/stores.ts
+++ b/ui/src/hooks/stores.ts
@@ -1,6 +1,11 @@
 import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
-import { MAX_STEPS_PER_MACRO, MAX_TOTAL_MACROS, MAX_KEYS_PER_STEP } from "@/constants/macros";
+
+import {
+  MAX_STEPS_PER_MACRO,
+  MAX_TOTAL_MACROS,
+  MAX_KEYS_PER_STEP,
+} from "@/constants/macros";
 
 // Define the JsonRpc types for better type checking
 interface JsonRpcResponse {
@@ -564,12 +569,12 @@ export interface UpdateState {
   setOtaState: (state: UpdateState["otaState"]) => void;
   setUpdateDialogHasBeenMinimized: (hasBeenMinimized: boolean) => void;
   modalView:
-  | "loading"
-  | "updating"
-  | "upToDate"
-  | "updateAvailable"
-  | "updateCompleted"
-  | "error";
+    | "loading"
+    | "updating"
+    | "upToDate"
+    | "updateAvailable"
+    | "updateCompleted"
+    | "error";
   setModalView: (view: UpdateState["modalView"]) => void;
   setUpdateErrorMessage: (errorMessage: string) => void;
   updateErrorMessage: string | null;
@@ -633,12 +638,12 @@ export const useUsbConfigModalStore = create<UsbConfigModalState>(set => ({
 
 interface LocalAuthModalState {
   modalView:
-  | "createPassword"
-  | "deletePassword"
-  | "updatePassword"
-  | "creationSuccess"
-  | "deleteSuccess"
-  | "updateSuccess";
+    | "createPassword"
+    | "deletePassword"
+    | "updatePassword"
+    | "creationSuccess"
+    | "deleteSuccess"
+    | "updateSuccess";
   setModalView: (view: LocalAuthModalState["modalView"]) => void;
 }
 
@@ -719,12 +724,23 @@ export interface NetworkState {
   setDhcpLeaseExpiry: (expiry: Date) => void;
 }
 
-
-export type IPv6Mode = "disabled" | "slaac" | "dhcpv6" | "slaac_and_dhcpv6" | "static" | "link_local" | "unknown";
+export type IPv6Mode =
+  | "disabled"
+  | "slaac"
+  | "dhcpv6"
+  | "slaac_and_dhcpv6"
+  | "static"
+  | "link_local"
+  | "unknown";
 export type IPv4Mode = "disabled" | "static" | "dhcp" | "unknown";
 export type LLDPMode = "disabled" | "basic" | "all" | "unknown";
 export type mDNSMode = "disabled" | "auto" | "ipv4_only" | "ipv6_only" | "unknown";
-export type TimeSyncMode = "ntp_only" | "ntp_and_http" | "http_only" | "custom" | "unknown";
+export type TimeSyncMode =
+  | "ntp_only"
+  | "ntp_and_http"
+  | "http_only"
+  | "custom"
+  | "unknown";
 
 export interface NetworkSettings {
   hostname: string;
@@ -749,7 +765,7 @@ export const useNetworkStateStore = create<NetworkState>((set, get) => ({
 
     lease.lease_expiry = expiry;
     set({ dhcp_lease: lease });
-  }
+  },
 }));
 
 export interface KeySequenceStep {
@@ -771,8 +787,20 @@ export interface MacrosState {
   initialized: boolean;
   loadMacros: () => Promise<void>;
   saveMacros: (macros: KeySequence[]) => Promise<void>;
-  sendFn: ((method: string, params: unknown, callback?: ((resp: JsonRpcResponse) => void) | undefined) => void) | null;
-  setSendFn: (sendFn: ((method: string, params: unknown, callback?: ((resp: JsonRpcResponse) => void) | undefined) => void)) => void;
+  sendFn:
+    | ((
+        method: string,
+        params: unknown,
+        callback?: ((resp: JsonRpcResponse) => void) | undefined,
+      ) => void)
+    | null;
+  setSendFn: (
+    sendFn: (
+      method: string,
+      params: unknown,
+      callback?: ((resp: JsonRpcResponse) => void) | undefined,
+    ) => void,
+  ) => void;
 }
 
 export const generateMacroId = () => {
@@ -785,7 +813,7 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
   initialized: false,
   sendFn: null,
 
-  setSendFn: (sendFn) => {
+  setSendFn: sendFn => {
     set({ sendFn });
   },
 
@@ -802,7 +830,7 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
 
     try {
       await new Promise<void>((resolve, reject) => {
-        sendFn("getKeyboardMacros", {}, (response) => {
+        sendFn("getKeyboardMacros", {}, response => {
           if (response.error) {
             console.error("Error loading macros:", response.error);
             reject(new Error(response.error.message));
@@ -822,7 +850,7 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
 
           set({
             macros: sortedMacros,
-            initialized: true
+            initialized: true,
           });
 
           resolve();
@@ -849,15 +877,23 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
 
     for (const macro of macros) {
       if (macro.steps.length > MAX_STEPS_PER_MACRO) {
-        console.error(`Cannot save: macro "${macro.name}" exceeds maximum of ${MAX_STEPS_PER_MACRO} steps`);
-        throw new Error(`Cannot save: macro "${macro.name}" exceeds maximum of ${MAX_STEPS_PER_MACRO} steps`);
+        console.error(
+          `Cannot save: macro "${macro.name}" exceeds maximum of ${MAX_STEPS_PER_MACRO} steps`,
+        );
+        throw new Error(
+          `Cannot save: macro "${macro.name}" exceeds maximum of ${MAX_STEPS_PER_MACRO} steps`,
+        );
       }
 
       for (let i = 0; i < macro.steps.length; i++) {
         const step = macro.steps[i];
         if (step.keys && step.keys.length > MAX_KEYS_PER_STEP) {
-          console.error(`Cannot save: macro "${macro.name}" step ${i + 1} exceeds maximum of ${MAX_KEYS_PER_STEP} keys`);
-          throw new Error(`Cannot save: macro "${macro.name}" step ${i + 1} exceeds maximum of ${MAX_KEYS_PER_STEP} keys`);
+          console.error(
+            `Cannot save: macro "${macro.name}" step ${i + 1} exceeds maximum of ${MAX_KEYS_PER_STEP} keys`,
+          );
+          throw new Error(
+            `Cannot save: macro "${macro.name}" step ${i + 1} exceeds maximum of ${MAX_KEYS_PER_STEP} keys`,
+          );
         }
       }
     }
@@ -867,20 +903,25 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
     try {
       const macrosWithSortOrder = macros.map((macro, index) => ({
         ...macro,
-        sortOrder: macro.sortOrder !== undefined ? macro.sortOrder : index
+        sortOrder: macro.sortOrder !== undefined ? macro.sortOrder : index,
       }));
 
-      const response = await new Promise<JsonRpcResponse>((resolve) => {
-        sendFn("setKeyboardMacros", { params: { macros: macrosWithSortOrder } }, (response) => {
-          resolve(response);
-        });
+      const response = await new Promise<JsonRpcResponse>(resolve => {
+        sendFn(
+          "setKeyboardMacros",
+          { params: { macros: macrosWithSortOrder } },
+          response => {
+            resolve(response);
+          },
+        );
       });
 
       if (response.error) {
         console.error("Error saving macros:", response.error);
-        const errorMessage = typeof response.error.data === 'string'
-          ? response.error.data
-          : response.error.message || "Failed to save macros";
+        const errorMessage =
+          typeof response.error.data === "string"
+            ? response.error.data
+            : response.error.message || "Failed to save macros";
         throw new Error(errorMessage);
       }
 
@@ -892,5 +933,5 @@ export const useMacrosStore = create<MacrosState>((set, get) => ({
     } finally {
       set({ loading: false });
     }
-  }
-}));
\ No newline at end of file
+  },
+}));
diff --git a/ui/src/routes/devices.$id.settings.macros.tsx b/ui/src/routes/devices.$id.settings.macros.tsx
index f809f57..ba1a2ba 100644
--- a/ui/src/routes/devices.$id.settings.macros.tsx
+++ b/ui/src/routes/devices.$id.settings.macros.tsx
@@ -1,6 +1,15 @@
 import { useEffect, Fragment, useMemo, useState, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
-import { LuPenLine, LuCopy, LuMoveRight, LuCornerDownRight, LuArrowUp, LuArrowDown, LuTrash2, LuCommand } from "react-icons/lu";
+import {
+  LuPenLine,
+  LuCopy,
+  LuMoveRight,
+  LuCornerDownRight,
+  LuArrowUp,
+  LuArrowDown,
+  LuTrash2,
+  LuCommand,
+} from "react-icons/lu";
 
 import { KeySequence, useMacrosStore, generateMacroId } from "@/hooks/stores";
 import { SettingsPageHeader } from "@/components/SettingsPageheader";
@@ -26,10 +35,10 @@ export default function SettingsMacrosRoute() {
   const [actionLoadingId, setActionLoadingId] = useState<string | null>(null);
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
   const [macroToDelete, setMacroToDelete] = useState<KeySequence | null>(null);
-  
-  const isMaxMacrosReached = useMemo(() => 
-    macros.length >= MAX_TOTAL_MACROS, 
-    [macros.length]
+
+  const isMaxMacrosReached = useMemo(
+    () => macros.length >= MAX_TOTAL_MACROS,
+    [macros.length],
   );
 
   useEffect(() => {
@@ -38,75 +47,83 @@ export default function SettingsMacrosRoute() {
     }
   }, [initialized, loadMacros]);
 
-  const handleDuplicateMacro = useCallback(async (macro: KeySequence) => {
-    if (!macro?.id || !macro?.name) {
-      notifications.error("Invalid macro data");
-      return;
-    }
-
-    if (isMaxMacrosReached) {
-      notifications.error(`Maximum of ${MAX_TOTAL_MACROS} macros allowed`);
-      return;
-    }
-
-    setActionLoadingId(macro.id);
-
-    const newMacroCopy: KeySequence = {
-      ...JSON.parse(JSON.stringify(macro)),
-      id: generateMacroId(),
-      name: `${macro.name} ${COPY_SUFFIX}`,
-      sortOrder: macros.length + 1,
-    };
-
-    try {
-      await saveMacros(normalizeSortOrders([...macros, newMacroCopy]));
-      notifications.success(`Macro "${newMacroCopy.name}" duplicated successfully`);
-    } catch (error: unknown) {
-      if (error instanceof Error) {
-        notifications.error(`Failed to duplicate macro: ${error.message}`);
-      } else {
-        notifications.error("Failed to duplicate macro");
+  const handleDuplicateMacro = useCallback(
+    async (macro: KeySequence) => {
+      if (!macro?.id || !macro?.name) {
+        notifications.error("Invalid macro data");
+        return;
       }
-    } finally {
-      setActionLoadingId(null);
-    }
-  }, [isMaxMacrosReached, macros, saveMacros, setActionLoadingId]);
 
-  const handleMoveMacro = useCallback(async (index: number, direction: 'up' | 'down', macroId: string) => {
-    if (!Array.isArray(macros) || macros.length === 0) {
-      notifications.error("No macros available");
-      return;
-    }
-
-    const newIndex = direction === 'up' ? index - 1 : index + 1;
-    if (newIndex < 0 || newIndex >= macros.length) return;
-
-    setActionLoadingId(macroId);
-
-    try {
-      const newMacros = [...macros];
-      [newMacros[index], newMacros[newIndex]] = [newMacros[newIndex], newMacros[index]];
-      const updatedMacros = normalizeSortOrders(newMacros);
-
-      await saveMacros(updatedMacros);
-      notifications.success("Macro order updated successfully");
-    } catch (error: unknown) {
-      if (error instanceof Error) {
-        notifications.error(`Failed to reorder macros: ${error.message}`);
-      } else {
-        notifications.error("Failed to reorder macros");
+      if (isMaxMacrosReached) {
+        notifications.error(`Maximum of ${MAX_TOTAL_MACROS} macros allowed`);
+        return;
       }
-    } finally {
-      setActionLoadingId(null);
-    }
-  }, [macros, saveMacros, setActionLoadingId]);
+
+      setActionLoadingId(macro.id);
+
+      const newMacroCopy: KeySequence = {
+        ...JSON.parse(JSON.stringify(macro)),
+        id: generateMacroId(),
+        name: `${macro.name} ${COPY_SUFFIX}`,
+        sortOrder: macros.length + 1,
+      };
+
+      try {
+        await saveMacros(normalizeSortOrders([...macros, newMacroCopy]));
+        notifications.success(`Macro "${newMacroCopy.name}" duplicated successfully`);
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          notifications.error(`Failed to duplicate macro: ${error.message}`);
+        } else {
+          notifications.error("Failed to duplicate macro");
+        }
+      } finally {
+        setActionLoadingId(null);
+      }
+    },
+    [isMaxMacrosReached, macros, saveMacros, setActionLoadingId],
+  );
+
+  const handleMoveMacro = useCallback(
+    async (index: number, direction: "up" | "down", macroId: string) => {
+      if (!Array.isArray(macros) || macros.length === 0) {
+        notifications.error("No macros available");
+        return;
+      }
+
+      const newIndex = direction === "up" ? index - 1 : index + 1;
+      if (newIndex < 0 || newIndex >= macros.length) return;
+
+      setActionLoadingId(macroId);
+
+      try {
+        const newMacros = [...macros];
+        [newMacros[index], newMacros[newIndex]] = [newMacros[newIndex], newMacros[index]];
+        const updatedMacros = normalizeSortOrders(newMacros);
+
+        await saveMacros(updatedMacros);
+        notifications.success("Macro order updated successfully");
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          notifications.error(`Failed to reorder macros: ${error.message}`);
+        } else {
+          notifications.error("Failed to reorder macros");
+        }
+      } finally {
+        setActionLoadingId(null);
+      }
+    },
+    [macros, saveMacros, setActionLoadingId],
+  );
 
   const handleDeleteMacro = useCallback(async () => {
     if (!macroToDelete?.id) return;
 
     setActionLoadingId(macroToDelete.id);
     try {
-      const updatedMacros = normalizeSortOrders(macros.filter(m => m.id !== macroToDelete.id));
+      const updatedMacros = normalizeSortOrders(
+        macros.filter(m => m.id !== macroToDelete.id),
+      );
       await saveMacros(updatedMacros);
       notifications.success(`Macro "${macroToDelete.name}" deleted successfully`);
       setShowDeleteConfirm(false);
@@ -122,135 +139,168 @@ export default function SettingsMacrosRoute() {
     }
   }, [macroToDelete, macros, saveMacros]);
 
-  const MacroList = useMemo(() => (
-    <div className="space-y-2">
-      {macros.map((macro, index) => (
-        <Card key={macro.id} className="p-2 bg-white dark:bg-slate-800">
-          <div className="flex items-center justify-between">
-            <div className="flex flex-col gap-1 px-2">
-              <Button
-                size="XS"
-                theme="light"
-                onClick={() => handleMoveMacro(index, 'up', macro.id)}
-                disabled={index === 0 || actionLoadingId === macro.id}
-                LeadingIcon={LuArrowUp}
-                aria-label={`Move ${macro.name} up`}
-              />
-              <Button
-                size="XS"
-                theme="light"
-                onClick={() => handleMoveMacro(index, 'down', macro.id)}
-                disabled={index === macros.length - 1 || actionLoadingId === macro.id}
-                LeadingIcon={LuArrowDown}
-                aria-label={`Move ${macro.name} down`}
-              />
-            </div>
+  const MacroList = useMemo(
+    () => (
+      <div className="space-y-2">
+        {macros.map((macro, index) => (
+          <Card key={macro.id} className="bg-white p-2 dark:bg-slate-800">
+            <div className="flex items-center justify-between">
+              <div className="flex flex-col gap-1 px-2">
+                <Button
+                  size="XS"
+                  theme="light"
+                  onClick={() => handleMoveMacro(index, "up", macro.id)}
+                  disabled={index === 0 || actionLoadingId === macro.id}
+                  LeadingIcon={LuArrowUp}
+                  aria-label={`Move ${macro.name} up`}
+                />
+                <Button
+                  size="XS"
+                  theme="light"
+                  onClick={() => handleMoveMacro(index, "down", macro.id)}
+                  disabled={index === macros.length - 1 || actionLoadingId === macro.id}
+                  LeadingIcon={LuArrowDown}
+                  aria-label={`Move ${macro.name} down`}
+                />
+              </div>
 
-            <div className="flex-1 min-w-0 flex flex-col justify-center ml-2">
-              <h3 className="truncate text-sm font-semibold text-black dark:text-white">
-                {macro.name}
-              </h3>
-              <p className="mt-1 ml-4 text-xs text-slate-500 dark:text-slate-400 overflow-hidden">
-                <span className="flex flex-col items-start gap-1">
-                  {macro.steps.map((step, stepIndex) => {
-                    const StepIcon = stepIndex === 0 ? LuMoveRight : LuCornerDownRight;
+              <div className="ml-2 flex min-w-0 flex-1 flex-col justify-center">
+                <h3 className="truncate text-sm font-semibold text-black dark:text-white">
+                  {macro.name}
+                </h3>
+                <p className="ml-4 mt-1 overflow-hidden text-xs text-slate-500 dark:text-slate-400">
+                  <span className="flex flex-col items-start gap-1">
+                    {macro.steps.map((step, stepIndex) => {
+                      const StepIcon = stepIndex === 0 ? LuMoveRight : LuCornerDownRight;
 
-                    return (
-                      <span key={stepIndex} className="inline-flex items-center">
-                        <StepIcon className="mr-1 text-slate-400 dark:text-slate-500 h-3 w-3 flex-shrink-0" />
-                        <span className="bg-slate-50 dark:bg-slate-800 px-2 py-0.5 rounded-md border border-slate-200/50 dark:border-slate-700/50">
-                          {(Array.isArray(step.modifiers) && step.modifiers.length > 0) || (Array.isArray(step.keys) && step.keys.length > 0) ? (
-                            <>
-                              {Array.isArray(step.modifiers) && step.modifiers.map((modifier, idx) => (
-                                <Fragment key={`mod-${idx}`}>
-                                  <span className="font-medium text-slate-600 dark:text-slate-200">
-                                    {modifierDisplayMap[modifier] || modifier}
-                                  </span>
-                                  {idx < step.modifiers.length - 1 && (
-                                    <span className="text-slate-400 dark:text-slate-600"> + </span>
+                      return (
+                        <span key={stepIndex} className="inline-flex items-center">
+                          <StepIcon className="mr-1 h-3 w-3 flex-shrink-0 text-slate-400 dark:text-slate-500" />
+                          <span className="rounded-md border border-slate-200/50 bg-slate-50 px-2 py-0.5 dark:border-slate-700/50 dark:bg-slate-800">
+                            {(Array.isArray(step.modifiers) &&
+                              step.modifiers.length > 0) ||
+                            (Array.isArray(step.keys) && step.keys.length > 0) ? (
+                              <>
+                                {Array.isArray(step.modifiers) &&
+                                  step.modifiers.map((modifier, idx) => (
+                                    <Fragment key={`mod-${idx}`}>
+                                      <span className="font-medium text-slate-600 dark:text-slate-200">
+                                        {modifierDisplayMap[modifier] || modifier}
+                                      </span>
+                                      {idx < step.modifiers.length - 1 && (
+                                        <span className="text-slate-400 dark:text-slate-600">
+                                          {" "}
+                                          +{" "}
+                                        </span>
+                                      )}
+                                    </Fragment>
+                                  ))}
+
+                                {Array.isArray(step.modifiers) &&
+                                  step.modifiers.length > 0 &&
+                                  Array.isArray(step.keys) &&
+                                  step.keys.length > 0 && (
+                                    <span className="text-slate-400 dark:text-slate-600">
+                                      {" "}
+                                      +{" "}
+                                    </span>
                                   )}
-                                </Fragment>
-                              ))}
 
-                              {Array.isArray(step.modifiers) && step.modifiers.length > 0 && Array.isArray(step.keys) && step.keys.length > 0 && (
-                                <span className="text-slate-400 dark:text-slate-600"> + </span>
-                              )}
-
-                              {Array.isArray(step.keys) && step.keys.map((key, idx) => (
-                                <Fragment key={`key-${idx}`}>
-                                  <span className="font-medium text-blue-600 dark:text-blue-400">
-                                    {keyDisplayMap[key] || key}
-                                  </span>
-                                  {idx < step.keys.length - 1 && (
-                                    <span className="text-slate-400 dark:text-slate-600"> + </span>
-                                  )}
-                                </Fragment>
-                              ))}
-                            </>
-                          ) : (
-                            <span className="font-medium text-slate-500 dark:text-slate-400">Delay only</span>
-                          )}
-                          {step.delay !== DEFAULT_DELAY && (
-                             <span className="ml-1 text-slate-400 dark:text-slate-500">({step.delay}ms)</span>
-                          )}
+                                {Array.isArray(step.keys) &&
+                                  step.keys.map((key, idx) => (
+                                    <Fragment key={`key-${idx}`}>
+                                      <span className="font-medium text-blue-600 dark:text-blue-400">
+                                        {keyDisplayMap[key] || key}
+                                      </span>
+                                      {idx < step.keys.length - 1 && (
+                                        <span className="text-slate-400 dark:text-slate-600">
+                                          {" "}
+                                          +{" "}
+                                        </span>
+                                      )}
+                                    </Fragment>
+                                  ))}
+                              </>
+                            ) : (
+                              <span className="font-medium text-slate-500 dark:text-slate-400">
+                                Delay only
+                              </span>
+                            )}
+                            {step.delay !== DEFAULT_DELAY && (
+                              <span className="ml-1 text-slate-400 dark:text-slate-500">
+                                ({step.delay}ms)
+                              </span>
+                            )}
+                          </span>
                         </span>
-                      </span>
-                    );
-                  })}
-                </span>
-              </p>
-            </div>
+                      );
+                    })}
+                  </span>
+                </p>
+              </div>
 
-            <div className="flex items-center gap-1 ml-4">
-              <Button
-                size="XS"
-                className="text-red-500 dark:text-red-400"
-                theme="light"
-                LeadingIcon={LuTrash2}
-                onClick={() => {
-                  setMacroToDelete(macro);
-                  setShowDeleteConfirm(true);
-                }}
-                disabled={actionLoadingId === macro.id}
-                aria-label={`Delete macro ${macro.name}`}
-              />
-              <Button
-                size="XS"
-                theme="light"
-                LeadingIcon={LuCopy}
-                onClick={() => handleDuplicateMacro(macro)}
-                disabled={actionLoadingId === macro.id}
-                aria-label={`Duplicate macro ${macro.name}`}
-              />
-              <Button
-                size="XS"
-                theme="light"
-                LeadingIcon={LuPenLine}
-                text="Edit"
-                onClick={() => navigate(`${macro.id}/edit`)}
-                disabled={actionLoadingId === macro.id}
-                aria-label={`Edit macro ${macro.name}`}
-              />
+              <div className="ml-4 flex items-center gap-1">
+                <Button
+                  size="XS"
+                  className="text-red-500 dark:text-red-400"
+                  theme="light"
+                  LeadingIcon={LuTrash2}
+                  onClick={() => {
+                    setMacroToDelete(macro);
+                    setShowDeleteConfirm(true);
+                  }}
+                  disabled={actionLoadingId === macro.id}
+                  aria-label={`Delete macro ${macro.name}`}
+                />
+                <Button
+                  size="XS"
+                  theme="light"
+                  LeadingIcon={LuCopy}
+                  onClick={() => handleDuplicateMacro(macro)}
+                  disabled={actionLoadingId === macro.id}
+                  aria-label={`Duplicate macro ${macro.name}`}
+                />
+                <Button
+                  size="XS"
+                  theme="light"
+                  LeadingIcon={LuPenLine}
+                  text="Edit"
+                  onClick={() => navigate(`${macro.id}/edit`)}
+                  disabled={actionLoadingId === macro.id}
+                  aria-label={`Edit macro ${macro.name}`}
+                />
+              </div>
             </div>
-          </div>
-        </Card>
-      ))}
+          </Card>
+        ))}
 
-      <ConfirmDialog
-        open={showDeleteConfirm}
-        onClose={() => {
-          setShowDeleteConfirm(false);
-          setMacroToDelete(null);
-        }}
-        title="Delete Macro"
-        description={`Are you sure you want to delete "${macroToDelete?.name}"? This action cannot be undone.`}
-        variant="danger"
-        confirmText={actionLoadingId === macroToDelete?.id ? "Deleting..." : "Delete"}
-        onConfirm={handleDeleteMacro}
-        isConfirming={actionLoadingId === macroToDelete?.id}
-      />
-    </div>
-  ), [macros, actionLoadingId, showDeleteConfirm, macroToDelete, handleDeleteMacro]);
+        <ConfirmDialog
+          open={showDeleteConfirm}
+          onClose={() => {
+            setShowDeleteConfirm(false);
+            setMacroToDelete(null);
+          }}
+          title="Delete Macro"
+          description={`Are you sure you want to delete "${macroToDelete?.name}"? This action cannot be undone.`}
+          variant="danger"
+          confirmText={actionLoadingId === macroToDelete?.id ? "Deleting..." : "Delete"}
+          onConfirm={handleDeleteMacro}
+          isConfirming={actionLoadingId === macroToDelete?.id}
+        />
+      </div>
+    ),
+    [
+      macros,
+      showDeleteConfirm,
+      macroToDelete?.name,
+      macroToDelete?.id,
+      actionLoadingId,
+      handleDeleteMacro,
+      handleMoveMacro,
+      handleDuplicateMacro,
+      navigate,
+    ],
+  );
 
   return (
     <div className="space-y-4">
@@ -259,7 +309,7 @@ export default function SettingsMacrosRoute() {
           title="Keyboard Macros"
           description={`Combine keystrokes into a single action for faster workflows.`}
         />
-        { macros.length > 0 && (
+        {macros.length > 0 && (
           <div className="flex items-center pl-2">
             <Button
               size="SM"
@@ -299,7 +349,9 @@ export default function SettingsMacrosRoute() {
               />
             }
           />
-        ) : MacroList}
+        ) : (
+          MacroList
+        )}
       </div>
     </div>
   );
diff --git a/ui/src/routes/devices.$id.settings.network.tsx b/ui/src/routes/devices.$id.settings.network.tsx
index 59d52ef..1811ca0 100644
--- a/ui/src/routes/devices.$id.settings.network.tsx
+++ b/ui/src/routes/devices.$id.settings.network.tsx
@@ -1,18 +1,30 @@
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
+import { ArrowPathIcon } from "@heroicons/react/24/outline";
 
-import { SelectMenuBasic } from "../components/SelectMenuBasic";
-import { SettingsPageHeader } from "../components/SettingsPageheader";
-
-import { IPv4Mode, IPv6Mode, LLDPMode, mDNSMode, NetworkSettings, NetworkState, TimeSyncMode, useNetworkStateStore } from "@/hooks/stores";
+import {
+  IPv4Mode,
+  IPv6Mode,
+  LLDPMode,
+  mDNSMode,
+  NetworkSettings,
+  NetworkState,
+  TimeSyncMode,
+  useNetworkStateStore,
+} from "@/hooks/stores";
 import { useJsonRpc } from "@/hooks/useJsonRpc";
 import notifications from "@/notifications";
 import { Button } from "@components/Button";
 import { GridCard } from "@components/Card";
 import InputField from "@components/InputField";
-import { SettingsItem } from "./devices.$id.settings";
 
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
+import { SettingsPageHeader } from "../components/SettingsPageheader";
+import { SelectMenuBasic } from "../components/SelectMenuBasic";
+import Fieldset from "../components/Fieldset";
+import { ConfirmDialog } from "../components/ConfirmDialog";
+
+import { SettingsItem } from "./devices.$id.settings";
 
 dayjs.extend(relativeTime);
 
@@ -25,13 +37,9 @@ const defaultNetworkSettings: NetworkSettings = {
   lldp_tx_tlvs: [],
   mdns_mode: "unknown",
   time_sync_mode: "unknown",
-}
+};
 
 export function LifeTimeLabel({ lifetime }: { lifetime: string }) {
-  if (lifetime == "") {
-    return <strong>N/A</strong>;
-  }
-
   const [remaining, setRemaining] = useState<string | null>(null);
 
   useEffect(() => {
@@ -43,46 +51,87 @@ export function LifeTimeLabel({ lifetime }: { lifetime: string }) {
     return () => clearInterval(interval);
   }, [lifetime]);
 
-  return <>
-    <strong>{dayjs(lifetime).format()}</strong>
-    {remaining && <>
-      {" "}<span className="text-xs text-slate-700 dark:text-slate-300">
-        ({remaining})
-      </span>
-    </>}
-  </>
+  return (
+    <>
+      <span>{dayjs(lifetime).format("YYYY-MM-DD HH:mm")}</span>
+      {remaining && (
+        <>
+          {" "}
+          <span className="text-xs text-slate-700 dark:text-slate-300">
+            ({remaining})
+          </span>
+        </>
+      )}
+    </>
+  );
 }
 
 export default function SettingsNetworkRoute() {
   const [send] = useJsonRpc();
-  const [networkState, setNetworkState] = useNetworkStateStore(state => [state, state.setNetworkState]);
+  const [networkState, setNetworkState] = useNetworkStateStore(state => [
+    state,
+    state.setNetworkState,
+  ]);
+
+  const [networkSettings, setNetworkSettings] =
+    useState<NetworkSettings>(defaultNetworkSettings);
+
+  // We use this to determine whether the settings have changed
+  const firstNetworkSettings = useRef<NetworkSettings>();
 
-  const [networkSettings, setNetworkSettings] = useState<NetworkSettings>(defaultNetworkSettings);
   const [networkSettingsLoaded, setNetworkSettingsLoaded] = useState(false);
 
+  const [customDomain, setCustomDomain] = useState<string>("");
+  const [selectedDomainOption, setSelectedDomainOption] = useState<string>("dhcp");
+
+  useEffect(() => {
+    if (networkSettings.domain && networkSettingsLoaded) {
+      // Check if the domain is one of the predefined options
+      const predefinedOptions = ["dhcp", "local"];
+      if (predefinedOptions.includes(networkSettings.domain)) {
+        setSelectedDomainOption(networkSettings.domain);
+      } else {
+        setSelectedDomainOption("custom");
+        setCustomDomain(networkSettings.domain);
+      }
+    }
+  }, [networkSettings.domain, networkSettingsLoaded]);
+
   const getNetworkSettings = useCallback(() => {
     setNetworkSettingsLoaded(false);
     send("getNetworkSettings", {}, resp => {
       if ("error" in resp) return;
       console.log(resp.result);
       setNetworkSettings(resp.result as NetworkSettings);
+
+      if (!firstNetworkSettings.current) {
+        firstNetworkSettings.current = resp.result as NetworkSettings;
+      }
       setNetworkSettingsLoaded(true);
     });
   }, [send]);
 
-  const setNetworkSettingsRemote = useCallback((settings: NetworkSettings) => {
-    setNetworkSettingsLoaded(false);
-    send("setNetworkSettings", { settings }, resp => {
-      if ("error" in resp) {
-        notifications.error("Failed to save network settings: " + (resp.error.data ? resp.error.data : resp.error.message));
+  const setNetworkSettingsRemote = useCallback(
+    (settings: NetworkSettings) => {
+      setNetworkSettingsLoaded(false);
+      send("setNetworkSettings", { settings }, resp => {
+        if ("error" in resp) {
+          notifications.error(
+            "Failed to save network settings: " +
+              (resp.error.data ? resp.error.data : resp.error.message),
+          );
+          setNetworkSettingsLoaded(true);
+          return;
+        }
+        // We need to update the firstNetworkSettings ref to the new settings so we can use it to determine if the settings have changed
+        firstNetworkSettings.current = resp.result as NetworkSettings;
+        setNetworkSettings(resp.result as NetworkSettings);
         setNetworkSettingsLoaded(true);
-        return;
-      }
-      setNetworkSettings(resp.result as NetworkSettings);
-      setNetworkSettingsLoaded(true);
-      notifications.success("Network settings saved");
-    });
-  }, [send]);
+        notifications.success("Network settings saved");
+      });
+    },
+    [send],
+  );
 
   const getNetworkState = useCallback(() => {
     send("getNetworkState", {}, resp => {
@@ -90,7 +139,7 @@ export default function SettingsNetworkRoute() {
       console.log(resp.result);
       setNetworkState(resp.result as NetworkState);
     });
-  }, [send]);
+  }, [send, setNetworkState]);
 
   const handleRenewLease = useCallback(() => {
     send("renewDHCPLease", {}, resp => {
@@ -131,278 +180,520 @@ export default function SettingsNetworkRoute() {
     setNetworkSettings({ ...networkSettings, time_sync_mode: value as TimeSyncMode });
   };
 
-  const filterUnknown = useCallback((options: { value: string; label: string; }[]) => {
-    if (!networkSettingsLoaded) return options;
-    return options.filter(option => option.value !== "unknown");
-  }, [networkSettingsLoaded]);
+  const handleHostnameChange = (value: string) => {
+    setNetworkSettings({ ...networkSettings, hostname: value });
+  };
+
+  const handleDomainChange = (value: string) => {
+    setNetworkSettings({ ...networkSettings, domain: value });
+  };
+
+  const handleDomainOptionChange = (value: string) => {
+    setSelectedDomainOption(value);
+    if (value !== "custom") {
+      handleDomainChange(value);
+    }
+  };
+
+  const handleCustomDomainChange = (value: string) => {
+    setCustomDomain(value);
+    handleDomainChange(value);
+  };
+
+  const filterUnknown = useCallback(
+    (options: { value: string; label: string }[]) => {
+      if (!networkSettingsLoaded) return options;
+      return options.filter(option => option.value !== "unknown");
+    },
+    [networkSettingsLoaded],
+  );
+
+  const [showRenewLeaseConfirm, setShowRenewLeaseConfirm] = useState(false);
 
   return (
-    <div className="space-y-4">
-      <SettingsPageHeader
-        title="Network"
-        description="Configure your network settings"
-      />
-      <div className="space-y-4">
-        <SettingsItem
-          title="MAC Address"
-          description={<></>}
-        >
-          <span className="select-auto font-mono text-xs text-slate-700 dark:text-slate-300">
-            {networkState?.mac_address}
-          </span>
-        </SettingsItem>
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="Hostname"
-          description={
-            <>
-              Hostname for the device
-              <br />
-              <span className="text-xs text-slate-700 dark:text-slate-300">
-                Leave blank for default
-              </span>
-            </>
-          }
-        >
-          <InputField
-            type="text"
-            placeholder="jetkvm"
-            value={networkSettings.hostname}
-            error={""}
-            onChange={e => {
-              setNetworkSettings({ ...networkSettings, hostname: e.target.value });
-            }}
-            disabled={!networkSettingsLoaded}
-          />
-        </SettingsItem>
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="Domain"
-          description={
-            <>
-              Domain for the device
-              <br />
-              <span className="text-xs text-slate-700 dark:text-slate-300">
-                Leave blank to use DHCP provided domain, if there is no domain, use <span className="font-mono">local</span>
-              </span>
-            </>
-          }
-        >
-          <InputField
-            type="text"
-            placeholder="local"
-            value={networkSettings.domain}
-            error={""}
-            onChange={e => {
-              setNetworkSettings({ ...networkSettings, domain: e.target.value });
-            }}
-            disabled={!networkSettingsLoaded}
-          />
-        </SettingsItem>
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="IPv4 Mode"
-          description="Configure the IPv4 mode"
-        >
-          <SelectMenuBasic
-            size="SM"
-            value={networkSettings.ipv4_mode}
-            onChange={e => handleIpv4ModeChange(e.target.value)}
-            disabled={!networkSettingsLoaded}
-            options={filterUnknown([
-              { value: "dhcp", label: "DHCP" },
-              // { value: "static", label: "Static" },
-            ])}
-          />
-        </SettingsItem>
-        {networkState?.dhcp_lease && (
-          <GridCard>
-            <div className="flex items-start gap-x-4 p-4">
-              <div className="space-y-3 w-full">
-                <div className="space-y-2">
-                  <h3 className="text-base font-bold text-slate-900 dark:text-white">
-                    Current DHCP Lease
-                  </h3>
-                  <div>
-                    <ul className="list-none space-y-1 text-xs text-slate-700 dark:text-slate-300">
-                      {networkState?.dhcp_lease?.ip && <li>IP: <strong>{networkState?.dhcp_lease?.ip}</strong></li>}
-                      {networkState?.dhcp_lease?.netmask && <li>Subnet: <strong>{networkState?.dhcp_lease?.netmask}</strong></li>}
-                      {networkState?.dhcp_lease?.broadcast && <li>Broadcast: <strong>{networkState?.dhcp_lease?.broadcast}</strong></li>}
-                      {networkState?.dhcp_lease?.ttl && <li>TTL: <strong>{networkState?.dhcp_lease?.ttl}</strong></li>}
-                      {networkState?.dhcp_lease?.mtu && <li>MTU: <strong>{networkState?.dhcp_lease?.mtu}</strong></li>}
-                      {networkState?.dhcp_lease?.hostname && <li>Hostname: <strong>{networkState?.dhcp_lease?.hostname}</strong></li>}
-                      {networkState?.dhcp_lease?.domain && <li>Domain: <strong>{networkState?.dhcp_lease?.domain}</strong></li>}
-                      {networkState?.dhcp_lease?.routers && <li>Gateway: <strong>{networkState?.dhcp_lease?.routers.join(", ")}</strong></li>}
-                      {networkState?.dhcp_lease?.dns && <li>DNS: <strong>{networkState?.dhcp_lease?.dns.join(", ")}</strong></li>}
-                      {networkState?.dhcp_lease?.ntp_servers && <li>NTP Servers: <strong>{networkState?.dhcp_lease?.ntp_servers.join(", ")}</strong></li>}
-                      {networkState?.dhcp_lease?.server_id && <li>Server ID: <strong>{networkState?.dhcp_lease?.server_id}</strong></li>}
-                      {networkState?.dhcp_lease?.bootp_next_server && <li>BootP Next Server: <strong>{networkState?.dhcp_lease?.bootp_next_server}</strong></li>}
-                      {networkState?.dhcp_lease?.bootp_server_name && <li>BootP Server Name: <strong>{networkState?.dhcp_lease?.bootp_server_name}</strong></li>}
-                      {networkState?.dhcp_lease?.bootp_file && <li>Boot File: <strong>{networkState?.dhcp_lease?.bootp_file}</strong></li>}
-                      {networkState?.dhcp_lease?.lease_expiry && <li>
-                        Lease Expiry: <LifeTimeLabel lifetime={`${networkState?.dhcp_lease?.lease_expiry}`} />
-                      </li>}
-                      {/* {JSON.stringify(networkState?.dhcp_lease)} */}
-                    </ul>
-                  </div>
-                </div>
-                <hr className="block w-full dark:border-slate-600" />
-                <div>
-                  <Button
-                    size="SM"
-                    theme="danger"
-                    text="Renew lease"
-                    onClick={() => {
-                      handleRenewLease();
-                    }}
-                  />
-                </div>
+    <>
+      <Fieldset disabled={!networkSettingsLoaded} className="space-y-4">
+        <SettingsPageHeader
+          title="Network"
+          description="Configure your network settings"
+        />
+        <div className="space-y-4">
+          <SettingsItem
+            title="MAC Address"
+            description="Hardware identifier for the network interface"
+          >
+            <InputField
+              type="text"
+              size="SM"
+              value={networkState?.mac_address}
+              error={""}
+              disabled={true}
+              readOnly={true}
+              className="dark:!text-opacity-60"
+            />
+          </SettingsItem>
+        </div>
+        <div className="space-y-4">
+          <SettingsItem
+            title="Hostname"
+            description="Device identifier on the network. Blank for system default"
+          >
+            <div className="relative">
+              <div>
+                <InputField
+                  size="SM"
+                  type="text"
+                  placeholder="jetkvm"
+                  defaultValue={networkSettings.hostname}
+                  onChange={e => {
+                    handleHostnameChange(e.target.value);
+                  }}
+                />
               </div>
             </div>
-          </GridCard>
-        )}
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="IPv6 Mode"
-          description="Configure the IPv6 mode"
-        >
-          <SelectMenuBasic
+          </SettingsItem>
+        </div>
+
+        <div className="space-y-4">
+          <div className="space-y-4">
+            <SettingsItem
+              title="Domain"
+              description="Network domain suffix for the device"
+            >
+              <div className="space-y-2">
+                <SelectMenuBasic
+                  size="SM"
+                  value={selectedDomainOption}
+                  onChange={e => handleDomainOptionChange(e.target.value)}
+                  options={[
+                    { value: "dhcp", label: "DHCP provided" },
+                    { value: "local", label: ".local" },
+                    { value: "custom", label: "Custom" },
+                  ]}
+                />
+              </div>
+            </SettingsItem>
+            {selectedDomainOption === "custom" && (
+              <div className="flex items-center justify-between gap-x-2">
+                <InputField
+                  size="SM"
+                  type="text"
+                  placeholder="home"
+                  value={customDomain}
+                  onChange={e => setCustomDomain(e.target.value)}
+                />
+                <Button
+                  size="SM"
+                  theme="primary"
+                  text="Save Domain"
+                  onClick={() => handleCustomDomainChange(customDomain)}
+                />
+              </div>
+            )}
+          </div>
+          <div className="space-y-4">
+            <SettingsItem
+              title="mDNS"
+              description="Control mDNS (multicast DNS) operational mode"
+            >
+              <SelectMenuBasic
+                size="SM"
+                value={networkSettings.mdns_mode}
+                onChange={e => handleMdnsModeChange(e.target.value)}
+                options={filterUnknown([
+                  { value: "disabled", label: "Disabled" },
+                  { value: "auto", label: "Auto" },
+                  { value: "ipv4_only", label: "IPv4 only" },
+                  { value: "ipv6_only", label: "IPv6 only" },
+                ])}
+              />
+            </SettingsItem>
+          </div>
+
+          <div className="space-y-4">
+            <SettingsItem
+              title="Time synchronization"
+              description="Configure time synchronization settings"
+            >
+              <SelectMenuBasic
+                size="SM"
+                value={networkSettings.time_sync_mode}
+                onChange={e => {
+                  handleTimeSyncModeChange(e.target.value);
+                }}
+                options={filterUnknown([
+                  { value: "unknown", label: "..." },
+                  // { value: "auto", label: "Auto" },
+                  { value: "ntp_only", label: "NTP only" },
+                  { value: "ntp_and_http", label: "NTP and HTTP" },
+                  { value: "http_only", label: "HTTP only" },
+                  // { value: "custom", label: "Custom" },
+                ])}
+              />
+            </SettingsItem>
+          </div>
+
+          <Button
             size="SM"
-            value={networkSettings.ipv6_mode}
-            onChange={e => handleIpv6ModeChange(e.target.value)}
-            disabled={!networkSettingsLoaded}
-            options={filterUnknown([
-              // { value: "disabled", label: "Disabled" },
-              { value: "slaac", label: "SLAAC" },
-              // { value: "dhcpv6", label: "DHCPv6" },
-              // { value: "slaac_and_dhcpv6", label: "SLAAC and DHCPv6" },
-              // { value: "static", label: "Static" },
-              // { value: "link_local", label: "Link-local only" },
-            ])}
+            theme="primary"
+            disabled={firstNetworkSettings.current === networkSettings}
+            text="Save Settings"
+            onClick={() => setNetworkSettingsRemote(networkSettings)}
           />
-        </SettingsItem>
-        {networkState?.ipv6_addresses && (
-          <GridCard>
-            <div className="flex items-start gap-x-4 p-4">
-              <div className="space-y-3 w-full">
-                <div className="space-y-2">
+        </div>
+
+        <div className="h-[1px] w-full bg-slate-800/10 dark:bg-slate-300/20" />
+
+        <div className="space-y-4">
+          <SettingsItem title="IPv4 Mode" description="Configure the IPv4 mode">
+            <SelectMenuBasic
+              size="SM"
+              value={networkSettings.ipv4_mode}
+              onChange={e => handleIpv4ModeChange(e.target.value)}
+              options={filterUnknown([
+                { value: "dhcp", label: "DHCP" },
+                // { value: "static", label: "Static" },
+              ])}
+            />
+          </SettingsItem>
+          {networkState?.dhcp_lease && (
+            <GridCard>
+              <div className="p-4">
+                <div className="space-y-4">
+                  <h3 className="text-base font-bold text-slate-900 dark:text-white">
+                    DHCP Lease
+                  </h3>
+
+                  <div className="flex gap-x-6 gap-y-2">
+                    <div className="flex-1 space-y-2">
+                      {networkState?.dhcp_lease?.ip && (
+                        <div className="flex justify-between border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            IP Address
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.ip}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.netmask && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Subnet Mask
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.netmask}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.dns && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            DNS Servers
+                          </span>
+                          <span className="text-right text-sm font-medium">
+                            {networkState?.dhcp_lease?.dns.map(dns => (
+                              <div key={dns}>{dns}</div>
+                            ))}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.broadcast && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Broadcast
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.broadcast}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.domain && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Domain
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.domain}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.ntp_servers &&
+                        networkState?.dhcp_lease?.ntp_servers.length > 0 && (
+                          <div className="flex justify-between gap-x-8 border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                            <div className="w-full grow text-sm text-slate-600 dark:text-slate-400">
+                              NTP Servers
+                            </div>
+                            <div className="shrink text-right text-sm font-medium">
+                              {networkState?.dhcp_lease?.ntp_servers.map(server => (
+                                <div key={server}>{server}</div>
+                              ))}
+                            </div>
+                          </div>
+                        )}
+
+                      {networkState?.dhcp_lease?.hostname && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Hostname
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.hostname}
+                          </span>
+                        </div>
+                      )}
+                    </div>
+
+                    <div className="flex-1 space-y-2">
+                      {networkState?.dhcp_lease?.routers &&
+                        networkState?.dhcp_lease?.routers.length > 0 && (
+                          <div className="flex justify-between pt-2">
+                            <span className="text-sm text-slate-600 dark:text-slate-400">
+                              Gateway
+                            </span>
+                            <span className="text-right text-sm font-medium">
+                              {networkState?.dhcp_lease?.routers.map(router => (
+                                <div key={router}>{router}</div>
+                              ))}
+                            </span>
+                          </div>
+                        )}
+
+                      {networkState?.dhcp_lease?.server_id && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            DHCP Server
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.server_id}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.lease_expiry && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Lease Expires
+                          </span>
+                          <span className="text-sm font-medium">
+                            <LifeTimeLabel
+                              lifetime={`${networkState?.dhcp_lease?.lease_expiry}`}
+                            />
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.mtu && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            MTU
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.mtu}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.ttl && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            TTL
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.ttl}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.bootp_next_server && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Boot Next Server
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.bootp_next_server}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.bootp_server_name && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Boot Server Name
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.bootp_server_name}
+                          </span>
+                        </div>
+                      )}
+
+                      {networkState?.dhcp_lease?.bootp_file && (
+                        <div className="flex justify-between border-t border-slate-800/10 pt-2 dark:border-slate-300/20">
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            Boot File
+                          </span>
+                          <span className="text-sm font-medium">
+                            {networkState?.dhcp_lease?.bootp_file}
+                          </span>
+                        </div>
+                      )}
+                    </div>
+                  </div>
+
+                  <div>
+                    <Button
+                      size="SM"
+                      theme="light"
+                      className="text-red-500"
+                      text="Renew DHCP Lease"
+                      LeadingIcon={ArrowPathIcon}
+                      onClick={() => setShowRenewLeaseConfirm(true)}
+                    />
+                  </div>
+                </div>
+              </div>
+            </GridCard>
+          )}
+        </div>
+        <div className="space-y-4">
+          <SettingsItem title="IPv6 Mode" description="Configure the IPv6 mode">
+            <SelectMenuBasic
+              size="SM"
+              value={networkSettings.ipv6_mode}
+              onChange={e => handleIpv6ModeChange(e.target.value)}
+              options={filterUnknown([
+                // { value: "disabled", label: "Disabled" },
+                { value: "slaac", label: "SLAAC" },
+                // { value: "dhcpv6", label: "DHCPv6" },
+                // { value: "slaac_and_dhcpv6", label: "SLAAC and DHCPv6" },
+                // { value: "static", label: "Static" },
+                // { value: "link_local", label: "Link-local only" },
+              ])}
+            />
+          </SettingsItem>
+          {networkState?.ipv6_addresses && (
+            <GridCard>
+              <div className="p-4">
+                <div className="space-y-4">
                   <h3 className="text-base font-bold text-slate-900 dark:text-white">
                     IPv6 Information
                   </h3>
-                  <div className="space-y-2">
-                    <div>
-                      <h4 className="text-sm font-bold text-slate-900 dark:text-white">
-                        IPv6 Link-local
-                      </h4>
-                      <p className="text-xs text-slate-700 dark:text-slate-300">
-                        {networkState?.ipv6_link_local}
-                      </p>
-                    </div>
-                    <div>
-                      <h4 className="text-sm font-bold text-slate-900 dark:text-white">
-                        IPv6 Addresses
-                      </h4>
-                      <ul className="list-none space-y-1 text-xs text-slate-700 dark:text-slate-300">
-                        {networkState?.ipv6_addresses && networkState?.ipv6_addresses.map(addr => (
-                          <li key={addr.address}>
-                            {addr.address}
-                            {addr.valid_lifetime && <>
-                              <br />
-                              - valid_lft: {" "}
-                              <span className="text-xs text-slate-700 dark:text-slate-300">
-                                <LifeTimeLabel lifetime={`${addr.valid_lifetime}`} />
-                              </span>
-                            </>}
-                            {addr.preferred_lifetime && <>
-                              <br />
-                              - pref_lft: {" "}
-                              <span className="text-xs text-slate-700 dark:text-slate-300">
-                                <LifeTimeLabel lifetime={`${addr.preferred_lifetime}`} />
-                              </span>
-                            </>}
-                          </li>
-                        ))}
-                      </ul>
-                    </div>
+
+                  <div className="grid grid-cols-2 gap-x-6 gap-y-2">
+                    {networkState?.dhcp_lease?.ip && (
+                      <div className="flex flex-col justify-between">
+                        <span className="text-sm text-slate-600 dark:text-slate-400">
+                          Link-local
+                        </span>
+                        <span className="text-sm font-medium">
+                          {networkState?.ipv6_link_local}
+                        </span>
+                      </div>
+                    )}
+                  </div>
+
+                  <div className="space-y-3 pt-2">
+                    {networkState?.ipv6_addresses &&
+                      networkState?.ipv6_addresses.length > 0 && (
+                        <div className="space-y-3">
+                          <h4 className="text-sm font-semibold">IPv6 Addresses</h4>
+                          {networkState.ipv6_addresses.map(addr => (
+                            <div
+                              key={addr.address}
+                              className="rounded-md rounded-l-none border border-slate-500/10 border-l-blue-700/50 bg-slate-100/40 p-4 pl-4 dark:border-blue-500 dark:bg-slate-900"
+                            >
+                              <div className="grid grid-cols-2 gap-x-8 gap-y-4">
+                                <div className="col-span-2 flex flex-col justify-between">
+                                  <span className="text-sm text-slate-600 dark:text-slate-400">
+                                    Address
+                                  </span>
+                                  <span className="text-sm font-medium">
+                                    {addr.address}
+                                  </span>
+                                </div>
+
+                                {addr.valid_lifetime && (
+                                  <div className="flex flex-col justify-between">
+                                    <span className="text-sm text-slate-600 dark:text-slate-400">
+                                      Valid Lifetime
+                                    </span>
+                                    <span className="text-sm font-medium">
+                                      {addr.valid_lifetime === "" ? (
+                                        <span className="text-slate-400 dark:text-slate-600">
+                                          N/A
+                                        </span>
+                                      ) : (
+                                        <LifeTimeLabel
+                                          lifetime={`${addr.valid_lifetime}`}
+                                        />
+                                      )}
+                                    </span>
+                                  </div>
+                                )}
+                                {addr.preferred_lifetime && (
+                                  <div className="flex flex-col justify-between">
+                                    <span className="text-sm text-slate-600 dark:text-slate-400">
+                                      Preferred Lifetime
+                                    </span>
+                                    <span className="text-sm font-medium">
+                                      {addr.preferred_lifetime === "" ? (
+                                        <span className="text-slate-400 dark:text-slate-600">
+                                          N/A
+                                        </span>
+                                      ) : (
+                                        <LifeTimeLabel
+                                          lifetime={`${addr.preferred_lifetime}`}
+                                        />
+                                      )}
+                                    </span>
+                                  </div>
+                                )}
+                              </div>
+                            </div>
+                          ))}
+                        </div>
+                      )}
                   </div>
                 </div>
               </div>
-            </div>
-          </GridCard>
-        )}
-      </div>
-      <div className="space-y-4 hidden">
-        <SettingsItem
-          title="LLDP"
-          description="Control which TLVs will be sent over Link Layer Discovery Protocol"
-        >
-          <SelectMenuBasic
-            size="SM"
-            value={networkSettings.lldp_mode}
-            onChange={e => handleLldpModeChange(e.target.value)}
-            disabled={!networkSettingsLoaded}
-            options={filterUnknown([
-              { value: "disabled", label: "Disabled" },
-              { value: "basic", label: "Basic" },
-              { value: "all", label: "All" },
-            ])}
-          />
-        </SettingsItem>
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="mDNS"
-          description="Control mDNS (multicast DNS) operational mode"
-        >
-          <SelectMenuBasic
-            size="SM"
-            value={networkSettings.mdns_mode}
-            onChange={e => handleMdnsModeChange(e.target.value)}
-            disabled={!networkSettingsLoaded}
-            options={filterUnknown([
-              { value: "disabled", label: "Disabled" },
-              { value: "auto", label: "Auto" },
-              { value: "ipv4_only", label: "IPv4 only" },
-              { value: "ipv6_only", label: "IPv6 only" },
-            ])}
-          />
-        </SettingsItem>
-      </div>
-      <div className="space-y-4">
-        <SettingsItem
-          title="Time synchronization"
-          description="Configure time synchronization settings"
-        >
-          <SelectMenuBasic
-            size="SM"
-            value={networkSettings.time_sync_mode}
-            onChange={e => handleTimeSyncModeChange(e.target.value)}
-            disabled={!networkSettingsLoaded}
-            options={filterUnknown([
-              { value: "unknown", label: "..." },
-              // { value: "auto", label: "Auto" },
-              { value: "ntp_only", label: "NTP only" },
-              { value: "ntp_and_http", label: "NTP and HTTP" },
-              { value: "http_only", label: "HTTP only" },
-              // { value: "custom", label: "Custom" },
-            ])}
-          />
-        </SettingsItem>
-      </div>
-      <div className="flex items-end gap-x-2">
-        <Button
-          onClick={() => {
-            setNetworkSettingsRemote(networkSettings);
-          }}
-          size="SM"
-          theme="light"
-          text="Save Settings"
-        />
-      </div>
-    </div>
+            </GridCard>
+          )}
+        </div>
+        <div className="hidden space-y-4">
+          <SettingsItem
+            title="LLDP"
+            description="Control which TLVs will be sent over Link Layer Discovery Protocol"
+          >
+            <SelectMenuBasic
+              size="SM"
+              value={networkSettings.lldp_mode}
+              onChange={e => handleLldpModeChange(e.target.value)}
+              options={filterUnknown([
+                { value: "disabled", label: "Disabled" },
+                { value: "basic", label: "Basic" },
+                { value: "all", label: "All" },
+              ])}
+            />
+          </SettingsItem>
+        </div>
+      </Fieldset>
+      <ConfirmDialog
+        open={showRenewLeaseConfirm}
+        onClose={() => setShowRenewLeaseConfirm(false)}
+        title="Renew DHCP Lease"
+        description="This will request a new IP address from your DHCP server. Your device may temporarily lose network connectivity during this process."
+        variant="danger"
+        confirmText="Renew Lease"
+        onConfirm={() => {
+          handleRenewLease();
+          setShowRenewLeaseConfirm(false);
+        }}
+      />
+    </>
   );
 }