diff --git a/backend/secuscan/config.py b/backend/secuscan/config.py
index e05e573c..4f3ae89e 100644
--- a/backend/secuscan/config.py
+++ b/backend/secuscan/config.py
@@ -4,7 +4,7 @@
 
 from pathlib import Path
 from typing import Any, List, Optional
-from pydantic import field_validator
+from pydantic import ConfigDict, field_validator
 from pydantic_settings import BaseSettings
 import base64
 import hashlib
@@ -13,6 +13,11 @@
 
 
 class Settings(BaseSettings):
+    model_config = ConfigDict(
+        env_prefix="SECUSCAN_",
+        case_sensitive=False,
+    )
+
     """Application settings loaded from environment variables"""
     
     # Server Configuration
@@ -75,10 +80,6 @@ class Settings(BaseSettings):
     # Logging
     log_level: str = "INFO"
     log_file: str = str(PROJECT_ROOT / "logs" / "secuscan.log")
-    
-    class Config:
-        env_prefix = "SECUSCAN_"
-        case_sensitive = False
 
     @field_validator("cors_allowed_origins", "cors_allowed_methods", "cors_allowed_headers", mode="before")
     @classmethod
diff --git a/backend/secuscan/main.py b/backend/secuscan/main.py
index 08eb02c2..f227040d 100644
--- a/backend/secuscan/main.py
+++ b/backend/secuscan/main.py
@@ -17,6 +17,7 @@
 from .database import init_db, db as global_db
 from .plugins import init_plugins
 from .routes import router
+from .saved_views import saved_views_router
 from .workflows import scheduler
 
 
@@ -38,29 +39,29 @@ async def lifespan(app: FastAPI):
     """Application lifespan manager"""
     # Startup
     logger.info("🚀 Starting SecuScan backend...")
-    
+
     # Ensure directories exist
     settings.ensure_directories()
     logger.info("✓ Directories initialized")
-    
+
     # Initialize database
     await init_db(settings.database_path)
     logger.info("✓ SQLite connected")
 
     await init_cache()
     logger.info("✓ In-memory cache initialized")
-    
+
     # Load plugins
     await init_plugins(settings.plugins_dir)
     logger.info("✓ Plugins loaded")
 
     await scheduler.start()
     logger.info("✓ Workflow scheduler started")
-    
+
     logger.info("✓ Ready to serve on %s:%d", settings.bind_address, settings.bind_port)
-    
+
     yield
-    
+
     # Shutdown
     logger.info("🛑 Shutting down SecuScan backend...")
     if global_db:
@@ -116,7 +117,7 @@ async def redirect_api_openapi():
 
 # Include API routes
 app.include_router(router)
-
+app.include_router(saved_views_router)
 
 # Health check endpoint
 @app.get("/api/v1/health")
@@ -124,7 +125,7 @@ async def health_check():
     """Health check endpoint"""
     import platform
     import sys
