diff --git a/surfsense_web/app/api/search/route.ts b/surfsense_web/app/api/search/route.ts
index d86bfc5ba..e8aa2e34b 100644
--- a/surfsense_web/app/api/search/route.ts
+++ b/surfsense_web/app/api/search/route.ts
@@ -1,4 +1,4 @@
-import { source } from "@/lib/source";
 import { createFromSource } from "fumadocs-core/search/server";
+import { source } from "@/lib/source";
 
 export const { GET } = createFromSource(source);
diff --git a/surfsense_web/app/login/AmbientBackground.tsx b/surfsense_web/app/login/AmbientBackground.tsx
index b71135ac0..71a8cd222 100644
--- a/surfsense_web/app/login/AmbientBackground.tsx
+++ b/surfsense_web/app/login/AmbientBackground.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 
 export const AmbientBackground = () => {
 	return (
diff --git a/surfsense_web/app/login/GoogleLoginButton.tsx b/surfsense_web/app/login/GoogleLoginButton.tsx
index 00bb669d4..ab0e0ddf8 100644
--- a/surfsense_web/app/login/GoogleLoginButton.tsx
+++ b/surfsense_web/app/login/GoogleLoginButton.tsx
@@ -1,5 +1,4 @@
 "use client";
-import React from "react";
 import { IconBrandGoogleFilled } from "@tabler/icons-react";
 import { motion } from "framer-motion";
 import { Logo } from "@/components/Logo";
@@ -59,6 +58,7 @@ export function GoogleLoginButton() {
 							strokeLinejoin="round"
 							className="flex-shrink-0"
 						>
+							<title>Google Logo</title>
 							<path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
 							<line x1="12" y1="9" x2="12" y2="13" />
 							<line x1="12" y1="17" x2="12.01" y2="17" />
diff --git a/surfsense_web/app/login/LocalLoginForm.tsx b/surfsense_web/app/login/LocalLoginForm.tsx
index d35f9080f..7cc50b28a 100644
--- a/surfsense_web/app/login/LocalLoginForm.tsx
+++ b/surfsense_web/app/login/LocalLoginForm.tsx
@@ -1,8 +1,7 @@
 "use client";
-import type React from "react";
-import { useState, useEffect } from "react";
-import { useRouter } from "next/navigation";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
 
 export function LocalLoginForm() {
 	const [username, setUsername] = useState("");
@@ -46,9 +45,10 @@ export function LocalLoginForm() {
 				throw new Error(data.detail || "Failed to login");
 			}
 
-			router.push("/auth/callback?token=" + data.access_token);
-		} catch (err: any) {
-			setError(err.message || "An error occurred during login");
+			router.push(`/auth/callback?token=${data.access_token}`);
+		} catch (err) {
+			const errorMessage = err instanceof Error ? err.message : "An error occurred during login";
+			setError(errorMessage);
 		} finally {
 			setIsLoading(false);
 		}
diff --git a/surfsense_web/app/login/page.tsx b/surfsense_web/app/login/page.tsx
index fb9deb028..1957c22bf 100644
--- a/surfsense_web/app/login/page.tsx
+++ b/surfsense_web/app/login/page.tsx
@@ -1,12 +1,12 @@
 "use client";
 
-import { useState, useEffect, Suspense } from "react";
-import { GoogleLoginButton } from "./GoogleLoginButton";
-import { LocalLoginForm } from "./LocalLoginForm";
+import { Loader2 } from "lucide-react";
+import { useSearchParams } from "next/navigation";
+import { Suspense, useEffect, useState } from "react";
 import { Logo } from "@/components/Logo";
 import { AmbientBackground } from "./AmbientBackground";
-import { useSearchParams } from "next/navigation";
-import { Loader2 } from "lucide-react";
+import { GoogleLoginButton } from "./GoogleLoginButton";
+import { LocalLoginForm } from "./LocalLoginForm";
 
 function LoginContent() {
 	const [authType, setAuthType] = useState<string | null>(null);
diff --git a/surfsense_web/app/onboard/page.tsx b/surfsense_web/app/onboard/page.tsx
index 6b9d06341..997b7e4c8 100644
--- a/surfsense_web/app/onboard/page.tsx
+++ b/surfsense_web/app/onboard/page.tsx
@@ -1,17 +1,17 @@
 "use client";
 
-import React, { useState, useEffect } from "react";
+import { AnimatePresence, motion } from "framer-motion";
+import { ArrowLeft, ArrowRight, Bot, CheckCircle, Sparkles } from "lucide-react";
 import { useRouter } from "next/navigation";
-import { motion, AnimatePresence } from "framer-motion";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
-import { Progress } from "@/components/ui/progress";
-import { CheckCircle, ArrowRight, ArrowLeft, Bot, Sparkles, Zap, Brain } from "lucide-react";
+import { useEffect, useState } from "react";
 import { Logo } from "@/components/Logo";
-import { useLLMConfigs, useLLMPreferences } from "@/hooks/use-llm-configs";
 import { AddProviderStep } from "@/components/onboard/add-provider-step";
 import { AssignRolesStep } from "@/components/onboard/assign-roles-step";
 import { CompletionStep } from "@/components/onboard/completion-step";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { Progress } from "@/components/ui/progress";
+import { useLLMConfigs, useLLMPreferences } from "@/hooks/use-llm-configs";
 
 const TOTAL_STEPS = 3;
 
diff --git a/surfsense_web/app/register/page.tsx b/surfsense_web/app/register/page.tsx
index 2327480c6..1a89dbb4e 100644
--- a/surfsense_web/app/register/page.tsx
+++ b/surfsense_web/app/register/page.tsx
@@ -1,8 +1,8 @@
 "use client";
-import type React from "react";
-import { useState, useEffect } from "react";
-import { useRouter } from "next/navigation";
+
 import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
 import { Logo } from "@/components/Logo";
 import { AmbientBackground } from "../login/AmbientBackground";
 
@@ -57,8 +57,10 @@ export default function RegisterPage() {
 
 			// Redirect to login page after successful registration
 			router.push("/login?registered=true");
-		} catch (err: any) {
-			setError(err.message || "An error occurred during registration");
+		} catch (err: unknown) {
+			const errorMessage =
+				err instanceof Error ? err.message : "An error occurred during registration";
+			setError(errorMessage);
 		} finally {
 			setIsLoading(false);
 		}
diff --git a/surfsense_web/app/settings/page.tsx b/surfsense_web/app/settings/page.tsx
index 3d797741b..18278be94 100644
--- a/surfsense_web/app/settings/page.tsx
+++ b/surfsense_web/app/settings/page.tsx
@@ -1,12 +1,11 @@
 "use client";
 
-import React from "react";
+import { ArrowLeft, Bot, Brain, Settings } from "lucide-react"; // Import ArrowLeft icon
 import { useRouter } from "next/navigation"; // Add this import
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { Separator } from "@/components/ui/separator";
-import { Bot, Settings, Brain, ArrowLeft } from "lucide-react"; // Import ArrowLeft icon
-import { ModelConfigManager } from "@/components/settings/model-config-manager";
 import { LLMRoleManager } from "@/components/settings/llm-role-manager";
+import { ModelConfigManager } from "@/components/settings/model-config-manager";
+import { Separator } from "@/components/ui/separator";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 export default function SettingsPage() {
 	const router = useRouter(); // Initialize router