diff --git a/web/src/api/client.ts b/web/src/api/client.ts
index 0523f44..3db4d67 100644
--- a/web/src/api/client.ts
+++ b/web/src/api/client.ts
@@ -14,11 +14,12 @@ api.interceptors.request.use((config) => {
   return config;
 });
 
-// Handle 401 responses
+// Handle 401 responses (skip login endpoint — 401 there means bad credentials, not expired session)
 api.interceptors.response.use(
   (response) => response,
   (error) => {
-    if (error.response?.status === 401) {
+    const url = error.config?.url ?? "";
+    if (error.response?.status === 401 && !url.includes("/auth/login")) {
       localStorage.removeItem("cb_admin_token");
       window.location.href = "/login";
     }
diff --git a/web/src/stores/settings.ts b/web/src/stores/settings.ts
index 8f0a73d..10ae34a 100644
--- a/web/src/stores/settings.ts
+++ b/web/src/stores/settings.ts
@@ -7,6 +7,8 @@ export interface AppSettings {
   maxDevices: number;
   autoSync: boolean;
   theme: "light" | "dark" | "system";
+  sessionTimeoutMinutes: number;
+  language: string;
 }
 
 const DEFAULT_SETTINGS: AppSettings = {
@@ -14,6 +16,8 @@ const DEFAULT_SETTINGS: AppSettings = {
   maxDevices: 10,
   autoSync: true,
   theme: "system",
+  sessionTimeoutMinutes: 60,
+  language: "en",
 };
 
 export const useSettingsStore = defineStore("settings", () => {
@@ -25,8 +29,6 @@ export const useSettingsStore = defineStore("settings", () => {
     try {
       const { data } = await api.get("/settings");
       settings.value = { ...DEFAULT_SETTINGS, ...data };
-    } catch {
-      // Use defaults if settings endpoint doesn't exist yet
     } finally {
       loading.value = false;
     }
diff --git a/web/src/views/CookiesView.vue b/web/src/views/CookiesView.vue
index 9e06dcf..1f51492 100644
--- a/web/src/views/CookiesView.vue
+++ b/web/src/views/CookiesView.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, computed } from "vue";
-import { TransitionRoot } from "@headlessui/vue";
+import { onMounted, ref, computed, watch } from "vue";
 import { useCookiesStore } from "@/stores/cookies";
 import type { EncryptedCookieBlob } from "@/types/api";
 
@@ -10,9 +9,21 @@ const selectedDomain = ref<string | null>(null);
 const selectedCookie = ref<EncryptedCookieBlob | null>(null);
 const selectedIds = ref<Set<string>>(new Set());
 const expandedDomains = ref<Set<string>>(new Set());
+const confirmingDeleteCookie = ref<EncryptedCookieBlob | null>(null);
+const confirmingBatchDelete = ref(false);
 
 onMounted(() => store.fetchCookies());
 
+// Auto-expand all domains when cookies load
+watch(
+  () => store.cookies,
+  (cookies) => {
+    const domains = new Set(cookies.map((c) => c.domain));
+    expandedDomains.value = domains;
+  },
+  { immediate: true },
+);
+
 const filteredCookies = computed(() => {
   let list = store.cookies;
   if (search.value) {
@@ -51,6 +62,10 @@ function selectCookie(cookie: EncryptedCookieBlob) {
   selectedCookie.value = cookie;
 }
 
+function closeDetail() {
+  selectedCookie.value = null;
+}
+
 function toggleSelect(id: string) {
   if (selectedIds.value.has(id)) {
     selectedIds.value.delete(id);
@@ -67,28 +82,120 @@ function toggleSelectAll() {
   }
 }
 
-async function handleDelete(cookie: EncryptedCookieBlob) {
+function requestDelete(cookie: EncryptedCookieBlob) {
+  confirmingDeleteCookie.value = cookie;
+}
+
+async function confirmDelete() {
+  const cookie = confirmingDeleteCookie.value;
+  if (!cookie) return;
   await store.deleteCookie(cookie.domain, cookie.cookieName, cookie.path);
   if (selectedCookie.value?.id === cookie.id) {
     selectedCookie.value = null;
   }
+  confirmingDeleteCookie.value = null;
 }
 
-async function handleBatchDelete() {
+function cancelDelete() {
+  confirmingDeleteCookie.value = null;
+}
+
+function requestBatchDelete() {
   if (selectedIds.value.size === 0) return;
-  if (!confirm(`Delete ${selectedIds.value.size} cookies?`)) return;
+  confirmingBatchDelete.value = true;
+}
+
+async function confirmBatchDelete() {
   for (const id of selectedIds.value) {
     const c = store.cookies.find((x) => x.id === id);
     if (c) await store.deleteCookie(c.domain, c.cookieName, c.path);
   }
   selectedIds.value.clear();
+  confirmingBatchDelete.value = false;
+}
+
+function cancelBatchDelete() {
+  confirmingBatchDelete.value = false;
 }
 </script>
 
 <template>
-  <div class="flex h-full">
-    <!-- Main content -->
-    <div class="flex-1 overflow-auto p-8">
+  <div class="h-full overflow-auto p-8">
+    <!-- Detail panel (replaces list when a cookie is selected) -->
+    <div v-if="selectedCookie">
+      <div class="flex items-center justify-between">
+        <h2 class="text-2xl font-semibold text-gray-900">Cookie Details</h2>
+        <button
+          class="rounded-lg border border-gray-200 px-3 py-2 text-sm font-medium text-gray-600 hover:bg-gray-50"
+          @click="closeDetail"
+        >
+          Back to list
+        </button>
+      </div>
+
+      <div class="mt-6 max-w-lg rounded-xl bg-white p-6 ring-1 ring-gray-200">
+        <dl class="space-y-4 text-sm">
+          <div>
+            <dt class="font-medium text-gray-500">Name</dt>
+            <dd class="mt-0.5 text-gray-900">{{ selectedCookie.cookieName }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Value</dt>
+            <dd class="mt-0.5 font-mono text-xs text-gray-400 break-all max-h-24 overflow-auto">
+              {{ selectedCookie.ciphertext?.slice(0, 80) }}...
+            </dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Domain</dt>
+            <dd class="mt-0.5 font-mono text-xs text-gray-900">{{ selectedCookie.domain }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Path</dt>
+            <dd class="mt-0.5 font-mono text-xs text-gray-900">{{ selectedCookie.path }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Expires</dt>
+            <dd class="mt-0.5 text-gray-900">
+              {{ (selectedCookie as any).expires ? new Date((selectedCookie as any).expires).toLocaleString() : "Session" }}
+            </dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Secure</dt>
+            <dd class="mt-0.5 text-gray-900">{{ (selectedCookie as any).secure ? "Yes" : "No" }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">HttpOnly</dt>
+            <dd class="mt-0.5 text-gray-900">{{ (selectedCookie as any).httpOnly ? "Yes" : "No" }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Device ID</dt>
+            <dd class="mt-0.5 font-mono text-xs text-gray-600 break-all">
+              {{ selectedCookie.deviceId }}
+            </dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Lamport Timestamp</dt>
+            <dd class="mt-0.5 text-gray-900">{{ selectedCookie.lamportTs }}</dd>
+          </div>
+          <div>
+            <dt class="font-medium text-gray-500">Updated At</dt>
+            <dd class="mt-0.5 text-gray-900">
+              {{ new Date(selectedCookie.updatedAt).toLocaleString() }}
+            </dd>
+          </div>
+        </dl>
+
+        <button
+          class="mt-6 w-full rounded-lg border border-red-200 px-3 py-2 text-xs font-medium text-red-600 hover:bg-red-50"
+          @click="requestDelete(selectedCookie)"
+        >
+          Delete Cookie
+        </button>
+      </div>
+    </div>
+
+    <!-- Cookie list (shown when no cookie selected) -->
+    <div v-else>
       <div class="flex items-center justify-between">
         <div>
           <h2 class="text-2xl font-semibold text-gray-900">Cookies</h2>
@@ -100,9 +207,9 @@ async function handleBatchDelete() {
           <button
             v-if="selectedIds.size > 0"
             class="rounded-lg bg-red-600 px-3 py-2 text-xs font-medium text-white hover:bg-red-700"
-            @click="handleBatchDelete"
+            @click="requestBatchDelete"
           >
-            Delete ({{ selectedIds.size }})
+            Delete Selected ({{ selectedIds.size }})
           </button>
           <input
             v-model="search"
@@ -113,24 +220,9 @@ async function handleBatchDelete() {
         </div>
       </div>
 
-      <!-- Domain filter chips -->
-      <div class="mt-4 flex flex-wrap gap-2">
-        <button
-          class="rounded-full px-3 py-1 text-xs font-medium"
-          :class="selectedDomain === null ? 'bg-blue-100 text-blue-700' : 'bg-gray-100 text-gray-600 hover:bg-gray-200'"
-          @click="selectDomain(null)"
-        >
-          All
-        </button>
-        <button
-          v-for="domain in store.domains"
-          :key="domain"
-          class="rounded-full px-3 py-1 text-xs font-medium"
-          :class="selectedDomain === domain ? 'bg-blue-100 text-blue-700' : 'bg-gray-100 text-gray-600 hover:bg-gray-200'"
-          @click="selectDomain(domain)"
-        >
-          {{ domain }}
-        </button>
+      <!-- Error state -->
+      <div v-if="store.error" role="alert" class="mt-4 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700">
+        {{ store.error }}
       </div>
 
       <!-- Grouped cookie list -->
@@ -138,7 +230,7 @@ async function handleBatchDelete() {
         <div v-if="store.loading" class="rounded-xl bg-white p-8 text-center text-sm text-gray-500 ring-1 ring-gray-200">
           Loading...
         </div>
-        <div v-else-if="filteredCookies.length === 0" class="rounded-xl bg-white p-8 text-center text-sm text-gray-500 ring-1 ring-gray-200">
+        <div v-else-if="filteredCookies.length === 0 && !store.error" class="rounded-xl bg-white p-8 text-center text-sm text-gray-500 ring-1 ring-gray-200">
           No cookies found
         </div>
 
@@ -176,8 +268,8 @@ async function handleBatchDelete() {
                       @change="toggleSelectAll()"
                     />
                   </th>
-                  <th class="px-4 py-2 font-medium text-gray-600">Name</th>
-                  <th class="px-4 py-2 font-medium text-gray-600">Path</th>
+                  <th class="px-4 py-2 font-medium text-gray-600">Cookie</th>
+                  <th class="px-4 py-2 font-medium text-gray-600">Location</th>
                   <th class="px-4 py-2 font-medium text-gray-600">Device</th>
                   <th class="px-4 py-2 font-medium text-gray-600">Updated</th>
                   <th class="px-4 py-2 font-medium text-gray-600"></th>
@@ -188,7 +280,6 @@ async function handleBatchDelete() {
                   v-for="cookie in cookies"
                   :key="cookie.id"
                   class="cursor-pointer hover:bg-blue-50"
-                  :class="selectedCookie?.id === cookie.id ? 'bg-blue-50' : ''"
                   @click="selectCookie(cookie)"
                 >
                   <td class="px-4 py-2" @click.stop>
@@ -210,7 +301,7 @@ async function handleBatchDelete() {
                   <td class="px-4 py-2" @click.stop>
                     <button
                       class="text-red-600 hover:text-red-800 text-xs font-medium"
-                      @click="handleDelete(cookie)"
+                      @click="requestDelete(cookie)"
                     >
                       Delete
                     </button>
@@ -223,74 +314,50 @@ async function handleBatchDelete() {
       </div>
     </div>
 
-    <!-- Detail panel -->
-    <TransitionRoot
-      :show="!!selectedCookie"
-      enter="transition-all duration-200"
-      enter-from="w-0 opacity-0"
-      enter-to="w-80 opacity-100"
-      leave="transition-all duration-150"
-      leave-from="w-80 opacity-100"
-      leave-to="w-0 opacity-0"
-    >
-      <aside
-        v-if="selectedCookie"
-        class="w-80 shrink-0 overflow-auto border-l border-gray-200 bg-white p-6"
-      >
-        <div class="flex items-center justify-between">
-          <h3 class="text-sm font-semibold text-gray-900">Cookie Details</h3>
+    <!-- Single delete confirmation dialog -->
+    <div v-if="confirmingDeleteCookie" class="fixed inset-0 z-50 flex items-center justify-center bg-black/30">
+      <div role="dialog" class="w-80 rounded-xl bg-white p-6 shadow-lg">
+        <p class="text-sm text-gray-600">
+          Are you sure you want to delete this cookie?
+        </p>
+        <div class="mt-4 flex gap-3">
           <button
-            class="text-gray-400 hover:text-gray-600"
-            @click="selectedCookie = null"
+            class="flex-1 rounded-lg border border-gray-200 px-3 py-2 text-sm font-medium text-gray-600 hover:bg-gray-50"
+            @click="cancelDelete"
           >
-            &#10005;
+            Cancel
+          </button>
+          <button
+            class="flex-1 rounded-lg bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-700"
+            @click="confirmDelete"
+          >
+            Confirm Delete
           </button>
         </div>
+      </div>
+    </div>
 
-        <dl class="mt-4 space-y-3 text-sm">
-          <div>
-            <dt class="font-medium text-gray-500">Name</dt>
-            <dd class="mt-0.5 text-gray-900">{{ selectedCookie.cookieName }}</dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Domain</dt>
-            <dd class="mt-0.5 font-mono text-xs text-gray-900">{{ selectedCookie.domain }}</dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Path</dt>
-            <dd class="mt-0.5 font-mono text-xs text-gray-900">{{ selectedCookie.path }}</dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Device ID</dt>
-            <dd class="mt-0.5 font-mono text-xs text-gray-600 break-all">
-              {{ selectedCookie.deviceId }}
-            </dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Lamport Timestamp</dt>
-            <dd class="mt-0.5 text-gray-900">{{ selectedCookie.lamportTs }}</dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Updated At</dt>
-            <dd class="mt-0.5 text-gray-900">
-              {{ new Date(selectedCookie.updatedAt).toLocaleString() }}
-            </dd>
-          </div>
-          <div>
-            <dt class="font-medium text-gray-500">Value (encrypted)</dt>
-            <dd class="mt-0.5 font-mono text-xs text-gray-400 break-all max-h-24 overflow-auto">
-              {{ selectedCookie.ciphertext?.slice(0, 80) }}...
-            </dd>
-          </div>
-        </dl>
-
-        <button
-          class="mt-6 w-full rounded-lg border border-red-200 px-3 py-2 text-xs font-medium text-red-600 hover:bg-red-50"
-          @click="handleDelete(selectedCookie)"
-        >
-          Delete Cookie
-        </button>
-      </aside>
-    </TransitionRoot>
+    <!-- Batch delete confirmation dialog -->
+    <div v-if="confirmingBatchDelete" class="fixed inset-0 z-50 flex items-center justify-center bg-black/30">
+      <div role="dialog" class="w-80 rounded-xl bg-white p-6 shadow-lg">
+        <p class="text-sm text-gray-600">
+          Are you sure you want to delete {{ selectedIds.size }} cookies?
+        </p>
+        <div class="mt-4 flex gap-3">
+          <button
+            class="flex-1 rounded-lg border border-gray-200 px-3 py-2 text-sm font-medium text-gray-600 hover:bg-gray-50"
+            @click="cancelBatchDelete"
+          >
+            Cancel
+          </button>
+          <button
+            class="flex-1 rounded-lg bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-700"
+            @click="confirmBatchDelete"
+          >
+            Confirm Delete
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
diff --git a/web/src/views/DashboardView.vue b/web/src/views/DashboardView.vue
index 247a283..0b15494 100644
--- a/web/src/views/DashboardView.vue
+++ b/web/src/views/DashboardView.vue
@@ -8,6 +8,8 @@ interface DashboardData {
   onlineDevices: number;
   totalCookies: number;
   uniqueDomains: number;
+  syncCount: number;
+  uptimeSeconds: number;
 }
 
 interface DeviceSummary {
@@ -21,6 +23,7 @@ interface DeviceSummary {
 const dashboard = ref<DashboardData | null>(null);
 const devices = ref<DeviceSummary[]>([]);
 const loading = ref(true);
+const error = ref<string | null>(null);
 
 const offlineDevices = computed(
   () => (dashboard.value?.totalDevices ?? 0) - (dashboard.value?.onlineDevices ?? 0),
@@ -35,45 +38,60 @@ function platformIcon(platform: string): string {
   return "device";
 }
 
-onMounted(async () => {
+function formatUptime(seconds: number): string {
+  const d = Math.floor(seconds / 86400);
+  const h = Math.floor((seconds % 86400) / 3600);
+  if (d > 0) return `${d}d ${h}h`;
+  const m = Math.floor((seconds % 3600) / 60);
+  if (h > 0) return `${h}h ${m}m`;
+  return `${m}m`;
+}
+
+async function fetchData() {
+  loading.value = true;
+  error.value = null;
   try {
-    const [dashRes, devRes] = await Promise.all([
-      api.get("/dashboard"),
-      api.get("/devices"),
-    ]);
+    const dashRes = await api.get("/dashboard");
     dashboard.value = dashRes.data;
+  } catch {
+    error.value = "Failed to load dashboard data";
+  }
+  try {
+    const devRes = await api.get("/devices");
     devices.value = devRes.data.devices ?? [];
   } catch {
-    // Server might be down
-  } finally {
-    loading.value = false;
+    // Devices list is optional — dashboard still shows stats
   }
-});
+  loading.value = false;
+}
+
+onMounted(fetchData);
 </script>
 
 <template>
   <div class="p-8">
-    <h2 class="text-2xl font-semibold text-gray-900">Dashboard</h2>
-    <p class="mt-1 text-sm text-gray-500">CookieBridge relay server overview</p>
+    <div class="flex items-center justify-between">
+      <div>
+        <h2 class="text-2xl font-semibold text-gray-900">Dashboard</h2>
+        <p class="mt-1 text-sm text-gray-500">CookieBridge relay server overview</p>
+      </div>
+      <button
+        class="rounded-lg border border-gray-200 px-3 py-2 text-sm font-medium text-gray-600 hover:bg-gray-50"
+        @click="fetchData"
+      >
+        Refresh
+      </button>
+    </div>
 
     <div v-if="loading" class="mt-8 text-sm text-gray-500">Loading...</div>
 
+    <div v-else-if="error" role="alert" class="mt-8 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700">
+      {{ error }}
+    </div>
+
     <template v-else>
       <!-- Stat cards -->
       <div class="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
-        <div class="rounded-xl bg-white p-6 ring-1 ring-gray-200">
-          <p class="text-sm font-medium text-gray-500">Server Status</p>
-          <div class="mt-2 flex items-center gap-2">
-            <span
-              class="inline-block h-2.5 w-2.5 rounded-full"
-              :class="dashboard ? 'bg-green-500' : 'bg-red-500'"
-            />
-            <span class="text-lg font-semibold text-gray-900">
-              {{ dashboard ? "Online" : "Offline" }}
-            </span>
-          </div>
-        </div>
-
         <div class="rounded-xl bg-white p-6 ring-1 ring-gray-200">
           <p class="text-sm font-medium text-gray-500">Devices</p>
           <p class="mt-2 text-3xl font-semibold text-gray-900">
@@ -105,10 +123,19 @@ onMounted(async () => {
         </div>
 
         <div class="rounded-xl bg-white p-6 ring-1 ring-gray-200">
-          <p class="text-sm font-medium text-gray-500">WebSocket Connections</p>
+          <p class="text-sm font-medium text-gray-500">Sync Activity</p>
           <p class="mt-2 text-3xl font-semibold text-gray-900">
-            {{ dashboard?.connections ?? 0 }}
+            {{ dashboard?.syncCount ?? 0 }}
           </p>
+          <p class="mt-1 text-xs text-gray-500">total sync operations</p>
+        </div>
+
+        <div class="rounded-xl bg-white p-6 ring-1 ring-gray-200">
+          <p class="text-sm font-medium text-gray-500">Uptime</p>
+          <p class="mt-2 text-3xl font-semibold text-gray-900">
+            {{ dashboard?.uptimeSeconds ? formatUptime(dashboard.uptimeSeconds) : "—" }}
+          </p>
+          <p class="mt-1 text-xs text-gray-500">server running time</p>
         </div>
       </div>
 
diff --git a/web/src/views/DevicesView.vue b/web/src/views/DevicesView.vue
index 2e8ff67..9b96146 100644
--- a/web/src/views/DevicesView.vue
+++ b/web/src/views/DevicesView.vue
@@ -8,6 +8,9 @@ interface DeviceEntry {
   platform: string;
   createdAt: string;
   online: boolean;
+  lastSeen?: string;
+  ipAddress?: string | null;
+  extensionVersion?: string;
 }
 
 const devices = ref<DeviceEntry[]>([]);
@@ -86,6 +89,11 @@ onMounted(async () => {
     </div>
 
     <div v-if="loading" class="mt-6 text-sm text-gray-500">Loading...</div>
+
+    <div v-else-if="error" role="alert" class="mt-6 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700">
+      {{ error }}
+    </div>
+
     <div v-else-if="filtered.length === 0" class="mt-6 text-sm text-gray-500">
       No devices {{ filter !== "all" ? `(${filter})` : "" }}
     </div>
@@ -94,7 +102,7 @@ onMounted(async () => {
       <div
         v-for="device in filtered"
         :key="device.deviceId"
-        class="rounded-xl bg-white ring-1 ring-gray-200 transition-shadow hover:shadow-sm"
+        class="device-card rounded-xl bg-white ring-1 ring-gray-200 transition-shadow hover:shadow-sm"
       >
         <!-- Card header -->
         <div class="p-5">
@@ -127,6 +135,12 @@ onMounted(async () => {
               <dt class="text-gray-500">Registered</dt>
               <dd class="text-gray-900">{{ new Date(device.createdAt).toLocaleDateString() }}</dd>
             </div>
+            <div class="flex justify-between">
+              <dt class="text-gray-500">Last Seen</dt>
+              <dd class="text-gray-900">
+                {{ device.lastSeen ? new Date(device.lastSeen).toLocaleString() : "—" }}
+              </dd>
+            </div>
             <div class="flex justify-between">
               <dt class="text-gray-500">Device ID</dt>
               <dd class="font-mono text-xs text-gray-600">{{ device.deviceId.slice(0, 16) }}...</dd>
@@ -158,6 +172,14 @@ onMounted(async () => {
                 <dt class="text-gray-500">Registered</dt>
                 <dd class="text-gray-700">{{ new Date(device.createdAt).toLocaleString() }}</dd>
               </div>
+              <div v-if="device.extensionVersion" class="flex justify-between">
+                <dt class="text-gray-500">Extension Version</dt>
+                <dd class="text-gray-700">{{ device.extensionVersion }}</dd>
+              </div>
+              <div v-if="device.ipAddress" class="flex justify-between">
+                <dt class="text-gray-500">IP Address</dt>
+                <dd class="font-mono text-gray-700">{{ device.ipAddress }}</dd>
+              </div>
             </dl>
           </div>
         </div>
@@ -189,7 +211,7 @@ onMounted(async () => {
             class="w-full rounded-lg border border-red-200 px-3 py-1.5 text-xs font-medium text-red-600 hover:bg-red-50"
             @click="confirmRevoke = device.deviceId"
           >
-            Revoke Device
+            Sign Out Device
           </button>
         </div>
       </div>
diff --git a/web/src/views/SettingsView.vue b/web/src/views/SettingsView.vue
index 224086d..bdd5ae1 100644
--- a/web/src/views/SettingsView.vue
+++ b/web/src/views/SettingsView.vue
@@ -7,6 +7,8 @@ import api from "@/api/client";
 const store = useSettingsStore();
 const saving = ref(false);
 const saved = ref(false);
+const saveError = ref("");
+const loadError = ref("");
 const passwordError = ref("");
 
 // Password change
@@ -21,17 +23,24 @@ const syncFrequencyOptions = [
   { label: "Manual only", value: -1 },
 ];
 
-onMounted(() => store.fetchSettings());
+onMounted(async () => {
+  try {
+    await store.fetchSettings();
+  } catch {
+    loadError.value = "Failed to load settings";
+  }
+});
 
 async function save() {
   saving.value = true;
   saved.value = false;
+  saveError.value = "";
   try {
     await store.updateSettings(store.settings);
     saved.value = true;
     setTimeout(() => (saved.value = false), 2000);
   } catch {
-    // Error handled by store
+    saveError.value = "Failed to save settings";
   } finally {
     saving.value = false;
   }
@@ -77,6 +86,19 @@ async function changePassword() {
       Settings saved
     </div>
 
+    <!-- Error toast -->
+    <div
+      v-if="saveError"
+      class="fixed right-8 top-8 z-50 rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white shadow-lg"
+    >
+      {{ saveError }}
+    </div>
+
+    <!-- Load error -->
+    <div v-if="loadError" role="alert" class="mt-6 rounded-lg border border-red-200 bg-red-50 p-4 text-sm text-red-700">
+      {{ loadError }}
+    </div>
+
     <div class="mt-6 max-w-2xl">
       <TabGroup>
         <TabList class="flex gap-1 rounded-xl bg-gray-100 p-1">
@@ -104,10 +126,13 @@ async function changePassword() {
                 <!-- Auto-sync toggle -->
                 <div class="flex items-center justify-between">
                   <div>
-                    <p class="text-sm font-medium text-gray-700">Auto-sync</p>
+                    <label id="auto-sync-label" class="text-sm font-medium text-gray-700">Auto-sync</label>
                     <p class="text-xs text-gray-500">Automatically sync cookies between devices</p>
                   </div>
                   <button
+                    role="switch"
+                    :aria-checked="store.settings.autoSync"
+                    aria-labelledby="auto-sync-label"
                     class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors"
                     :class="store.settings.autoSync ? 'bg-blue-600' : 'bg-gray-200'"
                     @click="store.settings.autoSync = !store.settings.autoSync"
@@ -121,8 +146,9 @@ async function changePassword() {
 
                 <!-- Sync frequency -->
                 <div>
-                  <label class="block text-sm font-medium text-gray-700">Sync Frequency</label>
+                  <label for="sync-frequency" class="block text-sm font-medium text-gray-700">Sync Frequency</label>
                   <select
+                    id="sync-frequency"
                     v-model="store.settings.syncIntervalMs"
                     class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
                   >
@@ -154,8 +180,9 @@ async function changePassword() {
               <h3 class="font-medium text-gray-900">Change Password</h3>
               <form class="mt-4 space-y-4" @submit.prevent="changePassword">
                 <div>
-                  <label class="block text-sm text-gray-700">Current Password</label>
+                  <label for="current-password" class="block text-sm text-gray-700">Current Password</label>
                   <input
+                    id="current-password"
                     v-model="currentPassword"
                     type="password"
                     autocomplete="current-password"
@@ -163,8 +190,9 @@ async function changePassword() {
                   />
                 </div>
                 <div>
-                  <label class="block text-sm text-gray-700">New Password</label>
+                  <label for="new-password" class="block text-sm text-gray-700">New Password</label>
                   <input
+                    id="new-password"
                     v-model="newPassword"
                     type="password"
                     autocomplete="new-password"
@@ -173,8 +201,9 @@ async function changePassword() {
                   />
                 </div>
                 <div>
-                  <label class="block text-sm text-gray-700">Confirm New Password</label>
+                  <label for="confirm-password" class="block text-sm text-gray-700">Confirm Password</label>
                   <input
+                    id="confirm-password"
                     v-model="confirmNewPassword"
                     type="password"
                     autocomplete="new-password"
@@ -196,8 +225,21 @@ async function changePassword() {
               <h3 class="font-medium text-gray-900">Device Security</h3>
               <div class="mt-4 space-y-4">
                 <div>
-                  <label class="block text-sm text-gray-700">Max Devices</label>
+                  <label for="session-timeout" class="block text-sm text-gray-700">Session Timeout (minutes)</label>
                   <input
+                    id="session-timeout"
+                    v-model.number="store.settings.sessionTimeoutMinutes"
+                    type="number"
+                    min="1"
+                    max="1440"
+                    class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
+                  />
+                  <p class="mt-1 text-xs text-gray-500">Auto-logout after inactivity</p>
+                </div>
+                <div>
+                  <label for="max-devices" class="block text-sm text-gray-700">Max Devices</label>
+                  <input
+                    id="max-devices"
                     v-model.number="store.settings.maxDevices"
                     type="number"
                     min="1"
@@ -242,12 +284,19 @@ async function changePassword() {
 
                 <div>
                   <label class="block text-sm font-medium text-gray-700">Language</label>
-                  <select
-                    class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm"
-                  >
-                    <option value="en">English</option>
-                    <option value="zh">中文</option>
-                  </select>
+                  <div class="mt-2 grid grid-cols-2 gap-3">
+                    <button
+                      v-for="lang in [{ value: 'en', label: 'English' }, { value: 'zh', label: '中文' }]"
+                      :key="lang.value"
+                      class="rounded-lg border-2 px-4 py-3 text-center text-sm font-medium transition-colors"
+                      :class="store.settings.language === lang.value
+                        ? 'border-blue-600 bg-blue-50 text-blue-700'
+                        : 'border-gray-200 text-gray-600 hover:border-gray-300'"
+                      @click="store.settings.language = lang.value"
+                    >
+                      {{ lang.label }}
+                    </button>
+                  </div>
                 </div>
               </div>
             </section>
diff --git a/web/src/views/SetupView.vue b/web/src/views/SetupView.vue
index a3c28f5..c2f8277 100644
--- a/web/src/views/SetupView.vue
+++ b/web/src/views/SetupView.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ref, computed } from "vue";
 import { useRouter } from "vue-router";
-import { TransitionRoot } from "@headlessui/vue";
 import api from "@/api/client";
 import { markSetupComplete } from "@/router";
 
@@ -35,6 +34,10 @@ const canProceedStep2 = computed(
 
 function nextStep() {
   error.value = "";
+  if (step.value === 2 && passwordMismatch.value) {
+    error.value = "Passwords do not match";
+    return;
+  }
   step.value = Math.min(step.value + 1, totalSteps);
 }
 
@@ -73,229 +76,193 @@ function goToLogin() {
         <div
           v-for="i in totalSteps"
           :key="i"
-          class="h-1.5 flex-1 rounded-full transition-colors"
+          class="h-1.5 flex-1 rounded-full"
           :class="i <= step ? 'bg-blue-600' : 'bg-gray-200'"
         />
       </div>
 
       <!-- Step 1: Welcome -->
-      <TransitionRoot
-        :show="step === 1"
-        enter="transition-opacity duration-200"
-        enter-from="opacity-0"
-        enter-to="opacity-100"
-        leave="transition-opacity duration-150"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-      >
-        <div>
-          <h1 class="text-2xl font-semibold text-gray-900">Welcome to CookieBridge</h1>
-          <p class="mt-3 text-sm leading-relaxed text-gray-600">
-            CookieBridge synchronizes your browser cookies across devices with end-to-end encryption.
-            Login once on any device, and stay logged in everywhere.
-          </p>
-          <ul class="mt-4 space-y-2 text-sm text-gray-600">
-            <li class="flex gap-2">
-              <span class="text-green-500">&#10003;</span>
-              End-to-end encrypted — the server never sees your data
-            </li>
-            <li class="flex gap-2">
-              <span class="text-green-500">&#10003;</span>
-              Multi-browser support (Chrome, Firefox, Edge, Safari)
-            </li>
-            <li class="flex gap-2">
-              <span class="text-green-500">&#10003;</span>
-              AI agent integration via Agent Skill API
-            </li>
-          </ul>
-          <button
-            class="mt-6 w-full rounded-lg bg-blue-600 px-4 py-2.5 text-sm font-medium text-white hover:bg-blue-700"
-            @click="nextStep"
-          >
-            Continue
-          </button>
-        </div>
-      </TransitionRoot>
+      <div v-if="step === 1">
+        <h1 class="text-2xl font-semibold text-gray-900">Welcome to CookieBridge</h1>
+        <p class="mt-3 text-sm leading-relaxed text-gray-600">
+          Synchronize your browser cookies across devices with end-to-end encryption.
+          Login once on any device, and stay logged in everywhere.
+        </p>
+        <ul class="mt-4 space-y-2 text-sm text-gray-600">
+          <li class="flex gap-2">
+            <span class="text-green-500">&#10003;</span>
+            End-to-end encrypted — the server never sees your data
+          </li>
+          <li class="flex gap-2">
+            <span class="text-green-500">&#10003;</span>
+            Multi-browser support (Chrome, Firefox, Edge, Safari)
+          </li>
+          <li class="flex gap-2">
+            <span class="text-green-500">&#10003;</span>
+            AI agent integration via Agent Skill API
+          </li>
+        </ul>
+        <button
+          class="mt-6 w-full rounded-lg bg-blue-600 px-4 py-2.5 text-sm font-medium text-white hover:bg-blue-700"
+          @click="nextStep"
+        >
+          Continue
+        </button>
+      </div>
 
       <!-- Step 2: Admin account -->
-      <TransitionRoot
-        :show="step === 2"
-        enter="transition-opacity duration-200"
-        enter-from="opacity-0"
-        enter-to="opacity-100"
-        leave="transition-opacity duration-150"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-      >
-        <div>
-          <h2 class="text-xl font-semibold text-gray-900">Create Admin Account</h2>
-          <p class="mt-1 text-sm text-gray-500">Set up your administrator credentials</p>
+      <div v-if="step === 2">
+        <h2 class="text-xl font-semibold text-gray-900">Create Admin Account</h2>
+        <p class="mt-1 text-sm text-gray-500">Set up your administrator credentials</p>
 
-          <form class="mt-5 space-y-4" @submit.prevent="nextStep">
-            <div>
-              <label class="block text-sm font-medium text-gray-700" for="setup-username">
-                Username
-              </label>
-              <input
-                id="setup-username"
-                v-model="username"
-                type="text"
-                required
-                minlength="3"
-                autocomplete="username"
-                class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
-                placeholder="admin"
-              />
-            </div>
-            <div>
-              <label class="block text-sm font-medium text-gray-700" for="setup-password">
-                Password
-              </label>
-              <input
-                id="setup-password"
-                v-model="password"
-                type="password"
-                required
-                minlength="8"
-                autocomplete="new-password"
-                class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
-                placeholder="At least 8 characters"
-              />
-            </div>
-            <div>
-              <label class="block text-sm font-medium text-gray-700" for="setup-confirm">
-                Confirm Password
-              </label>
-              <input
-                id="setup-confirm"
-                v-model="confirmPassword"
-                type="password"
-                required
-                autocomplete="new-password"
-                class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
-                :class="passwordMismatch ? 'border-red-300 focus:border-red-500 focus:ring-red-500' : ''"
-              />
-              <p v-if="passwordMismatch" class="mt-1 text-xs text-red-600">
-                Passwords do not match
-              </p>
-            </div>
+        <form class="mt-5 space-y-4" @submit.prevent="nextStep">
+          <div>
+            <label class="block text-sm font-medium text-gray-700" for="setup-username">
+              Username
+            </label>
+            <input
+              id="setup-username"
+              v-model="username"
+              type="text"
+              required
+              minlength="3"
+              autocomplete="username"
+              class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+              placeholder="admin"
+            />
+          </div>
+          <div>
+            <label class="block text-sm font-medium text-gray-700" for="setup-password">
+              Password
+            </label>
+            <input
+              id="setup-password"
+              v-model="password"
+              type="password"
+              required
+              minlength="8"
+              autocomplete="new-password"
+              aria-label="Password"
+              class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+              placeholder="At least 8 characters"
+            />
+          </div>
+          <div>
+            <label class="block text-sm font-medium text-gray-700" for="setup-confirm">
+              Confirm Password
+            </label>
+            <input
+              id="setup-confirm"
+              v-model="confirmPassword"
+              type="password"
+              required
+              autocomplete="new-password"
+              aria-label="Confirm Password"
+              class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+              :class="passwordMismatch ? 'border-red-300 focus:border-red-500 focus:ring-red-500' : ''"
+            />
+            <p v-if="passwordMismatch" class="mt-1 text-xs text-red-600">
+              Passwords do not match
+            </p>
+          </div>
 
-            <div class="flex gap-3 pt-2">
-              <button
-                type="button"
-                class="flex-1 rounded-lg border border-gray-300 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
-                @click="prevStep"
-              >
-                Back
-              </button>
-              <button
-                type="submit"
-                :disabled="!canProceedStep2"
-                class="flex-1 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-50"
-              >
-                Next
-              </button>
-            </div>
-          </form>
-        </div>
-      </TransitionRoot>
+          <p v-if="error" class="text-sm text-red-600">{{ error }}</p>
+
+          <div class="flex gap-3 pt-2">
+            <button
+              type="button"
+              class="flex-1 rounded-lg border border-gray-300 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
+              @click="prevStep"
+            >
+              Back
+            </button>
+            <button
+              type="submit"
+              :disabled="!canProceedStep2"
+              class="flex-1 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-50"
+            >
+              Next
+            </button>
+          </div>
+        </form>
+      </div>
 
       <!-- Step 3: Basic config -->
-      <TransitionRoot
-        :show="step === 3"
-        enter="transition-opacity duration-200"
-        enter-from="opacity-0"
-        enter-to="opacity-100"
-        leave="transition-opacity duration-150"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-      >
-        <div>
-          <h2 class="text-xl font-semibold text-gray-900">Basic Configuration</h2>
-          <p class="mt-1 text-sm text-gray-500">Configure your relay server</p>
+      <div v-if="step === 3">
+        <h2 class="text-xl font-semibold text-gray-900">Basic Configuration</h2>
+        <p class="mt-1 text-sm text-gray-500">Configure your relay server</p>
 
-          <div class="mt-5 space-y-4">
+        <div class="mt-5 space-y-4">
+          <div>
+            <label class="block text-sm font-medium text-gray-700" for="setup-port">
+              Listen Port
+            </label>
+            <input
+              id="setup-port"
+              v-model.number="listenPort"
+              type="number"
+              min="1"
+              max="65535"
+              class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+            />
+            <p class="mt-1 text-xs text-gray-500">Default: 8100</p>
+          </div>
+
+          <div class="flex items-center justify-between rounded-lg border border-gray-200 px-4 py-3">
             <div>
-              <label class="block text-sm font-medium text-gray-700" for="setup-port">
-                Listen Port
-              </label>
-              <input
-                id="setup-port"
-                v-model.number="listenPort"
-                type="number"
-                min="1"
-                max="65535"
-                class="mt-1 block w-full rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+              <p class="text-sm font-medium text-gray-700">Enable HTTPS</p>
+              <p class="text-xs text-gray-500">Recommended for production use</p>
+            </div>
+            <button
+              type="button"
+              class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors"
+              :class="enableHttps ? 'bg-blue-600' : 'bg-gray-200'"
+              @click="enableHttps = !enableHttps"
+            >
+              <span
+                class="inline-block h-4 w-4 rounded-full bg-white transition-transform"
+                :class="enableHttps ? 'translate-x-6' : 'translate-x-1'"
               />
-              <p class="mt-1 text-xs text-gray-500">Default: 8100</p>
-            </div>
+            </button>
+          </div>
 
-            <div class="flex items-center justify-between rounded-lg border border-gray-200 px-4 py-3">
-              <div>
-                <p class="text-sm font-medium text-gray-700">Enable HTTPS</p>
-                <p class="text-xs text-gray-500">Recommended for production use</p>
-              </div>
-              <button
-                type="button"
-                class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors"
-                :class="enableHttps ? 'bg-blue-600' : 'bg-gray-200'"
-                @click="enableHttps = !enableHttps"
-              >
-                <span
-                  class="inline-block h-4 w-4 rounded-full bg-white transition-transform"
-                  :class="enableHttps ? 'translate-x-6' : 'translate-x-1'"
-                />
-              </button>
-            </div>
+          <p v-if="error" class="text-sm text-red-600">{{ error }}</p>
 
-            <p v-if="error" class="text-sm text-red-600">{{ error }}</p>
-
-            <div class="flex gap-3 pt-2">
-              <button
-                type="button"
-                class="flex-1 rounded-lg border border-gray-300 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
-                @click="prevStep"
-              >
-                Back
-              </button>
-              <button
-                :disabled="loading"
-                class="flex-1 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-50"
-                @click="completeSetup"
-              >
-                {{ loading ? "Setting up..." : "Next" }}
-              </button>
-            </div>
+          <div class="flex gap-3 pt-2">
+            <button
+              type="button"
+              class="flex-1 rounded-lg border border-gray-300 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50"
+              @click="prevStep"
+            >
+              Back
+            </button>
+            <button
+              :disabled="loading"
+              class="flex-1 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-50"
+              @click="completeSetup"
+            >
+              {{ loading ? "Setting up..." : "Next" }}
+            </button>
           </div>
         </div>
-      </TransitionRoot>
+      </div>
 
       <!-- Step 4: Done -->
-      <TransitionRoot
-        :show="step === 4"
-        enter="transition-opacity duration-200"
-        enter-from="opacity-0"
-        enter-to="opacity-100"
-        leave="transition-opacity duration-150"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-      >
-        <div class="text-center">
-          <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100">
-            <span class="text-2xl text-green-600">&#10003;</span>
-          </div>
-          <h2 class="mt-4 text-xl font-semibold text-gray-900">Setup Complete!</h2>
-          <p class="mt-2 text-sm text-gray-500">
-            Your CookieBridge server is ready. Sign in with your admin credentials.
-          </p>
-          <button
-            class="mt-6 w-full rounded-lg bg-blue-600 px-4 py-2.5 text-sm font-medium text-white hover:bg-blue-700"
-            @click="goToLogin"
-          >
-            Go to Login
-          </button>
+      <div v-if="step === 4" class="text-center">
+        <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100">
+          <span class="text-2xl text-green-600">&#10003;</span>
         </div>
-      </TransitionRoot>
+        <h2 class="mt-4 text-xl font-semibold text-gray-900">Setup Complete!</h2>
+        <p class="mt-2 text-sm text-gray-500">
+          Your CookieBridge server is ready. Sign in with your admin credentials.
+        </p>
+        <button
+          class="mt-6 w-full rounded-lg bg-blue-600 px-4 py-2.5 text-sm font-medium text-white hover:bg-blue-700"
+          @click="goToLogin"
+        >
+          Go to Login
+        </button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/web/tests/e2e/helpers/mock-api.ts b/web/tests/e2e/helpers/mock-api.ts
index 5cc668c..ad28c5d 100644
--- a/web/tests/e2e/helpers/mock-api.ts
+++ b/web/tests/e2e/helpers/mock-api.ts
@@ -10,8 +10,11 @@ export async function mockDashboard(page: Page): Promise<void> {
       status: 200,
       contentType: "application/json",
       body: JSON.stringify({
-        devices: { total: 3, online: 2, offline: 1 },
-        cookies: { total: 142, domains: 8 },
+        totalDevices: 3,
+        onlineDevices: 2,
+        totalCookies: 142,
+        uniqueDomains: 8,
+        connections: 2,
         syncCount: 57,
         uptimeSeconds: 86400,
       }),
@@ -23,38 +26,53 @@ export async function mockDashboard(page: Page): Promise<void> {
  * Intercept /admin/cookies and return a paginated list.
  */
 export async function mockCookies(page: Page): Promise<void> {
-  await page.route("**/admin/cookies*", (route) =>
-    route.fulfill({
+  await page.route("**/admin/cookies*", (route) => {
+    if (route.request().method() === "DELETE") {
+      return route.fulfill({ status: 200, contentType: "application/json", body: "{}" });
+    }
+    return route.fulfill({
       status: 200,
       contentType: "application/json",
       body: JSON.stringify({
         cookies: [
           {
             id: "c1",
+            deviceId: "dev-001",
             domain: "example.com",
-            name: "session",
-            value: "abc123",
+            cookieName: "session",
             path: "/",
+            ciphertext: "encrypted-abc123",
+            nonce: "nonce1",
+            lamportTs: 1,
+            updatedAt: "2026-03-01T00:00:00Z",
             expires: "2027-01-01T00:00:00Z",
             secure: true,
             httpOnly: true,
           },
           {
             id: "c2",
+            deviceId: "dev-001",
             domain: "example.com",
-            name: "pref",
-            value: "dark",
+            cookieName: "pref",
             path: "/",
+            ciphertext: "encrypted-dark",
+            nonce: "nonce2",
+            lamportTs: 2,
+            updatedAt: "2026-03-02T00:00:00Z",
             expires: "2027-06-01T00:00:00Z",
             secure: false,
             httpOnly: false,
           },
           {
             id: "c3",
+            deviceId: "dev-002",
             domain: "other.io",
-            name: "token",
-            value: "xyz",
+            cookieName: "token",
             path: "/",
+            ciphertext: "encrypted-xyz",
+            nonce: "nonce3",
+            lamportTs: 3,
+            updatedAt: "2026-03-03T00:00:00Z",
             expires: null,
             secure: true,
             httpOnly: true,
@@ -63,44 +81,45 @@ export async function mockCookies(page: Page): Promise<void> {
         total: 3,
         page: 1,
       }),
-    }),
-  );
+    });
+  });
 }
 
 /**
  * Intercept /admin/devices and return device list.
  */
 export async function mockDevices(page: Page): Promise<void> {
-  await page.route("**/admin/devices*", (route) =>
-    route.fulfill({
+  await page.route("**/admin/devices*", (route) => {
+    if (route.request().method() !== "GET") return route.continue();
+    return route.fulfill({
       status: 200,
       contentType: "application/json",
       body: JSON.stringify({
         devices: [
           {
-            id: "d1",
+            deviceId: "d1",
             name: "Chrome on macOS",
             platform: "chrome",
             online: true,
             lastSeen: new Date().toISOString(),
-            registeredAt: "2026-01-01T00:00:00Z",
+            createdAt: "2026-01-01T00:00:00Z",
             ipAddress: "192.168.1.10",
             extensionVersion: "2.0.0",
           },
           {
-            id: "d2",
+            deviceId: "d2",
             name: "Firefox on Windows",
             platform: "firefox",
             online: false,
             lastSeen: "2026-03-15T10:00:00Z",
-            registeredAt: "2026-02-01T00:00:00Z",
+            createdAt: "2026-02-01T00:00:00Z",
             ipAddress: null,
             extensionVersion: "2.0.0",
           },
         ],
       }),
-    }),
-  );
+    });
+  });
 }
 
 /**
@@ -113,20 +132,12 @@ export async function mockSettings(page: Page): Promise<void> {
         status: 200,
         contentType: "application/json",
         body: JSON.stringify({
-          sync: {
-            autoSync: true,
-            frequency: "realtime",
-            domainWhitelist: [],
-            domainBlacklist: [],
-          },
-          security: {
-            sessionTimeoutMinutes: 60,
-            requirePairingPin: false,
-          },
-          appearance: {
-            theme: "system",
-            language: "zh",
-          },
+          autoSync: true,
+          syncIntervalMs: 0,
+          maxDevices: 10,
+          theme: "system",
+          sessionTimeoutMinutes: 60,
+          language: "zh",
         }),
       });
     }