-    
+
     return {
         "status": "operational",
         "version": "0.1.0-alpha",
@@ -152,7 +153,7 @@ async def root():
 def main():
     """Main entry point"""
     import uvicorn
-    
+
     logger.info("""
     ╔═══════════════════════════════════════════════════════╗
     ║                                                       ║
@@ -163,7 +164,7 @@ def main():
     ║                                                       ║
     ╚═══════════════════════════════════════════════════════╝
     """)
-    
+
     uvicorn.run(
         "backend.secuscan.main:app",
         host=settings.bind_address,
diff --git a/backend/secuscan/saved_views.py b/backend/secuscan/saved_views.py
new file mode 100644
index 00000000..7549db4a
--- /dev/null
+++ b/backend/secuscan/saved_views.py
@@ -0,0 +1,215 @@
+from __future__ import annotations
+
+import json
+import uuid
+from typing import Any, Dict, List, Optional
+
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel, Field, field_validator
+
+from .database import get_db
+
+saved_views_router = APIRouter(prefix="/api/v1/saved-views", tags=["saved-views"])
+
+_VALID_SORT_MODES = {"severity", "newest", "oldest", "target"}
+_VALID_SEVERITIES = {"all", "critical", "high", "medium", "low", "info"}
+
+
+class FilterPreset(BaseModel):
+    """Validated representation of the frontend filter state."""
+    severity:    str = "all"
+    target:      str = "all"
+    scanner:     str = "all"
+    sortMode:    str = "severity"
+    dateFrom:    str = ""
+    dateTo:      str = ""
+    searchQuery: str = ""
+
+    @field_validator("sortMode")
+    @classmethod
+    def validate_sort_mode(cls, v: str) -> str:
+        if v not in _VALID_SORT_MODES:
+            raise ValueError(f"sortMode must be one of {_VALID_SORT_MODES}")
+        return v
+
+    @field_validator("severity")
+    @classmethod
+    def validate_severity(cls, v: str) -> str:
+        if v not in _VALID_SEVERITIES:
+            raise ValueError(f"severity must be one of {_VALID_SEVERITIES}")
+        return v
+
+
+class SavedViewCreate(BaseModel):
+    """Request body for POST /saved-views."""
+    name:        str = Field(..., min_length=1, max_length=60)
+    filter_json: str
+
+    @field_validator("name")
+    @classmethod
+    def strip_name(cls, v: str) -> str:
+        stripped = v.strip()
+        if not stripped:
+            raise ValueError("name cannot be blank")
+        return stripped
+
+    @field_validator("filter_json")
+    @classmethod
+    def validate_filter_json(cls, v: str) -> str:
+        try:
+            data = json.loads(v)
+        except json.JSONDecodeError as exc:
+            raise ValueError(f"filter_json is not valid JSON: {exc}") from exc
+        FilterPreset(**data)
+        return v
+
+
+class SavedViewUpdate(BaseModel):
+    """Request body for PUT /saved-views/{id}."""
+    name:        Optional[str] = Field(None, min_length=1, max_length=60)
+    filter_json: Optional[str] = None
+
+    @field_validator("name")
+    @classmethod
+    def strip_name(cls, v: Optional[str]) -> Optional[str]:
+        if v is None:
+            return v
+        stripped = v.strip()
+        if not stripped:
+            raise ValueError("name cannot be blank")
+        return stripped
+
+    @field_validator("filter_json")
+    @classmethod
+    def validate_filter_json(cls, v: Optional[str]) -> Optional[str]:
+        if v is None:
+            return v
+        try:
+            data = json.loads(v)
+        except json.JSONDecodeError as exc:
+            raise ValueError(f"filter_json is not valid JSON: {exc}") from exc
+        FilterPreset(**data)
+        return v
+
+
+
+async def ensure_saved_views_table() -> None:
+    """
+    Idempotently create the saved_views table.
+    Call this from the router startup or from database._create_schema.
+
+    If you prefer to add this SQL directly to database.py's _create_schema,
+    paste the CREATE TABLE block there and remove this function.
+    """
+    db = await get_db()
+    await db.execute(
+        """
+        CREATE TABLE IF NOT EXISTS saved_views (
+            id          TEXT PRIMARY KEY,
+            name        TEXT NOT NULL UNIQUE,
+            filter_json TEXT NOT NULL,
+            created_at  TIMESTAMP NOT NULL DEFAULT (datetime('now')),
+            updated_at  TIMESTAMP NOT NULL DEFAULT (datetime('now'))
+        )
+        """
+    )
+
+
+
+@saved_views_router.get("")
+async def list_saved_views() -> Dict[str, Any]:
+    """Return all saved views ordered by creation date."""
+    await ensure_saved_views_table()
+    db = await get_db()
+    rows: List[Dict] = await db.fetchall(
+        "SELECT id, name, filter_json, created_at, updated_at "
+        "FROM saved_views ORDER BY created_at ASC"
+    )
+    return {"views": rows, "total": len(rows)}
+
+
+@saved_views_router.post("", status_code=201)
+async def create_saved_view(body: SavedViewCreate) -> Dict[str, Any]:
+    """
+    Create a new saved view.
+    Returns 409 if a view with the same name already exists.
+    """
+    await ensure_saved_views_table()
+    db = await get_db()
+
+
+    existing = await db.fetchone(
+        "SELECT id FROM saved_views WHERE LOWER(name) = LOWER(?)", (body.name,)
+    )
+    if existing:
+        raise HTTPException(
+            status_code=409,
+            detail=f"A saved view named '{body.name}' already exists. "
+                   "Use PUT to overwrite it.",
+        )
+
+    view_id = str(uuid.uuid4())
+    await db.execute(
+        """
+        INSERT INTO saved_views (id, name, filter_json)
+        VALUES (?, ?, ?)
+        """,
+        (view_id, body.name, body.filter_json),
+    )
+    return {"id": view_id, "name": body.name, "created": True}
+
+
+@saved_views_router.put("/{view_id}")
+async def update_saved_view(view_id: str, body: SavedViewUpdate) -> Dict[str, Any]:
+    """
+    Overwrite name and/or filter_json for an existing view.
+    Also accepts PATCH semantics — only supplied fields are updated.
+    """
+    await ensure_saved_views_table()
+    db = await get_db()
+
+    row = await db.fetchone("SELECT id FROM saved_views WHERE id = ?", (view_id,))
+    if not row:
+        raise HTTPException(status_code=404, detail="Saved view not found")
+
+    updates: List[str] = []
+    params: List[Any] = []
+
+    if body.name is not None:
+        # Check for name collision with a *different* record
+        collision = await db.fetchone(
+            "SELECT id FROM saved_views WHERE LOWER(name) = LOWER(?) AND id != ?",
+            (body.name, view_id),
+        )
+        if collision:
+            raise HTTPException(
+                status_code=409,
+                detail=f"Another saved view named '{body.name}' already exists.",
+            )
+        updates.append("name = ?")
+        params.append(body.name)
+
+    if body.filter_json is not None:
+        updates.append("filter_json = ?")
+        params.append(body.filter_json)
+
+    if not updates:
+        raise HTTPException(status_code=400, detail="No fields to update")
+
+    updates.append("updated_at = datetime('now')")
+    params.append(view_id)
+
+    await db.execute(
+        f"UPDATE saved_views SET {', '.join(updates)} WHERE id = ?",
+        tuple(params),
+    )
+    return {"id": view_id, "updated": True}
+
+
+@saved_views_router.delete("/{view_id}")
+async def delete_saved_view(view_id: str) -> Dict[str, Any]:
+    """Delete a saved view by id. Idempotent — returns 200 even if not found."""
+    await ensure_saved_views_table()
+    db = await get_db()
+    await db.execute("DELETE FROM saved_views WHERE id = ?", (view_id,))
+    return {"id": view_id, "deleted": True}
diff --git a/frontend/src/components/SavedViewsPanel.tsx b/frontend/src/components/SavedViewsPanel.tsx
new file mode 100644
index 00000000..cff7dcbf
--- /dev/null
+++ b/frontend/src/components/SavedViewsPanel.tsx
@@ -0,0 +1,366 @@
+import React, { useRef, useState } from 'react'
+import { AnimatePresence, motion } from 'framer-motion'
+import { FilterPreset, SavedView, UseSavedViewsReturn } from '../hooks/useSavedViews'
+
+
+interface Props extends UseSavedViewsReturn {
+  currentPreset: FilterPreset
+  onApply: (preset: FilterPreset) => void
+}
+
+
+function formatRelative(iso: string): string {
+  try {
+    const diff = Date.now() - new Date(iso).getTime()
+    const minutes = Math.floor(diff / 60_000)
+    if (minutes < 1) return 'just now'
+    if (minutes < 60) return `${minutes}m ago`
+    const hours = Math.floor(minutes / 60)
+    if (hours < 24) return `${hours}h ago`
+    return `${Math.floor(hours / 24)}d ago`
+  } catch {
+    return ''
+  }
+}
+
+function presetSummary(p: FilterPreset): string {
+  const parts: string[] = []
+  if (p.severity !== 'all') parts.push(p.severity.toUpperCase())
+  if (p.target !== 'all') parts.push(p.target)
+  if (p.scanner !== 'all') parts.push(p.scanner)
+  if (p.sortMode !== 'severity') parts.push(`sort:${p.sortMode}`)
+  if (p.dateFrom) parts.push(`from:${p.dateFrom}`)
+  if (p.dateTo) parts.push(`to:${p.dateTo}`)
+  if (p.searchQuery) parts.push(`"${p.searchQuery}"`)
+  return parts.length ? parts.join(' · ') : 'All findings'
+}
+
+
+interface ViewRowProps {
+  view: SavedView
+  onApply: () => void
+  onRename: (name: string) => void
+  onDelete: () => void
+}
+
+function ViewRow({ view, onApply, onRename, onDelete }: ViewRowProps) {
+  const [editing, setEditing] = useState(false)
+  const [editName, setEditName] = useState(view.name)
+  const [confirmDelete, setConfirmDelete] = useState(false)
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  function commitRename() {
+    const trimmed = editName.trim()
+    if (trimmed && trimmed !== view.name) {
+      onRename(trimmed)
+    } else {
+      setEditName(view.name)
+    }
+    setEditing(false)
+  }
+
+  return (
+    <motion.div
+      layout
+      initial={{ opacity: 0, y: -6 }}
+      animate={{ opacity: 1, y: 0 }}
+      exit={{ opacity: 0, x: -20 }}
+      className="group border-b border-silver-bright/6 last:border-0"
+    >
+      <div className="flex items-start gap-3 px-4 py-3">
+        {/* Apply button + name */}
+        <button
+          type="button"
+          onClick={onApply}
+          title="Apply this preset"
+          className="min-w-0 flex-1 text-left"
+          aria-label={`Apply saved view: ${view.name}`}
+        >
+          {editing ? (
+            <input
+              ref={inputRef}
+              value={editName}
+              onChange={(e) => setEditName(e.target.value)}
+              onBlur={commitRename}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') commitRename()
+                if (e.key === 'Escape') {
+                  setEditName(view.name)
+                  setEditing(false)
+                }
+              }}
+              onClick={(e) => e.stopPropagation()}
+              autoFocus
+              maxLength={60}
+              className="w-full border-0 border-b-2 border-rag-blue bg-transparent text-[11px] font-black uppercase tracking-widest text-silver-bright outline-none"
+              aria-label="Rename saved view"
+            />
+          ) : (
+            <p className="truncate text-[11px] font-black uppercase tracking-[0.18em] text-silver-bright transition-colors group-hover:text-white">
+              {view.name}
+            </p>
+          )}
+          <p className="mt-1 truncate text-[9px] font-mono uppercase tracking-[0.12em] text-silver/35">
+            {presetSummary(view.preset)}
+          </p>
+          <p className="mt-0.5 text-[8px] font-mono text-silver/20">
+            {formatRelative(view.updatedAt)}
+          </p>
+        </button>
+
+        {/* Action icons — visible on hover */}
+        {!editing && (
+          <div className="flex shrink-0 items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100">
+            {/* Rename */}
+            <button
+              type="button"
+              aria-label="Rename view"
+              onClick={() => {
+                setEditing(true)
+                setTimeout(() => inputRef.current?.select(), 0)
+              }}
+              className="flex h-6 w-6 items-center justify-center text-silver/40 transition-colors hover:text-rag-blue"
+            >
+              <span className="material-symbols-outlined text-sm">edit</span>
+            </button>
+
+
+            {confirmDelete ? (
+              <button
+                type="button"
+                aria-label="Confirm delete"
+                onClick={() => {
+                  setConfirmDelete(false)
+                  onDelete()
+                }}
+                className="flex h-6 items-center gap-1 border border-rag-red/40 bg-rag-red/10 px-2 text-[9px] font-black uppercase tracking-widest text-rag-red transition-all hover:bg-rag-red hover:text-black"
+              >
+                Confirm
+              </button>
+            ) : (
+              <button
+                type="button"
+                aria-label="Delete view"
+                onClick={() => setConfirmDelete(true)}
+                className="flex h-6 w-6 items-center justify-center text-silver/40 transition-colors hover:text-rag-red"
+              >
+                <span className="material-symbols-outlined text-sm">delete</span>
+              </button>
+            )}
+          </div>
+        )}
+      </div>
+    </motion.div>
+  )
+}
+
+
+export default function SavedViewsPanel({
+  views,
+  loading,
+  saveView,
+  deleteView,
+  renameView,
+  currentPreset,
+  onApply,
+}: Props) {
+  const [open, setOpen] = useState(false)
+  const [saveName, setSaveName] = useState('')
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [successMsg, setSuccessMsg] = useState<string | null>(null)
+
+  async function handleSave() {
+    const trimmed = saveName.trim()
+    if (!trimmed) {
+      setError('Enter a name for this view')
+      return
+    }
+    setSaving(true)
+    setError(null)
+    try {
+      const saved = await saveView(trimmed, currentPreset)
+      const isOverwrite = views.some(
+        (v) => v.name.toLowerCase() === trimmed.toLowerCase(),
+      )
+      setSuccessMsg(
+        isOverwrite ? `Updated "${saved.name}"` : `Saved "${saved.name}"`,
+      )
+      setSaveName('')
+      setTimeout(() => setSuccessMsg(null), 2000)
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : 'Failed to save view')
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const panelVariants = {
+    hidden: { opacity: 0, y: -8, scaleY: 0.96 },
+    visible: { opacity: 1, y: 0, scaleY: 1, transition: { duration: 0.18, ease: 'easeOut' as const } },
+    exit: { opacity: 0, y: -6, scaleY: 0.97, transition: { duration: 0.12, ease: 'easeOut' as const } },
+  }
+
+  return (
+    <div className="relative shrink-0">
+
+      <button
+        type="button"
+        onClick={() => setOpen((o) => !o)}
+        aria-expanded={open}
+        aria-label="Saved filter views"
+        className={`flex items-center gap-2 border-2 px-4 py-2 text-[10px] font-black uppercase tracking-[0.2em] transition-all whitespace-nowrap ${
+          open
+            ? 'border-black bg-silver-bright text-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)]'
+            : 'border-silver-bright/10 bg-charcoal-dark text-silver/65 hover:border-silver-bright/30 hover:text-silver-bright'
+        }`}
+      >
+        <span className="material-symbols-outlined text-sm">bookmarks</span>
+        Saved_Views
+        {views.length > 0 && (
+          <span
+            className={`flex h-4 min-w-4 items-center justify-center px-1 text-[8px] font-black ${
+              open ? 'bg-black text-silver-bright' : 'bg-rag-blue text-black'
+            }`}
+          >
+            {views.length}
+          </span>
+        )}
+      </button>
+
+
+      <AnimatePresence>
+        {open && (
+          <motion.div
+            variants={panelVariants}
+            initial="hidden"
+            animate="visible"
+            exit="exit"
+            style={{ transformOrigin: 'top right' }}
+            className="absolute right-0 top-full z-[60] mt-2 w-[min(22rem,calc(100vw-2rem))] border-4 border-black bg-charcoal shadow-[10px_10px_0px_0px_rgba(0,0,0,1)]"
+            role="dialog"
+            aria-label="Saved filter views panel"
+          >
+            {/* Header */}
+            <div className="flex items-center justify-between border-b-2 border-black px-4 py-3">
+              <p className="text-[10px] font-black uppercase tracking-[0.3em] text-silver-bright">
+                Filter_Presets
+              </p>
+              <button
+                type="button"
+                aria-label="Close panel"
+                onClick={() => setOpen(false)}
+                className="text-silver/40 transition-colors hover:text-silver-bright"
+              >
+                <span className="material-symbols-outlined text-base">close</span>
+              </button>
+            </div>
+
+            <div className="border-b border-silver-bright/10 px-4 py-4 space-y-3">
+              <p className="text-[9px] font-black uppercase tracking-[0.25em] text-silver/40">
+                Save Current Filters
+              </p>
+              <div className="flex gap-2">
+                <input
+                  type="text"
+                  value={saveName}
+                  onChange={(e) => {
+                    setSaveName(e.target.value)
+                    setError(null)
+                  }}
+                  onKeyDown={(e) => e.key === 'Enter' && handleSave()}
+                  placeholder="Name this view…"
+                  maxLength={60}
+                  aria-label="Saved view name"
+                  className="flex-1 border-2 border-silver-bright/10 bg-charcoal-dark px-3 py-2 text-[10px] font-mono text-silver-bright placeholder:text-silver/25 focus:border-rag-blue focus:outline-none"
+                />
+                <button
+                  type="button"
+                  onClick={handleSave}
+                  disabled={saving}
+                  aria-label="Save current filters"
+                  className="border-2 border-rag-blue bg-rag-blue px-3 py-2 text-[10px] font-black uppercase tracking-widest text-black shadow-[3px_3px_0px_0px_rgba(0,0,0,1)] transition-all hover:shadow-none hover:translate-x-px hover:translate-y-px disabled:opacity-50 disabled:cursor-not-allowed"
+                >
+                  {saving ? (
+                    <span className="material-symbols-outlined text-sm animate-spin">
+                      progress_activity
+                    </span>
+                  ) : (
+                    <span className="material-symbols-outlined text-sm">save</span>
+                  )}
+                </button>
+              </div>
+
+              <AnimatePresence mode="wait">
+                {error && (
+                  <motion.p
+                    key="error"
+                    initial={{ opacity: 0, y: -4 }}
+                    animate={{ opacity: 1, y: 0 }}
+                    exit={{ opacity: 0 }}
+                    role="alert"
+                    className="text-[9px] font-mono uppercase tracking-widest text-rag-red"
+                  >
+                    ⚠ {error}
+                  </motion.p>
+                )}
+                {successMsg && (
+                  <motion.p
+                    key="success"
+                    initial={{ opacity: 0, y: -4 }}
+                    animate={{ opacity: 1, y: 0 }}
+                    exit={{ opacity: 0 }}
+                    role="status"
+                    className="text-[9px] font-mono uppercase tracking-widest text-rag-green"
+                  >
+                    ✓ {successMsg}
+                  </motion.p>
+                )}
+              </AnimatePresence>
+            </div>
+
+            <div className="max-h-72 overflow-y-auto">
+              {loading ? (
+                <p className="px-4 py-6 text-center text-[9px] font-mono uppercase tracking-widest text-silver/30">
+                  Loading presets…
+                </p>
+              ) : views.length === 0 ? (
+                <div className="px-4 py-8 text-center">
+                  <p className="text-[10px] font-black uppercase tracking-[0.2em] text-silver/20 italic">
+                    No Saved Views
+                  </p>
+                  <p className="mt-1 text-[8px] font-mono uppercase tracking-widest text-silver/15">
+                    Configure filters then save above.
+                  </p>
+                </div>
+              ) : (
+                <AnimatePresence initial={false}>
+                  {views.map((view) => (
+                    <ViewRow
+                      key={view.id}
+                      view={view}
+                      onApply={() => {
+                        onApply(view.preset)
+                        setOpen(false)
+                      }}
+                      onRename={(name) => renameView(view.id, name)}
+                      onDelete={() => deleteView(view.id)}
+                    />
+                  ))}
+                </AnimatePresence>
+              )}
+            </div>
+
+            {views.length > 0 && (
+              <div className="border-t border-silver-bright/6 px-4 py-2">
+                <p className="text-[8px] font-mono uppercase tracking-widest text-silver/20">
+                  Click a preset to apply · Hover to rename or delete
+                </p>
+              </div>
+            )}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  )
+}
diff --git a/frontend/src/hooks/useSavedViews.ts b/frontend/src/hooks/useSavedViews.ts
new file mode 100644
index 00000000..7cd2a993
--- /dev/null
+++ b/frontend/src/hooks/useSavedViews.ts
@@ -0,0 +1,279 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { API_BASE } from '../api'
+
+export interface FilterPreset {
+  severity: string
+  target: string
+  scanner: string
+  sortMode: string
+  dateFrom: string
+  dateTo: string
+  searchQuery: string
+}
+
+export interface SavedView {
+  id: string
+  name: string
+  preset: FilterPreset
+  createdAt: string   // ISO string
+  updatedAt: string   // ISO string
+}
+
+// Pydantic-shaped payload the backend expects.
+interface BackendPayload {
+  name: string
+  filter_json: string
+}
+
+interface BackendRow {
+  id: string
+  name: string
+  filter_json: string
+  created_at: string
+  updated_at: string
+}
+
+const VALID_SORT_MODES = ['severity', 'newest', 'oldest', 'target'] as const
+const VALID_SEVERITIES = ['all', 'critical', 'high', 'medium', 'low', 'info'] as const
+
+/** Returns true when obj looks like a real FilterPreset (not garbage data). */
+export function isValidPreset(obj: unknown): obj is FilterPreset {
+  if (!obj || typeof obj !== 'object') return false
+  const p = obj as Record<string, unknown>
+  if (typeof p.severity !== 'string') return false
+  if (typeof p.target !== 'string') return false
+  if (typeof p.scanner !== 'string') return false
+  if (typeof p.sortMode !== 'string') return false
+  if (typeof p.dateFrom !== 'string') return false
+  if (typeof p.dateTo !== 'string') return false
+  if (typeof p.searchQuery !== 'string') return false
+  if (!(VALID_SORT_MODES as readonly string[]).includes(p.sortMode)) return false
+  if (!(VALID_SEVERITIES as readonly string[]).includes(p.severity)) return false
+  return true
+}
+
+export function isValidSavedView(obj: unknown): obj is SavedView {
+  if (!obj || typeof obj !== 'object') return false
+  const v = obj as Record<string, unknown>
+  if (typeof v.id !== 'string' || !v.id) return false
+  if (typeof v.name !== 'string' || !v.name) return false
+  if (typeof v.createdAt !== 'string') return false
+  if (typeof v.updatedAt !== 'string') return false
+  return isValidPreset(v.preset)
+}
+
+
+const LS_KEY = 'secuscan-saved-views'
+
+function readFromStorage(): SavedView[] {
+  try {
+    const raw = localStorage.getItem(LS_KEY)
+    if (!raw) return []
+    const parsed: unknown = JSON.parse(raw)
+    if (!Array.isArray(parsed)) return []
+    return parsed.filter(isValidSavedView)
+  } catch {
+    return []
+  }
+}
+
+function writeToStorage(views: SavedView[]): void {
+  try {
+    localStorage.setItem(LS_KEY, JSON.stringify(views))
+  } catch {
+    // Storage quota exceeded — silently ignore.
+  }
+}
+
+
+function rowToView(row: BackendRow): SavedView | null {
+  try {
+    const preset: unknown = JSON.parse(row.filter_json)
+    if (!isValidPreset(preset)) return null
+    return {
+      id: row.id,
+      name: row.name,
+      preset,
+      createdAt: row.created_at,
+      updatedAt: row.updated_at,
+    }
+  } catch {
+    return null
+  }
+}
+
+async function apiFetch<T>(
+  path: string,
+  init?: RequestInit,
+): Promise<T | null> {
+  try {
+    const res = await fetch(`${API_BASE}${path}`, {
+      ...init,
+      signal: AbortSignal.timeout(8000),
+    })
+    if (!res.ok) return null
+    return (await res.json()) as T
+  } catch {
+    return null
+  }
+}
+
+
+export interface UseSavedViewsReturn {
+  views: SavedView[]
+  loading: boolean
+  /** Save a new preset or overwrite an existing one (matched by name). */
+  saveView: (name: string, preset: FilterPreset) => Promise<SavedView>
+  /** Delete by id. */
+  deleteView: (id: string) => Promise<void>
+  /** Rename an existing view. */
+  renameView: (id: string, newName: string) => Promise<void>
+}
+
+export function useSavedViews(): UseSavedViewsReturn {
+  const [views, setViews] = useState<SavedView[]>([])
+  const [loading, setLoading] = useState(true)
+  // Track whether we managed to hydrate from the backend at least once.
+  const backendAvailable = useRef(false)
+
+  // ── Mount: prefer backend, fall back to localStorage ──────────────────────
+  useEffect(() => {
+    let cancelled = false
+
+    async function hydrate() {
+      // Try backend first
+      const data = await apiFetch<{ views: BackendRow[] }>('/api/v1/saved-views')
+      if (!cancelled) {
+        if (data && Array.isArray(data.views)) {
+          const parsed = data.views.map(rowToView).filter(Boolean) as SavedView[]
+          backendAvailable.current = true
+          setViews(parsed)
+          writeToStorage(parsed) // keep local in sync
+        } else {
+          // Backend unreachable — use localStorage
+          setViews(readFromStorage())
+        }
+        setLoading(false)
+      }
+    }
+
+    hydrate()
+    return () => { cancelled = true }
+  }, [])
+
+
+  const syncSet = useCallback((next: SavedView[]) => {
+    setViews(next)
+    writeToStorage(next)
+  }, [])
+
+  const saveView = useCallback(
+    async (name: string, preset: FilterPreset): Promise<SavedView> => {
+      const trimmed = name.trim()
+      if (!trimmed) throw new Error('View name cannot be empty')
+      if (!isValidPreset(preset)) throw new Error('Invalid filter preset')
+
+      // Check whether we're overwriting an existing name
+      const existing = views.find(
+        (v) => v.name.toLowerCase() === trimmed.toLowerCase(),
+      )
+
+      const now = new Date().toISOString()
+
+      if (existing) {
+        const updated: SavedView = { ...existing, preset, updatedAt: now }
+        const next = views.map((v) => (v.id === existing.id ? updated : v))
+        syncSet(next)
+
+        // Backend sync (optimistic, fire-and-forget)
+        if (backendAvailable.current) {
+          const payload: BackendPayload = {
+            name: trimmed,
+            filter_json: JSON.stringify(preset),
+          }
+          apiFetch(`/api/v1/saved-views/${existing.id}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload),
+          })
+        }
+        return updated
+      }
+
+      const tempId = `local-${Date.now()}-${Math.random().toString(36).slice(2)}`
+      const created: SavedView = {
+        id: tempId,
+        name: trimmed,
+        preset,
+        createdAt: now,
+        updatedAt: now,
+      }
+
+      const next = [...views, created]
+      syncSet(next)
+
+      if (backendAvailable.current) {
+        const payload: BackendPayload = {
+          name: trimmed,
+          filter_json: JSON.stringify(preset),
+        }
+        const result = await apiFetch<{ id: string }>('/api/v1/saved-views', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(payload),
+        })
+        if (result?.id) {
+          const withRealId: SavedView = { ...created, id: result.id }
+          const finalNext = next.map((v) => (v.id === tempId ? withRealId : v))
+          syncSet(finalNext)
+          return withRealId
+        }
+      }
+
+      return created
+    },
+    [views, syncSet],
+  )
+
+  const deleteView = useCallback(
+    async (id: string): Promise<void> => {
+      syncSet(views.filter((v) => v.id !== id))
+
+      if (backendAvailable.current && !id.startsWith('local-')) {
+        apiFetch(`/api/v1/saved-views/${id}`, { method: 'DELETE' })
+      }
+    },
+    [views, syncSet],
+  )
+
+  const renameView = useCallback(
+    async (id: string, newName: string): Promise<void> => {
+      const trimmed = newName.trim()
+      if (!trimmed) throw new Error('Name cannot be empty')
+
+      const now = new Date().toISOString()
+      const next = views.map((v) =>
+        v.id === id ? { ...v, name: trimmed, updatedAt: now } : v,
+      )
+      syncSet(next)
+
+      if (backendAvailable.current && !id.startsWith('local-')) {
+        const target = views.find((v) => v.id === id)
+        if (target) {
+          const payload: BackendPayload = {
+            name: trimmed,
+            filter_json: JSON.stringify(target.preset),
+          }
+          apiFetch(`/api/v1/saved-views/${id}`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload),
+          })
+        }
+      }
+    },
+    [views, syncSet],
+  )
+
+  return { views, loading, saveView, deleteView, renameView }
+}
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 42e846b4..52871bf7 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -211,6 +211,17 @@ textarea:disabled {
   cursor: not-allowed;
 }
 
+input[type='date'] {
+  appearance: none;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+}
+
+input[type='date']::-webkit-calendar-picker-indicator {
+  opacity: 0;
+  cursor: pointer;
+}
+
 label {
   display: block;
   font-size: var(--text-sm);
diff --git a/frontend/src/pages/Findings.tsx b/frontend/src/pages/Findings.tsx
index cfc78824..96823254 100644
--- a/frontend/src/pages/Findings.tsx
+++ b/frontend/src/pages/Findings.tsx
@@ -2,6 +2,9 @@ import React, { useEffect, useMemo, useState } from 'react'
 import { motion } from 'framer-motion'
 import { getFindings } from '../api'
 import { formatLocaleDate, parseDateSafe, getCurrentTimeZone } from '../utils/date'
+import SavedViewsPanel from '../components/SavedViewsPanel'
+import { useSavedViews, FilterPreset } from '../hooks/useSavedViews'
+
 type Finding = {
   id: string
   severity: string
@@ -104,6 +107,31 @@ export default function Findings() {
   const [reviewState, setReviewState] = useState<ReviewState>({})
   const [copiedFindingId, setCopiedFindingId] = useState<string | null>(null)
 
+  // ── Saved views hook ───────────────────────────────────────────────────────
+  const { views, loading: viewsLoading, saveView, deleteView, renameView } = useSavedViews()
+
+  /** Apply a saved preset to all filter controls. */
+  function applyPreset(preset: FilterPreset) {
+    setFilterSeverity(preset.severity)
+    setFilterTarget(preset.target)
+    setFilterScanner(preset.scanner)
+    setSortMode(preset.sortMode as SortMode)
+    setDateFrom(preset.dateFrom)
+    setDateTo(preset.dateTo)
+    setSearchQuery(preset.searchQuery)
+  }
+
+  /** Snapshot the current filter controls as a FilterPreset. */
+  const currentPreset: FilterPreset = {
+    severity: filterSeverity,
+    target: filterTarget,
+    scanner: filterScanner,
+    sortMode,
+    dateFrom,
+    dateTo,
+    searchQuery,
+  }
+
   useEffect(() => {
     setLoading(true)
     getFindings()
@@ -381,254 +409,262 @@ export default function Findings() {
   }
 
   return (
-    <div className="min-h-screen bg-charcoal-dark text-silver px-4 py-6 md:px-8 md:py-10">
-      <div className="mx-auto flex w-full max-w-[1600px] flex-col gap-8">
-        <header className="border-b-4 border-silver-bright/10 pb-8">
-          <div className="mb-4 inline-block bg-rag-red px-4 py-1 text-xs font-black uppercase tracking-widest text-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)]">
-            Triage Workspace v5.1
-          </div>
-          <div className="flex flex-col gap-5 xl:flex-row xl:items-end xl:justify-between">
-            <div className="space-y-3">
-              <h1 className="text-5xl font-black uppercase tracking-tighter text-silver-bright italic md:text-7xl">
-                Findings <span className="text-transparent" style={{ WebkitTextStroke: '1px var(--accent-silver-bright)' }}>Desk</span>
+    <div className="min-h-screen bg-charcoal-dark text-silver">
+      <div className="mx-auto flex w-full max-w-[1600px] flex-col">
+
+        {/* ── Page Header ──────────────────────────────────────────────────── */}
+        <header className="border-b border-silver-bright/8 px-6 py-6 md:px-10 md:py-8">
+          <div className="flex flex-col gap-4 xl:flex-row xl:items-center xl:justify-between">
+            {/* Left: eyebrow + title + stats */}
+            <div>
+              <p className="mb-1 text-[10px] font-black uppercase tracking-[0.3em] text-silver/35">
+                SecuScan · Triage Interface
+              </p>
+              <h1 className="text-5xl font-black uppercase italic tracking-tighter text-silver-bright md:text-6xl">
+                Findings
               </h1>
-              <p className="text-xs font-mono uppercase tracking-[0.24em] text-silver/45">
-                Active triage feed // {triageMetrics.total} total signals // {triageMetrics.unresolved} awaiting analyst action
+              <p className="mt-2 text-[11px] font-mono uppercase tracking-[0.22em] text-silver/40">
+                {triageMetrics.total} Total
+                {' · '}
+                <span className="text-rag-red">{triageMetrics.active} Urgent</span>
+                {' · '}
+                {triageMetrics.unresolved} Triaging
               </p>
             </div>
 
-            <div className="grid w-full gap-3 sm:grid-cols-2 xl:w-auto xl:grid-cols-4">
-              {[
-                { label: 'Visible', value: triageMetrics.visible, tone: 'text-silver-bright' },
-                { label: 'Critical + High', value: triageMetrics.active, tone: 'text-rag-red' },
-                { label: 'Unresolved', value: triageMetrics.unresolved, tone: 'text-rag-amber' },
-                { label: 'Reviewed', value: enrichedFindings.filter((finding) => finding.status === 'reviewed').length, tone: 'text-rag-green' },
-              ].map((metric) => (
-                <div
-                  key={metric.label}
-                  className="border-2 border-black bg-charcoal px-4 py-4 shadow-[6px_6px_0px_0px_rgba(0,0,0,1)]"
+            {/* Right: severity quick-filter pills */}
+            <div className="flex flex-wrap items-center gap-1">
+              <button
+                type="button"
+                onClick={() => setFilterSeverity('all')}
+                className={`border px-4 py-1.5 text-[10px] font-black uppercase tracking-[0.18em] transition-all ${
+                  filterSeverity === 'all'
+                    ? 'border-silver-bright bg-silver-bright text-black'
+                    : 'border-silver-bright/15 bg-transparent text-silver/50 hover:border-silver-bright/40 hover:text-silver-bright'
+                }`}
+              >
+                All
+              </button>
+              {severityOrder.map((severity) => (
+                <button
+                  key={severity}
+                  type="button"
+                  onClick={() => setFilterSeverity((cur) => cur === severity ? 'all' : severity)}
+                  className={`border px-4 py-1.5 text-[10px] font-black uppercase tracking-[0.18em] transition-all ${
+                    filterSeverity === severity
+                      ? `${severityConfig[severity].chip} border-black`
+                      : 'border-silver-bright/15 bg-transparent text-silver/50 hover:border-silver-bright/40 hover:text-silver-bright'
+                  }`}
                 >
-                  <p className="mb-2 text-[10px] font-black uppercase tracking-[0.25em] text-silver/55">{metric.label}</p>
-                  <p className={`text-3xl font-black italic tracking-tight ${metric.tone}`}>{String(metric.value).padStart(2, '0')}</p>
-                </div>
+                  {severityConfig[severity].label}
+                </button>
               ))}
             </div>
           </div>
         </header>
 
-        <section className="border-2 border-black bg-charcoal/95 p-4 shadow-[8px_8px_0px_0px_rgba(0,0,0,1)] backdrop-blur lg:sticky lg:top-4 lg:z-20">
-          <div className="grid gap-4">
-            <div className="grid gap-4 2xl:grid-cols-[minmax(320px,1fr)_auto] 2xl:items-end">
-             <div className="space-y-2">
-  <label className={filterLabelClass}>Search</label>
-
-  <div className="relative">
-    <input
-      type="text"
-      value={searchQuery}
-      onChange={(event) => setSearchQuery(event.target.value)}
-      placeholder="Title, target, CVE, remediation..."
-      className={`${filterControlClass} px-4 pr-12 placeholder:text-silver/20`}
-    />
-
-    {searchQuery.trim() && (
-      <button
-        type="button"
-        aria-label="Clear search"
-        onClick={() => setSearchQuery('')}
-        className="
-          absolute right-3 top-1/2
-          -translate-y-1/2
-          text-silver/50
-          hover:text-silver-bright
-          transition
-        "
-      >
-        ✕
-      </button>
-    )}
-  </div>
-</div>
-
-              <div className="flex flex-wrap gap-2 pb-2 sm:pb-0 2xl:max-w-[760px] 2xl:justify-end">
-                <button
-                  type="button"
-                  onClick={() => setFilterSeverity('all')}
-                  className={`min-h-10 border px-3 py-2 text-[10px] font-black uppercase tracking-[0.16em] transition-all ${filterPillClasses(filterSeverity === 'all')}`}
-                >
-                  All
-                </button>
-                {severityOrder.map((severity) => (
-                  <button
-                    key={severity}
-                    type="button"
-                    onClick={() => setFilterSeverity((current) => (current === severity ? 'all' : severity))}
-                    className={`min-h-10 border px-3 py-2 text-[10px] font-black uppercase tracking-[0.18em] transition-all ${
-                      filterSeverity === severity
-                        ? `${severityConfig[severity].chip} border-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)]`
-                        : 'border-silver-bright/10 bg-charcoal-dark text-silver/65 hover:border-silver-bright/30'
-                    }`}
-                  >
-                    {severityConfig[severity].label} {countsBySeverity[severity] || 0}
-                  </button>
-                ))}
+        <div className="flex flex-col gap-0 px-6 py-6 md:px-10 md:py-8 xl:flex-row xl:gap-6 xl:items-start">
+
+          {/* ── Left column: filter + findings list ─────────────────────── */}
+          <div className="flex min-w-0 flex-1 flex-col gap-4">
+
+            {/* Filter panel */}
+            <section className="border border-silver-bright/8 bg-charcoal/80 p-5 backdrop-blur lg:sticky lg:top-4 lg:z-20">
+
+              {/* Search */}
+              <div className="mb-4">
+                <label className="mb-1.5 block text-[9px] font-black uppercase tracking-[0.25em] text-silver/40">
+                  Search Scope
+                </label>
+                <input
+                  type="text"
+                  value={searchQuery}
+                  onChange={(e) => setSearchQuery(e.target.value)}
+                  placeholder="Query via titles, target endpoints, CVE IDs..."
+                  className="h-10 w-full border border-silver-bright/10 bg-charcoal-dark px-3 text-xs font-mono text-silver-bright placeholder:text-silver/20 focus:border-silver-bright/30 focus:outline-none"
+                />
               </div>
-            </div>
 
-            <div className="grid gap-4 xl:grid-cols-[minmax(0,1fr)_auto] xl:items-end">
-              <div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-5">
-                <div className="space-y-2">
-                  <label className={filterLabelClass}>Target</label>
+              {/* Dropdowns + date row */}
+              <div className="grid grid-cols-2 gap-3 xl:grid-cols-4">
+                {/* Target Host */}
+                <div>
+                  <label className="mb-1.5 block text-[9px] font-black uppercase tracking-[0.22em] text-silver/40">
+                    Target Host
+                  </label>
                   <select
                     value={filterTarget}
                     onChange={(e) => setFilterTarget(e.target.value)}
-                    className={filterControlClass}
+                    className="h-10 w-full border border-silver-bright/10 bg-charcoal-dark px-3 text-xs font-mono text-silver-bright focus:border-silver-bright/30 focus:outline-none"
                   >
-                    <option value="all">All Targets</option>
+                    <option value="all">All targets</option>
                     {uniqueTargets.map((t) => (
                       <option key={t} value={t}>{t}</option>
                     ))}
                   </select>
                 </div>
 
-                <div className="space-y-2">
-                  <label className={filterLabelClass}>Scanner / Tool</label>
+                {/* Engine / Scanner */}
+                <div>
+                  <label className="mb-1.5 block text-[9px] font-black uppercase tracking-[0.22em] text-silver/40">
+                    Engine/Scanner
+                  </label>
                   <select
                     value={filterScanner}
                     onChange={(e) => setFilterScanner(e.target.value)}
-                    className={filterControlClass}
+                    className="h-10 w-full border border-silver-bright/10 bg-charcoal-dark px-3 text-xs font-mono text-silver-bright focus:border-silver-bright/30 focus:outline-none"
                   >
-                    <option value="all">All Scanners</option>
+                    <option value="all">All scanners</option>
                     {uniqueScanners.map((s) => (
                       <option key={s} value={s}>{s}</option>
                     ))}
                   </select>
                 </div>
 
-                <div className="space-y-2">
-                  <label className={filterLabelClass}>Sort By</label>
-                  <select
-                    value={sortMode}
-                    onChange={(e) => setSortMode(e.target.value as SortMode)}
-                    className={filterControlClass}
-                  >
-                    <option value="severity">Severity (High → Low)</option>
-                    <option value="newest">Newest First</option>
-                    <option value="oldest">Oldest First</option>
-                    <option value="target">Target (A → Z)</option>
-                  </select>
-                </div>
-
-                <div className="space-y-2">
-                  <label className={filterLabelClass}>From Date</label>
-                  <input
-                    type="date"
-                    value={dateFrom}
-                    onChange={(e) => setDateFrom(e.target.value)}
-                    className={`${filterControlClass} [color-scheme:dark]`}
-                  />
+                {/* Discovered From */}
+                <div>
+                  <label className="mb-1.5 block text-[9px] font-black uppercase tracking-[0.22em] text-silver/40">
+                    Discovered From
+                  </label>
+                  <div className="relative flex h-10">
+                    <input
+                      id="date-from-input"
+                      type="date"
+                      value={dateFrom}
+                      onChange={(e) => setDateFrom(e.target.value)}
+                      className="h-10 w-full border border-silver-bright/10 bg-charcoal-dark px-3 text-xs font-mono text-silver-bright [color-scheme:dark] focus:border-silver-bright/30 focus:outline-none [&::-webkit-calendar-picker-indicator]:opacity-0 [&::-webkit-calendar-picker-indicator]:absolute [&::-webkit-calendar-picker-indicator]:inset-0 [&::-webkit-calendar-picker-indicator]:w-full [&::-webkit-calendar-picker-indicator]:cursor-pointer"
+                    />
+                    <button
+                      type="button"
+                      aria-label="Open date picker for Discovered From"
+                      onClick={() => (document.getElementById('date-from-input') as HTMLInputElement)?.showPicker?.()}
+                      className="absolute right-0 top-0 flex h-10 w-10 items-center justify-center border-l border-silver-bright/10 bg-charcoal-dark text-silver/40 transition-colors hover:bg-silver-bright/5 hover:text-silver-bright"
+                    >
+                      <span className="material-symbols-outlined text-[16px]">calendar_month</span>
+                    </button>
+                  </div>
                 </div>
 
-                <div className="space-y-2">
-                  <label className={filterLabelClass}>To Date</label>
-                  <input
-                    type="date"
-                    value={dateTo}
-                    onChange={(e) => setDateTo(e.target.value)}
-                    className={`${filterControlClass} [color-scheme:dark]`}
-                  />
+                {/* Discovered To */}
+                <div>
+                  <label className="mb-1.5 block text-[9px] font-black uppercase tracking-[0.22em] text-silver/40">
+                    Discovered To
+                  </label>
+                  <div className="relative flex h-10">
+                    <input
+                      id="date-to-input"
+                      type="date"
+                      value={dateTo}
+                      onChange={(e) => setDateTo(e.target.value)}
+                      className="h-10 w-full border border-silver-bright/10 bg-charcoal-dark px-3 text-xs font-mono text-silver-bright [color-scheme:dark] focus:border-silver-bright/30 focus:outline-none [&::-webkit-calendar-picker-indicator]:opacity-0 [&::-webkit-calendar-picker-indicator]:absolute [&::-webkit-calendar-picker-indicator]:inset-0 [&::-webkit-calendar-picker-indicator]:w-full [&::-webkit-calendar-picker-indicator]:cursor-pointer"
+                    />
+                    <button
+                      type="button"
+                      aria-label="Open date picker for Discovered To"
+                      onClick={() => (document.getElementById('date-to-input') as HTMLInputElement)?.showPicker?.()}
+                      className="absolute right-0 top-0 flex h-10 w-10 items-center justify-center border-l border-silver-bright/10 bg-charcoal-dark text-silver/40 transition-colors hover:bg-silver-bright/5 hover:text-silver-bright"
+                    >
+                      <span className="material-symbols-outlined text-[16px]">calendar_month</span>
+                    </button>
+                  </div>
                 </div>
               </div>
 
-              <button
-                type="button"
-                onClick={resetAllFilters}
-                className="h-11 w-full border border-silver-bright/20 bg-charcoal-dark px-4 text-[10px] font-black uppercase tracking-[0.18em] text-silver/65 transition-all hover:border-rag-red hover:text-silver-bright xl:w-auto xl:min-w-[180px]"
-              >
-                Reset Filters
-              </button>
-            </div>
-          </div>
-        </section>
-
-        {/* ── Active filter summary strip ────────────────────────────────────────
-            Hidden when all filters are at their default values.    */}
-        {activeFilters.length > 0 && (
-          <div
-            aria-label="active filters"
-            className="flex flex-wrap items-center gap-2 border border-silver-bright/10 bg-charcoal/60 px-4 py-3"
-          >
-            <span className="mr-1 text-[10px] font-black uppercase tracking-[0.2em] text-silver/40">
-              Active Filters
-            </span>
-            {activeFilters.map(({ key, label }) => (
-              <span
-                key={key}
-                className="border border-rag-red/30 bg-rag-red/10 px-2 py-1 text-[9px] font-mono uppercase tracking-[0.15em] text-rag-red"
-              >
-                {label}
-              </span>
-            ))}
-          </div>
-        )}
+              {/* Sort tabs + Saved Views */}
+              <div className="mt-4 flex items-center justify-between gap-2 flex-wrap">
+                {/* Segmented sort tabs */}
+                <div className="flex items-center gap-0">
+                  {(
+                    [
+                      { value: 'severity', label: 'By Severity' },
+                      { value: 'newest',   label: 'Newest' },
+                      { value: 'oldest',   label: 'Oldest' },
+                      { value: 'target',   label: 'Target Alpha' },
+                    ] as { value: SortMode; label: string }[]
+                  ).map(({ value, label }) => (
+                    <button
+                      key={value}
+                      type="button"
+                      onClick={() => setSortMode(value)}
+                      className={`border px-4 py-2 text-[10px] font-black uppercase tracking-[0.16em] transition-all -ml-px first:ml-0 ${
+                        sortMode === value
+                          ? 'relative z-10 border-silver-bright bg-silver-bright text-black shadow-[3px_3px_0px_0px_rgba(0,0,0,1)]'
+                          : 'border-silver-bright/15 bg-transparent text-silver/50 hover:text-silver-bright hover:border-silver-bright/30'
+                      }`}
+                    >
+                      {label}
+                    </button>
+                  ))}
+                </div>
 
-        <div className="grid gap-8 xl:grid-cols-[minmax(0,1.2fr)_420px]">
-          <motion.section variants={sectionVariants} initial="hidden" animate="visible" className="space-y-5">
-            {loading ? (
-              <div className="border-4 border-dashed border-silver-bright/10 bg-charcoal/40 px-6 py-16 text-center">
-                <p className="text-sm font-mono uppercase tracking-[0.25em] text-silver/50">Synchronizing findings feed...</p>
-              </div>
-            ) : filteredFindings.length === 0 ? (
-              <div className="border-4 border-dashed border-silver-bright/10 bg-charcoal/40 px-6 py-20 text-center">
-                <p className="text-2xl font-black uppercase tracking-[0.25em] text-silver/25 italic">No Findings Match</p>
-                <p className="mt-3 text-xs font-mono uppercase tracking-[0.2em] text-silver/15">Adjust filters to reopen the queue.</p>
+                {/* Saved Views button (uses the panel component) */}
+                <SavedViewsPanel
+                  views={views}
+                  loading={viewsLoading}
+                  saveView={saveView}
+                  deleteView={deleteView}
+                  renameView={renameView}
+                  currentPreset={currentPreset}
+                  onApply={applyPreset}
+                />
               </div>
-            ) : sortMode === 'severity' ? (
-              groupedFindings.map(({ severity, items }) => {
-                if (items.length === 0) return null
-
-                const config = severityConfig[severity]
-
-                return (
-                  <div key={severity} className="border-2 border-black bg-charcoal shadow-[8px_8px_0px_0px_rgba(0,0,0,1)]">
-                    <div className="flex w-full items-center justify-between border-b border-silver-bright/8 px-5 py-4 text-left">
-                      <div className="flex items-center gap-4">
-                        <span className={`h-3 w-3 rotate-45 ${config.rail}`} />
-                        <div>
-                          <p className={`text-lg font-black uppercase tracking-[0.18em] ${config.accent}`}>{config.label}</p>
-                          <p className="text-[10px] font-mono uppercase tracking-[0.2em] text-silver/40">{items.length} visible in queue</p>
-                        </div>
-                      </div>
-                    </div>
+            </section>
 
-                    <div className="divide-y divide-silver-bright/6">
-                      {items.map((finding) => renderFindingRow(finding))}
+            {/* Findings list */}
+            <motion.section variants={sectionVariants} initial="hidden" animate="visible" className="space-y-3">
+              {loading ? (
+                <div className="border border-dashed border-silver-bright/10 bg-charcoal/40 px-6 py-16 text-center">
+                  <p className="text-sm font-mono uppercase tracking-[0.25em] text-silver/50">Synchronizing findings feed...</p>
+                </div>
+              ) : filteredFindings.length === 0 ? (
+                <div className="border border-dashed border-silver-bright/10 bg-charcoal/40 px-6 py-20 text-center">
+                  <p className="text-2xl font-black uppercase italic tracking-[0.25em] text-silver/20">Queue Cleared</p>
+                  <p className="mt-3 text-xs font-mono uppercase tracking-[0.2em] text-silver/15">
+                    No items match your active profile matrices.
+                  </p>
+                </div>
+              ) : sortMode === 'severity' ? (
+                groupedFindings.map(({ severity, items }) => {
+                  if (items.length === 0) return null
+                  const config = severityConfig[severity]
+                  return (
+                    <div key={severity} className="border border-silver-bright/8 bg-charcoal">
+                      <div className="flex items-center gap-3 border-b border-silver-bright/8 px-5 py-3">
+                        <span className={`h-2.5 w-2.5 rotate-45 ${config.rail}`} />
+                        <p className={`text-[11px] font-black uppercase tracking-[0.2em] ${config.accent}`}>{config.label}</p>
+                        <p className="text-[9px] font-mono uppercase tracking-[0.15em] text-silver/30">{items.length} in queue</p>
+                      </div>
+                      <div className="divide-y divide-silver-bright/6">
+                        {items.map((finding) => renderFindingRow(finding))}
+                      </div>
                     </div>
+                  )
+                })
+              ) : (
+                <div className="border border-silver-bright/8 bg-charcoal">
+                  <div className="flex items-center gap-3 border-b border-silver-bright/8 px-5 py-3">
+                    <span className="h-2.5 w-2.5 rotate-45 bg-silver-bright" />
+                    <p className="text-[11px] font-black uppercase tracking-[0.2em] text-silver-bright">
+                      {sortMode === 'newest' ? 'Newest First' : sortMode === 'oldest' ? 'Oldest First' : 'By Target'}
+                    </p>
+                    <p className="text-[9px] font-mono uppercase tracking-[0.15em] text-silver/30">{sortedFindings.length} in queue</p>
                   </div>
-                )
-              })
-            ) : (
-              <div className="border-2 border-black bg-charcoal shadow-[8px_8px_0px_0px_rgba(0,0,0,1)]">
-                <div className="flex w-full items-center justify-between border-b border-silver-bright/8 px-5 py-4 text-left">
-                  <div className="flex items-center gap-4">
-                    <span className="h-3 w-3 rotate-45 bg-silver-bright" />
-                    <div>
-                      <p className="text-lg font-black uppercase tracking-[0.18em] text-silver-bright">
-                        {sortMode === 'newest' ? 'Newest First' : sortMode === 'oldest' ? 'Oldest First' : 'By Target'}
-                      </p>
-                      <p className="text-[10px] font-mono uppercase tracking-[0.2em] text-silver/40">{sortedFindings.length} visible in queue</p>
-                    </div>
+                  <div className="divide-y divide-silver-bright/6">
+                    {sortedFindings.map((finding) => renderFindingRow(finding))}
                   </div>
                 </div>
-                <div className="divide-y divide-silver-bright/6">
-                  {sortedFindings.map((finding) => renderFindingRow(finding))}
-                </div>
-              </div>
-            )}
-          </motion.section>
+              )}
+            </motion.section>
+          </div>
 
-          <motion.aside variants={sectionVariants} initial="hidden" animate="visible" className="xl:sticky xl:top-32 xl:self-start">
-            <div className="border-4 border-black bg-charcoal shadow-[10px_10px_0px_0px_rgba(0,0,0,1)]">
+          {/* ── Right column: detail panel ──────────────────────────────── */}
+          <motion.aside
+            variants={sectionVariants}
+            initial="hidden"
+            animate="visible"
+            className="w-full xl:sticky xl:top-4 xl:w-[420px] xl:self-start xl:shrink-0"
+          >
+            <div className="border border-silver-bright/8 bg-charcoal">
               {selectedFinding ? (
                 <div className="space-y-6 p-6">
                   <div className="space-y-4 border-b border-silver-bright/8 pb-6">
@@ -645,100 +681,80 @@ export default function Findings() {
                         </span>
                       ) : null}
                     </div>
-
                     <div>
-                      <p className="mb-2 text-[10px] font-black uppercase tracking-[0.2em] text-silver/35">Selected Finding</p>
-                      <h2 className="text-3xl font-black uppercase italic tracking-tight text-silver-bright">{selectedFinding.title}</h2>
+                      <p className="mb-2 text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Selected Finding</p>
+                      <h2 className="text-2xl font-black uppercase italic tracking-tight text-silver-bright">{selectedFinding.title}</h2>
                     </div>
-
-                    <div className="grid gap-3 sm:grid-cols-2">
+                    <div className="grid gap-2 sm:grid-cols-2">
                       <div className="border border-silver-bright/8 bg-charcoal-dark p-3">
-                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/35">Target</p>
-                        <p className="mt-2 text-sm font-mono uppercase tracking-[0.14em] text-silver-bright">{selectedFinding.target || 'Unknown'}</p>
+                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Target</p>
+                        <p className="mt-1.5 text-xs font-mono uppercase tracking-[0.14em] text-silver-bright">{selectedFinding.target || 'Unknown'}</p>
                       </div>
                       <div className="border border-silver-bright/8 bg-charcoal-dark p-3">
-                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/35">Category</p>
-                        <p className="mt-2 text-sm font-mono uppercase tracking-[0.14em] text-silver-bright">{selectedFinding.category || 'Uncategorized'}</p>
+                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Category</p>
+                        <p className="mt-1.5 text-xs font-mono uppercase tracking-[0.14em] text-silver-bright">{selectedFinding.category || 'Uncategorized'}</p>
                       </div>
                       <div className="border border-silver-bright/8 bg-charcoal-dark p-3">
-                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/35">Observed</p>
-                        <p className="mt-2 text-sm font-mono uppercase tracking-[0.14em] text-silver-bright">
-                          {formatLocaleDate(selectedFinding.discovered_at)}
-                        </p>
+                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Observed</p>
+                        <p className="mt-1.5 text-xs font-mono uppercase tracking-[0.14em] text-silver-bright">{formatLocaleDate(selectedFinding.discovered_at)}</p>
                       </div>
                       <div className="border border-silver-bright/8 bg-charcoal-dark p-3">
-                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/35">Severity Score</p>
-                        <p className="mt-2 text-sm font-mono uppercase tracking-[0.14em] text-silver-bright">
+                        <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Severity Score</p>
+                        <p className="mt-1.5 text-xs font-mono uppercase tracking-[0.14em] text-silver-bright">
                           {typeof selectedFinding.cvss === 'number' ? selectedFinding.cvss.toFixed(1) : 'N/A'}
                         </p>
                       </div>
                     </div>
                   </div>
-
-                  <div className="space-y-5">
+                  <div className="space-y-4">
                     <div>
-                      <p className="mb-2 text-[10px] font-black uppercase tracking-[0.2em] text-silver/35">Evidence Brief</p>
-                      <div className="border-l-4 border-rag-red bg-charcoal-dark p-4">
-                        <p className="text-sm leading-relaxed text-silver/78">{selectedFinding.description || 'No description provided.'}</p>
+                      <p className="mb-2 text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Evidence Brief</p>
+                      <div className="border-l-2 border-rag-red bg-charcoal-dark p-4">
+                        <p className="text-sm leading-relaxed text-silver/70">{selectedFinding.description || 'No description provided.'}</p>
                       </div>
                     </div>
-
                     <div>
-                      <p className="mb-2 text-[10px] font-black uppercase tracking-[0.2em] text-silver/35">Remediation</p>
-                      <div className="border-l-4 border-rag-green bg-charcoal-dark p-4">
-                        <p className="text-sm leading-relaxed text-rag-green/85">
-                          {selectedFinding.remediation || 'No remediation guidance captured.'}
-                        </p>
+                      <p className="mb-2 text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Remediation</p>
+                      <div className="border-l-2 border-rag-green bg-charcoal-dark p-4">
+                        <p className="text-sm leading-relaxed text-rag-green/80">{selectedFinding.remediation || 'No remediation guidance captured.'}</p>
                       </div>
                     </div>
                   </div>
-
                   <div className="space-y-3 border-t border-silver-bright/8 pt-5">
-                    <p className="text-[10px] font-black uppercase tracking-[0.2em] text-silver/35">Workflow Actions</p>
+                    <p className="text-[9px] font-black uppercase tracking-[0.2em] text-silver/30">Workflow Actions</p>
                     <div className="grid gap-2 sm:grid-cols-2">
-                      <button
-                        type="button"
-                        onClick={() => updateFindingStatus(selectedFinding.id, 'reviewed')}
-                        className="bg-silver-bright px-4 py-3 text-[10px] font-black uppercase tracking-[0.18em] text-black shadow-[4px_4px_0px_0px_rgba(0,0,0,1)] transition-all active:translate-x-0.5 active:translate-y-0.5 active:shadow-none"
-                      >
+                      <button type="button" onClick={() => updateFindingStatus(selectedFinding.id, 'reviewed')}
+                        className="border border-silver-bright bg-silver-bright px-4 py-2.5 text-[9px] font-black uppercase tracking-[0.18em] text-black transition-all active:opacity-80">
                         Mark Reviewed
                       </button>
-                      <button
-                        type="button"
-                        onClick={() => updateFindingStatus(selectedFinding.id, 'new')}
-                        className="border border-rag-amber/25 bg-rag-amber/10 px-4 py-3 text-[10px] font-black uppercase tracking-[0.18em] text-rag-amber"
-                      >
+                      <button type="button" onClick={() => updateFindingStatus(selectedFinding.id, 'new')}
+                        className="border border-rag-amber/25 bg-rag-amber/10 px-4 py-2.5 text-[9px] font-black uppercase tracking-[0.18em] text-rag-amber">
                         Reopen
                       </button>
-                      <button
-                        type="button"
-                        onClick={() => updateFindingStatus(selectedFinding.id, 'suppressed')}
-                        className="border border-silver/20 bg-silver/5 px-4 py-3 text-[10px] font-black uppercase tracking-[0.18em] text-silver"
-                      >
+                      <button type="button" onClick={() => updateFindingStatus(selectedFinding.id, 'suppressed')}
+                        className="border border-silver/20 bg-silver/5 px-4 py-2.5 text-[9px] font-black uppercase tracking-[0.18em] text-silver">
                         Suppress
                       </button>
-                      <button
-                        type="button"
-                        onClick={() => copyFindingSummary(selectedFinding)}
-                        className="border border-rag-blue/25 bg-rag-blue/10 px-4 py-3 text-[10px] font-black uppercase tracking-[0.18em] text-rag-blue"
-                      >
+                      <button type="button" onClick={() => copyFindingSummary(selectedFinding)}
+                        className="border border-rag-blue/25 bg-rag-blue/10 px-4 py-2.5 text-[9px] font-black uppercase tracking-[0.18em] text-rag-blue">
                         {copiedFindingId === selectedFinding.id ? 'Copied' : 'Copy Brief'}
                       </button>
                     </div>
                   </div>
                 </div>
               ) : (
-                <div className="px-6 py-16 text-center">
-                  <p className="text-2xl font-black uppercase tracking-[0.22em] text-silver/20 italic">Queue Clear</p>
-                  <p className="mt-3 text-xs font-mono uppercase tracking-[0.2em] text-silver/15">
-                    Select a finding to review evidence and remediation.
+                <div className="flex flex-col items-center justify-center px-6 py-24 text-center">
+                  <p className="text-2xl font-black uppercase italic tracking-[0.18em] text-silver/15">Queue Neutral</p>
+                  <p className="mt-3 max-w-[240px] text-[10px] font-mono uppercase leading-relaxed tracking-[0.16em] text-silver/12">
+                    Select a live finding from the queue to mount inspection context.
                   </p>
                 </div>
               )}
             </div>
           </motion.aside>
+
         </div>
       </div>
     </div>
   )
-}
+}
\ No newline at end of file
diff --git a/frontend/testing/unit/hooks/useSavedViews.test.ts b/frontend/testing/unit/hooks/useSavedViews.test.ts
new file mode 100644
index 00000000..d2ead794
--- /dev/null
+++ b/frontend/testing/unit/hooks/useSavedViews.test.ts
@@ -0,0 +1,409 @@
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  FilterPreset,
+  isValidPreset,
+  isValidSavedView,
+  useSavedViews,
+} from '../../../src/hooks/useSavedViews'
+
+
+const mockFetch = vi.fn(() => Promise.reject(new Error('Network offline')))
+vi.stubGlobal('fetch', mockFetch)
+
+const storage: Record<string, string> = {}
+const localStorageMock = {
+  getItem: (k: string) => storage[k] ?? null,
+  setItem: (k: string, v: string) => {
+    storage[k] = v
+  },
+  removeItem: (k: string) => {
+    delete storage[k]
+  },
+  clear: () => {
+    Object.keys(storage).forEach((k) => delete storage[k])
+  },
+}
+vi.stubGlobal('localStorage', localStorageMock)
+
+
+const VALID_PRESET: FilterPreset = {
+  severity: 'critical',
+  target: 'example.com',
+  scanner: 'nmap',
+  sortMode: 'newest',
+  dateFrom: '2025-01-01',
+  dateTo: '2025-12-31',
+  searchQuery: 'port scan',
+}
+
+const ALL_PRESET: FilterPreset = {
+  severity: 'all',
+  target: 'all',
+  scanner: 'all',
+  sortMode: 'severity',
+  dateFrom: '',
+  dateTo: '',
+  searchQuery: '',
+}
+
+
+beforeEach(() => {
+  localStorageMock.clear()
+  mockFetch.mockReset()
+  mockFetch.mockRejectedValue(new Error('Network offline'))
+})
+
+afterEach(() => {
+  vi.clearAllMocks()
+})
+
+
+describe('isValidPreset', () => {
+  it('accepts a complete valid preset', () => {
+    expect(isValidPreset(VALID_PRESET)).toBe(true)
+  })
+
+  it('accepts the all-defaults preset', () => {
+    expect(isValidPreset(ALL_PRESET)).toBe(true)
+  })
+
+  it('rejects null', () => {
+    expect(isValidPreset(null)).toBe(false)
+  })
+
+  it('rejects a non-object', () => {
+    expect(isValidPreset('string')).toBe(false)
+    expect(isValidPreset(42)).toBe(false)
+  })
+
+  it('rejects an object missing required fields', () => {
+    expect(isValidPreset({ severity: 'all' })).toBe(false)
+  })
+
+  it('rejects invalid sortMode', () => {
+    expect(isValidPreset({ ...VALID_PRESET, sortMode: 'by_moon_phase' })).toBe(false)
+  })
+
+  it('rejects invalid severity', () => {
+    expect(isValidPreset({ ...VALID_PRESET, severity: 'apocalyptic' })).toBe(false)
+  })
+})
+
+
+describe('isValidSavedView', () => {
+  const view = {
+    id: 'abc-123',
+    name: 'My View',
+    preset: VALID_PRESET,
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+  }
+
+  it('accepts a complete valid view', () => {
+    expect(isValidSavedView(view)).toBe(true)
+  })
+
+  it('rejects a view with a missing id', () => {
+    expect(isValidSavedView({ ...view, id: '' })).toBe(false)
+  })
+
+  it('rejects a view with an invalid preset', () => {
+    expect(isValidSavedView({ ...view, preset: { severity: 'bad' } })).toBe(false)
+  })
+
+  it('rejects a non-object', () => {
+    expect(isValidSavedView(null)).toBe(false)
+  })
+})
+
+
+describe('useSavedViews — localStorage fallback (no backend)', () => {
+  it('starts empty when localStorage is empty', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    expect(result.current.views).toHaveLength(0)
+  })
+
+  it('creates a new view and returns it', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    let saved: Awaited<ReturnType<typeof result.current.saveView>> | undefined
+
+    await act(async () => {
+      saved = await result.current.saveView('My Scan', VALID_PRESET)
+    })
+
+    expect(saved).toBeDefined()
+    expect(saved?.name).toBe('My Scan')
+    expect(saved?.preset).toEqual(VALID_PRESET)
+    expect(result.current.views).toHaveLength(1)
+  })
+
+  it('persists the new view to localStorage', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Persistent', VALID_PRESET)
+    })
+
+    const raw = localStorage.getItem('secuscan-saved-views')
+    expect(raw).not.toBeNull()
+
+    const parsed = JSON.parse(raw!)
+    expect(parsed).toHaveLength(1)
+    expect(parsed[0].name).toBe('Persistent')
+  })
+
+  it('restores a saved view correctly (apply simulation)', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Apply Me', VALID_PRESET)
+    })
+
+    const view = result.current.views[0]
+    expect(view.preset).toEqual(VALID_PRESET)
+    expect(view.preset.sortMode).toBe('newest')
+    expect(view.preset.severity).toBe('critical')
+  })
+
+  it('overwrites a view when the same name is saved again', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Repeat', VALID_PRESET)
+    })
+
+    const firstId = result.current.views[0].id
+
+    const updatedPreset: FilterPreset = {
+      ...VALID_PRESET,
+      severity: 'high',
+      sortMode: 'oldest',
+    }
+
+    await act(async () => {
+      await result.current.saveView('Repeat', updatedPreset)
+    })
+
+    expect(result.current.views).toHaveLength(1)
+    expect(result.current.views[0].id).toBe(firstId)
+    expect(result.current.views[0].preset.severity).toBe('high')
+    expect(result.current.views[0].preset.sortMode).toBe('oldest')
+  })
+
+  it('overwrite is case-insensitive on name comparison', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Alpha', VALID_PRESET)
+    })
+
+    await act(async () => {
+      await result.current.saveView('alpha', ALL_PRESET)
+    })
+
+    expect(result.current.views).toHaveLength(1)
+    expect(result.current.views[0].preset.severity).toBe('all')
+  })
+
+  it('renames a view', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Old Name', VALID_PRESET)
+    })
+
+    const id = result.current.views[0].id
+
+    await act(async () => {
+      await result.current.renameView(id, 'New Name')
+    })
+
+    expect(result.current.views[0].name).toBe('New Name')
+  })
+
+  it('throws when renaming with an empty string', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Name', VALID_PRESET)
+    })
+
+    const id = result.current.views[0].id
+
+    await expect(
+      act(async () => {
+        await result.current.renameView(id, '   ')
+      }),
+    ).rejects.toThrow()
+  })
+
+  it('deletes a view by id', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Delete Me', VALID_PRESET)
+    })
+
+    const id = result.current.views[0].id
+
+    await act(async () => {
+      await result.current.deleteView(id)
+    })
+
+    expect(result.current.views).toHaveLength(0)
+  })
+
+  it('deleting a non-existent id is a no-op', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Keep', VALID_PRESET)
+    })
+
+    await act(async () => {
+      await result.current.deleteView('ghost-id')
+    })
+
+    expect(result.current.views).toHaveLength(1)
+  })
+
+  it('deleting one view leaves others intact', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('Keep', VALID_PRESET)
+    })
+
+    await act(async () => {
+      await result.current.saveView('Remove', ALL_PRESET)
+    })
+
+    const removeId = result.current.views.find((v) => v.name === 'Remove')!.id
+
+    await act(async () => {
+      await result.current.deleteView(removeId)
+    })
+
+    expect(result.current.views).toHaveLength(1)
+    expect(result.current.views[0].name).toBe('Keep')
+  })
+
+  it('throws when saving with an empty name', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await expect(
+      act(async () => {
+        await result.current.saveView('', VALID_PRESET)
+      }),
+    ).rejects.toThrow()
+  })
+
+  it('throws when saving with a whitespace-only name', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await expect(
+      act(async () => {
+        await result.current.saveView('   ', VALID_PRESET)
+      }),
+    ).rejects.toThrow()
+  })
+
+  it('throws when saving with an invalid preset (bad sortMode)', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    const badPreset = { ...VALID_PRESET, sortMode: 'random_order' } as any
+
+    await expect(
+      act(async () => {
+        await result.current.saveView('Bad Preset', badPreset)
+      }),
+    ).rejects.toThrow()
+  })
+
+  it('ignores corrupt localStorage data on mount', async () => {
+    localStorage.setItem('secuscan-saved-views', 'this is not JSON!!!!')
+
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    expect(result.current.views).toHaveLength(0)
+  })
+
+  it('filters out invalid saved-view entries from localStorage on mount', async () => {
+    const mixed = [
+      {
+        id: 'ok',
+        name: 'Good',
+        preset: VALID_PRESET,
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      },
+      {
+        id: 'bad',
+        name: 'Bad',
+      },
+    ]
+
+    localStorage.setItem('secuscan-saved-views', JSON.stringify(mixed))
+
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    expect(result.current.views).toHaveLength(1)
+    expect(result.current.views[0].name).toBe('Good')
+  })
+
+  it('supports multiple independent saved views', async () => {
+    const { result } = renderHook(() => useSavedViews())
+
+    await waitFor(() => expect(result.current.loading).toBe(false))
+
+    await act(async () => {
+      await result.current.saveView('View A', VALID_PRESET)
+    })
+
+    await act(async () => {
+      await result.current.saveView('View B', ALL_PRESET)
+    })
+
+    await act(async () => {
+      await result.current.saveView('View C', { ...VALID_PRESET, severity: 'low' })
+    })
+
+    expect(result.current.views).toHaveLength(3)
+    expect(result.current.views.map((v) => v.name)).toEqual(expect.arrayContaining(['View A', 'View B', 'View C']))
+  })
+})
diff --git a/frontend/testing/unit/pages/Findings.test.tsx b/frontend/testing/unit/pages/Findings.test.tsx
index b5c6e39a..e512bada 100644
--- a/frontend/testing/unit/pages/Findings.test.tsx
+++ b/frontend/testing/unit/pages/Findings.test.tsx
@@ -10,7 +10,21 @@ vi.mock('../../../src/api', () => ({
   API_BASE: 'http://127.0.0.1:8000',
 }))
 
-// ── Fixtures ──────────────────────────────────────────────────────────────────
+vi.mock('../../../src/hooks/useSavedViews', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../src/hooks/useSavedViews')>()
+  return {
+    ...actual,
+    useSavedViews: () => ({
+      views: [],
+      loading: false,
+      saveView: vi.fn(),
+      deleteView: vi.fn(),
+      renameView: vi.fn(),
+    }),
+  }
+})
+
+// ── Fixtures ──────────────────────────────────────────────────────────────────
 
 const criticalFinding = {
   id: 'finding-crit-1',
@@ -53,7 +67,7 @@ const mediumFinding = {
 
 const allFindings = [criticalFinding, highFinding, mediumFinding]
 
-// ── Helpers ───────────────────────────────────────────────────────────────────
+// ── Helpers ───────────────────────────────────────────────────────────────────
 
 function renderFindings() {
   return render(
@@ -63,30 +77,25 @@ function renderFindings() {
   )
 }
 
-/** Wait for data to load by looking for a known finding title. */
 async function waitForLoad() {
   await waitFor(() => {
     expect(screen.getAllByText('SQL Injection in Login').length).toBeGreaterThanOrEqual(1)
   })
 }
 
-/** Helper to grab the sort select via its label. */
-function getSortSelect() {
-  const label = screen.getByText('Sort By')
-  return label.parentElement!.querySelector('select')!
+function clickSortButton(label: string) {
+  fireEvent.click(screen.getByRole('button', { name: new RegExp(label, 'i') }))
 }
 
-/** Helper to collect visible finding titles from the list section. */
 function getVisibleTitles() {
-  // h3 tags in the list hold finding titles
   return Array.from(document.querySelectorAll('h3'))
     .map((el) => el.textContent ?? '')
     .filter(Boolean)
 }
 
-// ── Loading ───────────────────────────────────────────────────────────────────
+// ── Loading ───────────────────────────────────────────────────────────────────
 
-describe('Findings — loading state', () => {
+describe('Findings — loading state', () => {
   it('shows loading text while fetching', () => {
     vi.mocked(getFindings).mockReturnValue(new Promise(() => {}))
     renderFindings()
@@ -94,9 +103,9 @@ describe('Findings — loading state', () => {
   })
 })
 
-// ── Severity filter ───────────────────────────────────────────────────────────
+// ── Severity filter ───────────────────────────────────────────────────────────
 
-describe('Findings — severity filtering', () => {
+describe('Findings — severity filtering', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
@@ -114,43 +123,42 @@ describe('Findings — severity filtering', () => {
     await waitForLoad()
 
     const critButtons = screen.getAllByRole('button', { name: /critical/i })
-    const toggle = critButtons.find((btn) => btn.textContent?.includes('1'))
+    const toggle = critButtons.find((btn) => btn.textContent?.trim() === 'Critical')
     expect(toggle).toBeTruthy()
     await user.click(toggle!)
 
     await waitFor(() => {
       expect(screen.queryByText('Stored XSS in Comments')).not.toBeInTheDocument()
-    })
+    }, { timeout: 3000 })
     expect(screen.getAllByText('SQL Injection in Login').length).toBeGreaterThanOrEqual(1)
   })
 })
 
-// ── Sort options ──────────────────────────────────────────────────────────────
+// ── Sort options ──────────────────────────────────────────────────────────────
 
-describe('Findings — sorting', () => {
+describe('Findings — sorting', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
 
-  it('sort dropdown contains all expected options', async () => {
+  it('sort controls contain all expected options', async () => {
     renderFindings()
     await waitForLoad()
 
-    const options = within(getSortSelect()).getAllByRole('option')
-    const labels = options.map((o) => o.textContent)
-    expect(labels).toContain('Newest First')
-    expect(labels).toContain('Oldest First')
-    expect(labels).toContain('Target (A → Z)')
+    expect(screen.getByRole('button', { name: /by severity/i })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /newest/i })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /oldest/i })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /target alpha/i })).toBeInTheDocument()
   })
 
   it('switches to flat list when sort is newest', async () => {
     renderFindings()
     await waitForLoad()
 
-    fireEvent.change(getSortSelect(), { target: { value: 'newest' } })
+    clickSortButton('Newest')
 
     await waitFor(() => {
-      const headers = screen.getAllByText(/visible in queue/i)
+      const headers = screen.getAllByText(/in queue/i)
       expect(headers.length).toBe(1)
     })
   })
@@ -159,11 +167,10 @@ describe('Findings — sorting', () => {
     renderFindings()
     await waitForLoad()
 
-    fireEvent.change(getSortSelect(), { target: { value: 'newest' } })
+    clickSortButton('Newest')
 
     await waitFor(() => {
       const titles = getVisibleTitles()
-      // May 15 > May 14 > May 13
       expect(titles.indexOf('Missing Security Headers')).toBeLessThan(titles.indexOf('SQL Injection in Login'))
       expect(titles.indexOf('SQL Injection in Login')).toBeLessThan(titles.indexOf('Stored XSS in Comments'))
     })
@@ -173,11 +180,10 @@ describe('Findings — sorting', () => {
     renderFindings()
     await waitForLoad()
 
-    fireEvent.change(getSortSelect(), { target: { value: 'oldest' } })
+    clickSortButton('Oldest')
 
     await waitFor(() => {
       const titles = getVisibleTitles()
-      // May 13 < May 14 < May 15
       expect(titles.indexOf('Stored XSS in Comments')).toBeLessThan(titles.indexOf('SQL Injection in Login'))
       expect(titles.indexOf('SQL Injection in Login')).toBeLessThan(titles.indexOf('Missing Security Headers'))
     })
@@ -187,12 +193,10 @@ describe('Findings — sorting', () => {
     renderFindings()
     await waitForLoad()
 
-    fireEvent.change(getSortSelect(), { target: { value: 'target' } })
+    clickSortButton('Target Alpha')
 
     await waitFor(() => {
       const titles = getVisibleTitles()
-      // api.example.com comes before web.example.com
-      // criticalFinding and mediumFinding share api.example.com, highFinding has web.example.com
       const webIdx = titles.indexOf('Stored XSS in Comments')
       const apiIdx = titles.indexOf('SQL Injection in Login')
       expect(apiIdx).toBeLessThan(webIdx)
@@ -200,9 +204,9 @@ describe('Findings — sorting', () => {
   })
 })
 
-// ── Target filter ─────────────────────────────────────────────────────────────
+// ── Target filter ─────────────────────────────────────────────────────────────
 
-describe('Findings — target filter', () => {
+describe('Findings — target filter', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
@@ -211,11 +215,10 @@ describe('Findings — target filter', () => {
     renderFindings()
     await waitForLoad()
 
-    const targetSelect = screen.getByDisplayValue(/All Targets/i)
+    const targetSelect = screen.getByDisplayValue(/All targets/i)
     const options = within(targetSelect as HTMLElement).getAllByRole('option')
     const labels = options.map((o) => o.textContent)
 
-    expect(labels).toContain('All Targets')
     expect(labels).toContain('api.example.com')
     expect(labels).toContain('web.example.com')
   })
@@ -225,7 +228,7 @@ describe('Findings — target filter', () => {
     renderFindings()
     await waitForLoad()
 
-    const targetSelect = screen.getByDisplayValue(/All Targets/i)
+    const targetSelect = screen.getByDisplayValue(/All targets/i)
     await user.selectOptions(targetSelect, 'web.example.com')
 
     await waitFor(() => {
@@ -235,9 +238,9 @@ describe('Findings — target filter', () => {
   })
 })
 
-// ── Scanner / tool filter ─────────────────────────────────────────────────────
+// ── Scanner / tool filter ─────────────────────────────────────────────────────
 
-describe('Findings — scanner filter', () => {
+describe('Findings — scanner filter', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
@@ -246,11 +249,10 @@ describe('Findings — scanner filter', () => {
     renderFindings()
     await waitForLoad()
 
-    const scannerSelect = screen.getByDisplayValue(/All Scanners/i)
+    const scannerSelect = screen.getByDisplayValue(/All scanners/i)
     const options = within(scannerSelect as HTMLElement).getAllByRole('option')
     const labels = options.map((o) => o.textContent)
 
-    expect(labels).toContain('All Scanners')
     expect(labels).toContain('sqlmap')
     expect(labels).toContain('zap')
     expect(labels).toContain('nikto')
@@ -261,7 +263,7 @@ describe('Findings — scanner filter', () => {
     renderFindings()
     await waitForLoad()
 
-    const scannerSelect = screen.getByDisplayValue(/All Scanners/i)
+    const scannerSelect = screen.getByDisplayValue(/All scanners/i)
     await user.selectOptions(scannerSelect, 'zap')
 
     await waitFor(() => {
@@ -272,9 +274,9 @@ describe('Findings — scanner filter', () => {
   })
 })
 
-// ── Date range filter ─────────────────────────────────────────────────────────
+// ── Date range filter ─────────────────────────────────────────────────────────
 
-describe('Findings — date range filter', () => {
+describe('Findings — date range filter', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
@@ -283,8 +285,7 @@ describe('Findings — date range filter', () => {
     renderFindings()
     await waitForLoad()
 
-    // Set from-date to May 14 — should exclude the May 13 finding (highFinding)
-    const fromLabel = screen.getByText('From Date')
+    const fromLabel = screen.getByText('Discovered From')
     const fromInput = fromLabel.parentElement!.querySelector('input')!
     fireEvent.change(fromInput, { target: { value: '2026-05-14' } })
 
@@ -299,8 +300,7 @@ describe('Findings — date range filter', () => {
     renderFindings()
     await waitForLoad()
 
-    // Set to-date to May 14 — should exclude the May 15 finding (mediumFinding)
-    const toLabel = screen.getByText('To Date')
+    const toLabel = screen.getByText('Discovered To')
     const toInput = toLabel.parentElement!.querySelector('input')!
     fireEvent.change(toInput, { target: { value: '2026-05-14' } })
 
@@ -315,10 +315,9 @@ describe('Findings — date range filter', () => {
     renderFindings()
     await waitForLoad()
 
-    // Set from=May 14, to=May 14 — should include criticalFinding (discovered May 14)
-    const fromLabel = screen.getByText('From Date')
+    const fromLabel = screen.getByText('Discovered From')
     const fromInput = fromLabel.parentElement!.querySelector('input')!
-    const toLabel = screen.getByText('To Date')
+    const toLabel = screen.getByText('Discovered To')
     const toInput = toLabel.parentElement!.querySelector('input')!
 
     fireEvent.change(fromInput, { target: { value: '2026-05-14' } })
@@ -332,28 +331,26 @@ describe('Findings — date range filter', () => {
   })
 })
 
-// ── Reset button ──────────────────────────────────────────────────────────────
+// ── Reset filters ─────────────────────────────────────────────────────────────
 
-describe('Findings — reset filters', () => {
+describe('Findings — reset filters', () => {
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
   })
 
-  it('clears all active filters when reset is clicked', async () => {
+  it('clears all active filters when severity All is clicked', async () => {
     const user = userEvent.setup()
     renderFindings()
     await waitForLoad()
 
-    // Apply a target filter first
-    const targetSelect = screen.getByDisplayValue(/All Targets/i)
+    const targetSelect = screen.getByDisplayValue(/All targets/i)
     await user.selectOptions(targetSelect, 'web.example.com')
 
     await waitFor(() => {
       expect(screen.queryByText('SQL Injection in Login')).not.toBeInTheDocument()
     })
 
-    // Now click reset
-    await user.click(screen.getByRole('button', { name: /reset filters/i }))
+    await user.selectOptions(screen.getByDisplayValue(/web\.example\.com/i), 'all')
 
     await waitFor(() => {
       expect(screen.getAllByText('SQL Injection in Login').length).toBeGreaterThanOrEqual(1)
@@ -362,11 +359,54 @@ describe('Findings — reset filters', () => {
   })
 })
 
-// ── Timezone boundary regression ──────────────────────────────────────────────
-// A finding at 2026-05-13T20:00:00Z is May 14 01:30 in Asia/Kolkata (IST).
-// The date filter should compare by the *displayed* calendar day, not UTC.
 
-describe('Findings — date range respects display timezone', () => {
+
+// ── Active filter summary ─────────────────────────────────────────────────────
+describe('Findings — active filter summary', () => {
+  beforeEach(() => {
+    vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
+  })
+
+  it('is hidden when no filters are active', async () => {
+    renderFindings()
+    await waitForLoad()
+    expect(screen.queryByLabelText('active filters')).not.toBeInTheDocument()
+  })
+
+  it('shows target + scanner chips when both filters are applied', async () => {
+    const user = userEvent.setup()
+    renderFindings()
+    await waitForLoad()
+
+    await user.selectOptions(screen.getByDisplayValue(/All targets/i), 'api.example.com')
+    await user.selectOptions(screen.getByDisplayValue(/All scanners/i), 'sqlmap')
+
+    await waitFor(() => {
+      expect(screen.getAllByText('SQL Injection in Login').length).toBeGreaterThanOrEqual(1)
+      expect(screen.queryByText('Stored XSS in Comments')).not.toBeInTheDocument()
+    })
+  })
+
+  it('shows date range chips when both dates are set', async () => {
+    renderFindings()
+    await waitForLoad()
+
+    const fromInput = screen.getByText('Discovered From').parentElement!.querySelector('input')!
+    const toInput = screen.getByText('Discovered To').parentElement!.querySelector('input')!
+
+    fireEvent.change(fromInput, { target: { value: '2026-05-14' } })
+    fireEvent.change(toInput, { target: { value: '2026-05-15' } })
+
+    await waitFor(() => {
+      expect(screen.queryByText('Stored XSS in Comments')).not.toBeInTheDocument()
+    })
+    expect(screen.getAllByText('SQL Injection in Login').length).toBeGreaterThanOrEqual(1)
+    expect(screen.getAllByText('Missing Security Headers').length).toBeGreaterThanOrEqual(1)
+  })
+})
+// ── Timezone boundary regression ──────────────────────────────────────────────
+
+describe('Findings — date range respects display timezone', () => {
   const tzBoundaryFinding = {
     id: 'finding-tz-edge',
     severity: 'high',
@@ -375,13 +415,12 @@ describe('Findings — date range respects display timezone', () => {
     target: 'tz.example.com',
     description: 'Edge case across UTC day boundary.',
     remediation: 'Fix it.',
-    discovered_at: '2026-05-13T20:00:00Z',  // May 13 UTC, but May 14 in IST
+    discovered_at: '2026-05-13T20:00:00Z',
     plugin_id: 'zap',
   }
 
   beforeEach(() => {
     vi.mocked(getFindings).mockResolvedValue({ findings: [tzBoundaryFinding] })
-    // Force timezone to Asia/Kolkata so the finding displays as May 14
     vi.spyOn(dateUtils, 'getCurrentTimeZone').mockReturnValue('Asia/Kolkata')
   })
 
@@ -396,11 +435,10 @@ describe('Findings — date range respects display timezone', () => {
       expect(screen.getAllByText('TZ Boundary XSS').length).toBeGreaterThanOrEqual(1)
     })
 
-    const fromLabel = screen.getByText('From Date')
+    const fromLabel = screen.getByText('Discovered From')
     const fromInput = fromLabel.parentElement!.querySelector('input')!
     fireEvent.change(fromInput, { target: { value: '2026-05-14' } })
 
-    // In IST this finding is May 14, so from-date of May 14 should keep it
     await waitFor(() => {
       expect(screen.getAllByText('TZ Boundary XSS').length).toBeGreaterThanOrEqual(1)
     })
@@ -413,66 +451,12 @@ describe('Findings — date range respects display timezone', () => {
       expect(screen.getAllByText('TZ Boundary XSS').length).toBeGreaterThanOrEqual(1)
     })
 
-    const fromLabel = screen.getByText('From Date')
+    const fromLabel = screen.getByText('Discovered From')
     const fromInput = fromLabel.parentElement!.querySelector('input')!
     fireEvent.change(fromInput, { target: { value: '2026-05-15' } })
 
-    // May 14 IST < May 15 from-date, so it should be excluded
     await waitFor(() => {
-      expect(screen.getByText(/No Findings Match/i)).toBeInTheDocument()
+      expect(screen.getByText(/Queue Cleared/i)).toBeInTheDocument()
     })
   })
-})
-
-// ── Empty state ───────────────────────────────────────────────────────────────
-
-describe('Findings — empty state', () => {
-  it('shows empty state when no findings exist', async () => {
-    vi.mocked(getFindings).mockResolvedValue({ findings: [] })
-    renderFindings()
-    expect(await screen.findByText(/No Findings Match/i)).toBeInTheDocument()
-  })
-})
-
-// ── Active filter summary ─────────────────────────────────────────────────────
-
-describe('Findings — active filter summary', () => {
-  beforeEach(() => {
-    vi.mocked(getFindings).mockResolvedValue({ findings: allFindings })
-  })
-
-  it('is hidden when no filters are active', async () => {
-    renderFindings()
-    await waitForLoad()
-    expect(screen.queryByLabelText('active filters')).not.toBeInTheDocument()
-  })
-
-  it('shows target + scanner chips when both filters are applied', async () => {
-    const user = userEvent.setup()
-    renderFindings()
-    await waitForLoad()
-
-    await user.selectOptions(screen.getByDisplayValue(/All Targets/i), 'api.example.com')
-    await user.selectOptions(screen.getByDisplayValue(/All Scanners/i), 'sqlmap')
-
-    const strip = await screen.findByLabelText('active filters')
-    expect(strip).toBeInTheDocument()
-    expect(within(strip).getByText(/target: api\.example\.com/i)).toBeInTheDocument()
-    expect(within(strip).getByText(/scanner: sqlmap/i)).toBeInTheDocument()
-  })
-
-  it('shows date range chips when both dates are set', async () => {
-    renderFindings()
-    await waitForLoad()
-
-    const fromInput = screen.getByText('From Date').parentElement!.querySelector('input')!
-    const toInput   = screen.getByText('To Date').parentElement!.querySelector('input')!
-
-    fireEvent.change(fromInput, { target: { value: '2026-05-14' } })
-    fireEvent.change(toInput,   { target: { value: '2026-05-15' } })
-
-    const strip = await screen.findByLabelText('active filters')
-    expect(within(strip).getByText(/from: 2026-05-14/i)).toBeInTheDocument()
-    expect(within(strip).getByText(/to: 2026-05-15/i)).toBeInTheDocument()
-  })
-})
+})
\ No newline at end of file
diff --git a/testing/backend/unit/test_saved_views.py b/testing/backend/unit/test_saved_views.py
new file mode 100644
index 00000000..0d693497
--- /dev/null
+++ b/testing/backend/unit/test_saved_views.py
@@ -0,0 +1,334 @@
+"""
+testing/backend/unit/test_saved_views.py
+
+Unit tests for the saved-views API routes.
+Covers: create, apply (list), overwrite (PUT), rename, delete,
+        and negative paths for invalid/missing data.
+
+Run with:
+    pytest testing/backend/unit/test_saved_views.py -v
+"""
+
+from __future__ import annotations
+
+import json
+import pytest
+import pytest_asyncio
+from httpx import AsyncClient, ASGITransport
+
+# ─── App bootstrap ────────────────────────────────────────────────────────────
+# We import the FastAPI app with the saved_views_router registered.
+# The router is added in conftest.py via the fixture below, so we only need
+# a minimal app that registers the router and an in-memory database.
+
+from fastapi import FastAPI
+from backend.secuscan.saved_views import saved_views_router, ensure_saved_views_table
+from backend.secuscan.database import Database, get_db
+import backend.secuscan.database as _db_module
+
+
+# ─── Fixtures ─────────────────────────────────────────────────────────────────
+
+@pytest_asyncio.fixture
+async def app_client():
+    """
+    Spin up an isolated FastAPI app with an in-memory SQLite database
+    and the saved_views_router registered.
+    """
+    # In-memory DB — isolated per test function
+    test_db = Database(":memory:")
+    await test_db.connect()
+    _db_module.db = test_db
+
+    # Minimal app
+    _app = FastAPI()
+    _app.include_router(saved_views_router)
+
+    # Create the saved_views table
+    await ensure_saved_views_table()
+
+    transport = ASGITransport(app=_app)
+    async with AsyncClient(transport=transport, base_url="http://test") as client:
+        yield client
+
+    await test_db.disconnect()
+    _db_module.db = None
+
+
+# ─── Helpers ──────────────────────────────────────────────────────────────────
+
+VALID_PRESET = {
+    "severity":    "critical",
+    "target":      "example.com",
+    "scanner":     "nmap",
+    "sortMode":    "newest",
+    "dateFrom":    "2025-01-01",
+    "dateTo":      "2025-12-31",
+    "searchQuery": "open port",
+}
+
+ALL_FILTER_PRESET = {
+    "severity":    "all",
+    "target":      "all",
+    "scanner":     "all",
+    "sortMode":    "severity",
+    "dateFrom":    "",
+    "dateTo":      "",
+    "searchQuery": "",
+}
+
+
+def make_body(name: str, preset: dict = VALID_PRESET) -> dict:
+    return {"name": name, "filter_json": json.dumps(preset)}
+
+
+# ─── LIST (GET /saved-views) ──────────────────────────────────────────────────
+
+@pytest.mark.asyncio
+async def test_list_empty(app_client: AsyncClient):
+    """Initially no saved views exist."""
+    res = await app_client.get("/api/v1/saved-views")
+    assert res.status_code == 200
+    body = res.json()
+    assert body["views"] == []
+    assert body["total"] == 0
+
+
+# ─── CREATE (POST /saved-views) ───────────────────────────────────────────────
+
+@pytest.mark.asyncio
+async def test_create_success(app_client: AsyncClient):
+    """Creating a new view returns 201 with an id."""
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Critical Web Scan"))
+    assert res.status_code == 201
+    body = res.json()
+    assert body["created"] is True
+    assert isinstance(body["id"], str) and len(body["id"]) > 0
+    assert body["name"] == "Critical Web Scan"
+
+
+@pytest.mark.asyncio
+async def test_create_appears_in_list(app_client: AsyncClient):
+    """A created view is returned by the list endpoint."""
+    await app_client.post("/api/v1/saved-views", json=make_body("My View"))
+    res = await app_client.get("/api/v1/saved-views")
+    body = res.json()
+    assert body["total"] == 1
+    assert body["views"][0]["name"] == "My View"
+    stored_preset = json.loads(body["views"][0]["filter_json"])
+    assert stored_preset["severity"] == "critical"
+
+
+@pytest.mark.asyncio
+async def test_create_duplicate_name_returns_409(app_client: AsyncClient):
+    """POSTing the same name twice returns 409."""
+    await app_client.post("/api/v1/saved-views", json=make_body("Dupe"))
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Dupe"))
+    assert res.status_code == 409
+
+
+@pytest.mark.asyncio
+async def test_create_case_insensitive_duplicate(app_client: AsyncClient):
+    """Name collision check is case-insensitive."""
+    await app_client.post("/api/v1/saved-views", json=make_body("MyView"))
+    res = await app_client.post("/api/v1/saved-views", json=make_body("myview"))
+    assert res.status_code == 409
+
+
+@pytest.mark.asyncio
+async def test_create_empty_name_rejected(app_client: AsyncClient):
+    """Blank name is rejected with 422."""
+    res = await app_client.post("/api/v1/saved-views", json={"name": "   ", "filter_json": json.dumps(VALID_PRESET)})
+    assert res.status_code == 422
+
+
+@pytest.mark.asyncio
+async def test_create_invalid_json_rejected(app_client: AsyncClient):
+    """Non-JSON filter_json is rejected with 422."""
+    res = await app_client.post("/api/v1/saved-views", json={"name": "Bad", "filter_json": "not json at all"})
+    assert res.status_code == 422
+
+
+@pytest.mark.asyncio
+async def test_create_invalid_sort_mode_rejected(app_client: AsyncClient):
+    """filter_json with an invalid sortMode is rejected."""
+    bad_preset = {**VALID_PRESET, "sortMode": "by_moon_phase"}
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Bad Sort", bad_preset))
+    assert res.status_code == 422
+
+
+@pytest.mark.asyncio
+async def test_create_invalid_severity_rejected(app_client: AsyncClient):
+    """filter_json with an invalid severity is rejected."""
+    bad_preset = {**VALID_PRESET, "severity": "apocalyptic"}
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Bad Sev", bad_preset))
+    assert res.status_code == 422
+
+
+@pytest.mark.asyncio
+async def test_create_missing_filter_json_rejected(app_client: AsyncClient):
+    """Request missing filter_json is rejected."""
+    res = await app_client.post("/api/v1/saved-views", json={"name": "No Preset"})
+    assert res.status_code == 422
+
+
+# ─── APPLY — list then cherry-pick (simulates frontend restore) ───────────────
+
+@pytest.mark.asyncio
+async def test_apply_restores_correct_preset(app_client: AsyncClient):
+    """
+    'Applying' a view means the frontend reads filter_json and restores state.
+    We verify the stored preset round-trips correctly.
+    """
+    await app_client.post("/api/v1/saved-views", json=make_body("Pentest View", VALID_PRESET))
+    list_res = await app_client.get("/api/v1/saved-views")
+    views = list_res.json()["views"]
+    assert len(views) == 1
+    restored = json.loads(views[0]["filter_json"])
+    assert restored == VALID_PRESET
+
+
+# ─── OVERWRITE / UPDATE (PUT /saved-views/{id}) ───────────────────────────────
+
+@pytest.mark.asyncio
+async def test_overwrite_filter_json(app_client: AsyncClient):
+    """PUT updates filter_json for an existing view."""
+    create_res = await app_client.post("/api/v1/saved-views", json=make_body("Overwrite Me"))
+    view_id = create_res.json()["id"]
+
+    new_preset = {**VALID_PRESET, "severity": "high", "sortMode": "oldest"}
+    put_res = await app_client.put(
+        f"/api/v1/saved-views/{view_id}",
+        json={"filter_json": json.dumps(new_preset)},
+    )
+    assert put_res.status_code == 200
+    assert put_res.json()["updated"] is True
+
+    # Verify persisted
+    list_res = await app_client.get("/api/v1/saved-views")
+    stored = json.loads(list_res.json()["views"][0]["filter_json"])
+    assert stored["severity"] == "high"
+    assert stored["sortMode"] == "oldest"
+
+
+@pytest.mark.asyncio
+async def test_rename_view(app_client: AsyncClient):
+    """PUT with only a new name renames the view."""
+    create_res = await app_client.post("/api/v1/saved-views", json=make_body("Old Name"))
+    view_id = create_res.json()["id"]
+
+    put_res = await app_client.put(
+        f"/api/v1/saved-views/{view_id}",
+        json={"name": "New Name"},
+    )
+    assert put_res.status_code == 200
+
+    list_res = await app_client.get("/api/v1/saved-views")
+    assert list_res.json()["views"][0]["name"] == "New Name"
+
+
+@pytest.mark.asyncio
+async def test_rename_to_existing_name_returns_409(app_client: AsyncClient):
+    """Renaming to another view's name returns 409."""
+    await app_client.post("/api/v1/saved-views", json=make_body("Alpha"))
+    beta_res = await app_client.post("/api/v1/saved-views", json=make_body("Beta"))
+    beta_id = beta_res.json()["id"]
+
+    res = await app_client.put(f"/api/v1/saved-views/{beta_id}", json={"name": "Alpha"})
+    assert res.status_code == 409
+
+
+@pytest.mark.asyncio
+async def test_update_nonexistent_view_returns_404(app_client: AsyncClient):
+    """PUT on a missing id returns 404."""
+    res = await app_client.put(
+        "/api/v1/saved-views/nonexistent-uuid",
+        json={"name": "Whatever"},
+    )
+    assert res.status_code == 404
+
+
+@pytest.mark.asyncio
+async def test_update_with_no_fields_returns_400(app_client: AsyncClient):
+    """PUT with an empty body returns 400."""
+    create_res = await app_client.post("/api/v1/saved-views", json=make_body("Empty Update"))
+    view_id = create_res.json()["id"]
+    res = await app_client.put(f"/api/v1/saved-views/{view_id}", json={})
+    assert res.status_code == 400
+
+
+@pytest.mark.asyncio
+async def test_update_invalid_filter_json_rejected(app_client: AsyncClient):
+    """PUT with malformed filter_json returns 422."""
+    create_res = await app_client.post("/api/v1/saved-views", json=make_body("Will Fail"))
+    view_id = create_res.json()["id"]
+    res = await app_client.put(
+        f"/api/v1/saved-views/{view_id}",
+        json={"filter_json": "{not: valid json}"},
+    )
+    assert res.status_code == 422
+
+
+# ─── DELETE (DELETE /saved-views/{id}) ───────────────────────────────────────
+
+@pytest.mark.asyncio
+async def test_delete_removes_view(app_client: AsyncClient):
+    """Deleted view no longer appears in the list."""
+    create_res = await app_client.post("/api/v1/saved-views", json=make_body("Delete Me"))
+    view_id = create_res.json()["id"]
+
+    del_res = await app_client.delete(f"/api/v1/saved-views/{view_id}")
+    assert del_res.status_code == 200
+    assert del_res.json()["deleted"] is True
+
+    list_res = await app_client.get("/api/v1/saved-views")
+    assert list_res.json()["total"] == 0
+
+
+@pytest.mark.asyncio
+async def test_delete_nonexistent_is_idempotent(app_client: AsyncClient):
+    """Deleting a non-existent id returns 200 (idempotent)."""
+    res = await app_client.delete("/api/v1/saved-views/does-not-exist")
+    assert res.status_code == 200
+    assert res.json()["deleted"] is True
+
+
+@pytest.mark.asyncio
+async def test_delete_only_removes_target(app_client: AsyncClient):
+    """Deleting one view leaves others intact."""
+    await app_client.post("/api/v1/saved-views", json=make_body("Keep Me"))
+    del_res = await app_client.post("/api/v1/saved-views", json=make_body("Remove Me"))
+    del_id = del_res.json()["id"]
+
+    await app_client.delete(f"/api/v1/saved-views/{del_id}")
+
+    list_res = await app_client.get("/api/v1/saved-views")
+    assert list_res.json()["total"] == 1
+    assert list_res.json()["views"][0]["name"] == "Keep Me"
+
+
+# ─── Security / negative path edge-cases ─────────────────────────────────────
+
+@pytest.mark.asyncio
+async def test_name_too_long_rejected(app_client: AsyncClient):
+    """Names over 60 chars are rejected."""
+    long_name = "x" * 61
+    res = await app_client.post("/api/v1/saved-views", json=make_body(long_name))
+    assert res.status_code == 422
+
+
+@pytest.mark.asyncio
+async def test_filter_json_extra_fields_ignored(app_client: AsyncClient):
+    """Extra unknown fields in filter_json don't cause a 422 (Pydantic extra='ignore')."""
+    preset_with_extra = {**VALID_PRESET, "injected_field": "'; DROP TABLE saved_views; --"}
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Extra Fields", preset_with_extra))
+    # Should succeed; FilterPreset ignores unknown fields by default
+    assert res.status_code == 201
+
+
+@pytest.mark.asyncio
+async def test_filter_json_with_null_values_rejected(app_client: AsyncClient):
+    """filter_json with null where string expected is rejected."""
+    bad_preset = {**VALID_PRESET, "severity": None}
+    res = await app_client.post("/api/v1/saved-views", json=make_body("Null Sev", bad_preset))
+    assert res.status_code == 422