diff --git a/frontend/src/app/admin/page.tsx b/frontend/src/app/admin/page.tsx
index 9bdd317..22de696 100644
--- a/frontend/src/app/admin/page.tsx
+++ b/frontend/src/app/admin/page.tsx
@@ -329,9 +329,9 @@ export default function AdminPage() {
                 </div>
                 <span className="text-zinc-400 text-sm">Total Requests</span>
               </div>
-              <div className="text-3xl font-bold">{dashboard.rate_limits.total_requests.toLocaleString()}</div>
+              <div className="text-3xl font-bold">{(dashboard.rate_limits?.total_requests ?? 0).toLocaleString()}</div>
               <div className="text-sm text-zinc-500 mt-1">
-                {dashboard.rate_limits.active_clients} active clients
+                {dashboard.rate_limits?.active_clients ?? 0} active clients
               </div>
             </div>
 
@@ -343,9 +343,9 @@ export default function AdminPage() {
                 </div>
                 <span className="text-zinc-400 text-sm">Translations</span>
               </div>
-              <div className="text-3xl font-bold">{dashboard.translations.total.toLocaleString()}</div>
+              <div className="text-3xl font-bold">{(dashboard.translations?.total ?? 0).toLocaleString()}</div>
               <div className="text-sm text-zinc-500 mt-1">
-                {dashboard.translations.success_rate}% success rate
+                {dashboard.translations?.success_rate ?? 0}% success rate
               </div>
             </div>
 
@@ -357,9 +357,9 @@ export default function AdminPage() {
                 </div>
                 <span className="text-zinc-400 text-sm">Memory Usage</span>
               </div>
-              <div className="text-3xl font-bold">{dashboard.system.memory.system_percent}%</div>
+              <div className="text-3xl font-bold">{dashboard.system?.memory?.system_percent ?? 0}%</div>
               <div className="text-sm text-zinc-500 mt-1">
-                {dashboard.system.memory.system_available_gb.toFixed(1)} GB available
+                {(dashboard.system?.memory?.system_available_gb ?? 0).toFixed(1)} GB available
               </div>
             </div>
 
@@ -371,9 +371,9 @@ export default function AdminPage() {
                 </div>
                 <span className="text-zinc-400 text-sm">Tracked Files</span>
               </div>
-              <div className="text-3xl font-bold">{dashboard.cleanup.tracked_files_count}</div>
+              <div className="text-3xl font-bold">{dashboard.cleanup?.tracked_files_count ?? 0}</div>
               <div className="text-sm text-zinc-500 mt-1">
-                {dashboard.system.disk.total_size_mb.toFixed(1)} MB total
+                {(dashboard.system?.disk?.total_size_mb ?? 0).toFixed(1)} MB total
               </div>
             </div>
           </div>
@@ -389,19 +389,19 @@ export default function AdminPage() {
               <div className="space-y-3">
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Requests per minute</span>
-                  <span className="font-medium">{dashboard.rate_limits.config.requests_per_minute}</span>
+                  <span className="font-medium">{dashboard.rate_limits?.config?.requests_per_minute ?? 0}</span>
                 </div>
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Translations per minute</span>
-                  <span className="font-medium">{dashboard.rate_limits.config.translations_per_minute}</span>
+                  <span className="font-medium">{dashboard.rate_limits?.config?.translations_per_minute ?? 0}</span>
                 </div>
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Max file size</span>
-                  <span className="font-medium">{dashboard.config.max_file_size_mb} MB</span>
+                  <span className="font-medium">{dashboard.config?.max_file_size_mb ?? 0} MB</span>
                 </div>
                 <div className="flex justify-between items-center py-2">
                   <span className="text-zinc-400">Translation service</span>
-                  <span className="font-medium capitalize">{dashboard.config.translation_service}</span>
+                  <span className="font-medium capitalize">{dashboard.config?.translation_service ?? 'N/A'}</span>
                 </div>
               </div>
             </div>
@@ -423,21 +423,21 @@ export default function AdminPage() {
               <div className="space-y-3">
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Service status</span>
-                  <span className={`font-medium ${dashboard.cleanup.is_running ? "text-green-400" : "text-red-400"}`}>
-                    {dashboard.cleanup.is_running ? "Running" : "Stopped"}
+                  <span className={`font-medium ${dashboard.cleanup?.is_running ? "text-green-400" : "text-red-400"}`}>
+                    {dashboard.cleanup?.is_running ? "Running" : "Stopped"}
                   </span>
                 </div>
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Files cleaned</span>
-                  <span className="font-medium">{dashboard.cleanup.files_cleaned_total}</span>
+                  <span className="font-medium">{dashboard.cleanup?.files_cleaned_total ?? 0}</span>
                 </div>
                 <div className="flex justify-between items-center py-2 border-b border-zinc-700/50">
                   <span className="text-zinc-400">Space freed</span>
-                  <span className="font-medium">{dashboard.cleanup.bytes_freed_total_mb.toFixed(2)} MB</span>
+                  <span className="font-medium">{(dashboard.cleanup?.bytes_freed_total_mb ?? 0).toFixed(2)} MB</span>
                 </div>
                 <div className="flex justify-between items-center py-2">
                   <span className="text-zinc-400">Cleanup runs</span>
-                  <span className="font-medium">{dashboard.cleanup.cleanup_runs}</span>
+                  <span className="font-medium">{dashboard.cleanup?.cleanup_runs ?? 0}</span>
                 </div>
               </div>
             </div>
diff --git a/frontend/src/app/auth/login/page.tsx b/frontend/src/app/auth/login/page.tsx
index 72696ac..d82239b 100644
--- a/frontend/src/app/auth/login/page.tsx
+++ b/frontend/src/app/auth/login/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, Suspense } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
 import Link from "next/link";
 import { Eye, EyeOff, Mail, Lock, ArrowRight, Loader2 } from "lucide-react";
@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
-export default function LoginPage() {
+function LoginForm() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const redirect = searchParams.get("redirect") || "/";
@@ -51,6 +51,122 @@ export default function LoginPage() {
     }
   };
 
+  return (
+    <>
+      {/* Card */}
+      <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
+        <div className="text-center mb-6">
+          <h1 className="text-2xl font-bold text-white mb-2">Welcome back</h1>
+          <p className="text-zinc-400">Sign in to continue translating</p>
+        </div>
+
+        {error && (
+          <div className="mb-4 p-3 rounded-lg bg-red-500/10 border border-red-500/20 text-red-400 text-sm">
+            {error}
+          </div>
+        )}
+
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="space-y-2">
+            <Label htmlFor="email" className="text-zinc-300">Email</Label>
+            <div className="relative">
+              <Mail className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="email"
+                type="email"
+                placeholder="you@example.com"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                required
+                className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <div className="flex items-center justify-between">
+              <Label htmlFor="password" className="text-zinc-300">Password</Label>
+              <Link href="/auth/forgot-password" className="text-sm text-teal-400 hover:text-teal-300">
+                Forgot password?
+              </Link>
+            </div>
+            <div className="relative">
+              <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="password"
+                type={showPassword ? "text" : "password"}
+                placeholder="••••••••"
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+                required
+                className="pl-10 pr-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300"
+              >
+                {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+              </button>
+            </div>
+          </div>
+
+          <Button
+            type="submit"
+            disabled={loading}
+            className="w-full bg-teal-500 hover:bg-teal-600 text-white"
+          >
+            {loading ? (
+              <Loader2 className="h-4 w-4 animate-spin" />
+            ) : (
+              <>
+                Sign In
+                <ArrowRight className="ml-2 h-4 w-4" />
+              </>
+            )}
+          </Button>
+        </form>
+
+        <div className="mt-6 text-center text-sm text-zinc-400">
+          Don&apos;t have an account?{" "}
+          <Link
+            href={`/auth/register${redirect !== "/" ? `?redirect=${redirect}` : ""}`}
+            className="text-teal-400 hover:text-teal-300"
+          >
+            Sign up for free
+          </Link>
+        </div>
+      </div>
+
+      {/* Features reminder */}
+      <div className="mt-8 text-center">
+        <p className="text-sm text-zinc-500 mb-3">Start with our free plan:</p>
+        <div className="flex flex-wrap justify-center gap-2">
+          {["5 docs/day", "10 pages/doc", "Free forever"].map((feature) => (
+            <span
+              key={feature}
+              className="px-3 py-1 rounded-full bg-zinc-800 text-zinc-400 text-xs"
+            >
+              {feature}
+            </span>
+          ))}
+        </div>
+      </div>
+    </>
+  );
+}
+
+function LoadingFallback() {
+  return (
+    <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
+      <div className="flex items-center justify-center py-8">
+        <Loader2 className="h-8 w-8 animate-spin text-teal-500" />
+      </div>
+    </div>
+  );
+}
+
+export default function LoginPage() {
   return (
     <div className="min-h-screen bg-gradient-to-b from-[#1a1a1a] to-[#262626] flex items-center justify-center p-4">
       <div className="w-full max-w-md">
@@ -64,105 +180,9 @@ export default function LoginPage() {
           </Link>
         </div>
 
-        {/* Card */}
-        <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
-          <div className="text-center mb-6">
-            <h1 className="text-2xl font-bold text-white mb-2">Welcome back</h1>
-            <p className="text-zinc-400">Sign in to continue translating</p>
-          </div>
-
-          {error && (
-            <div className="mb-4 p-3 rounded-lg bg-red-500/10 border border-red-500/20 text-red-400 text-sm">
-              {error}
-            </div>
-          )}
-
-          <form onSubmit={handleSubmit} className="space-y-4">
-            <div className="space-y-2">
-              <Label htmlFor="email" className="text-zinc-300">Email</Label>
-              <div className="relative">
-                <Mail className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="email"
-                  type="email"
-                  placeholder="you@example.com"
-                  value={email}
-                  onChange={(e) => setEmail(e.target.value)}
-                  required
-                  className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <div className="flex items-center justify-between">
-                <Label htmlFor="password" className="text-zinc-300">Password</Label>
-                <Link href="/auth/forgot-password" className="text-sm text-teal-400 hover:text-teal-300">
-                  Forgot password?
-                </Link>
-              </div>
-              <div className="relative">
-                <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="password"
-                  type={showPassword ? "text" : "password"}
-                  placeholder="••••••••"
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                  required
-                  className="pl-10 pr-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-                <button
-                  type="button"
-                  onClick={() => setShowPassword(!showPassword)}
-                  className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300"
-                >
-                  {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
-                </button>
-              </div>
-            </div>
-
-            <Button
-              type="submit"
-              disabled={loading}
-              className="w-full bg-teal-500 hover:bg-teal-600 text-white"
-            >
-              {loading ? (
-                <Loader2 className="h-4 w-4 animate-spin" />
-              ) : (
-                <>
-                  Sign In
-                  <ArrowRight className="ml-2 h-4 w-4" />
-                </>
-              )}
-            </Button>
-          </form>
-
-          <div className="mt-6 text-center text-sm text-zinc-400">
-            Don&apos;t have an account?{" "}
-            <Link
-              href={`/auth/register${redirect !== "/" ? `?redirect=${redirect}` : ""}`}
-              className="text-teal-400 hover:text-teal-300"
-            >
-              Sign up for free
-            </Link>
-          </div>
-        </div>
-
-        {/* Features reminder */}
-        <div className="mt-8 text-center">
-          <p className="text-sm text-zinc-500 mb-3">Start with our free plan:</p>
-          <div className="flex flex-wrap justify-center gap-2">
-            {["3 docs/day", "10 pages/doc", "Ollama support"].map((feature) => (
-              <span
-                key={feature}
-                className="px-3 py-1 rounded-full bg-zinc-800 text-zinc-400 text-xs"
-              >
-                {feature}
-              </span>
-            ))}
-          </div>
-        </div>
+        <Suspense fallback={<LoadingFallback />}>
+          <LoginForm />
+        </Suspense>
       </div>
     </div>
   );
diff --git a/frontend/src/app/auth/register/page.tsx b/frontend/src/app/auth/register/page.tsx
index 697adb6..c4d4ea3 100644
--- a/frontend/src/app/auth/register/page.tsx
+++ b/frontend/src/app/auth/register/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useState, Suspense } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
 import Link from "next/link";
 import { Eye, EyeOff, Mail, Lock, User, ArrowRight, Loader2 } from "lucide-react";
@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
-export default function RegisterPage() {
+function RegisterForm() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const redirect = searchParams.get("redirect") || "/";
@@ -64,6 +64,146 @@ export default function RegisterPage() {
     }
   };
 
+  return (
+    <>
+      {/* Card */}
+      <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
+        <div className="text-center mb-6">
+          <h1 className="text-2xl font-bold text-white mb-2">Create an account</h1>
+          <p className="text-zinc-400">Start translating documents for free</p>
+        </div>
+
+        {error && (
+          <div className="mb-4 p-3 rounded-lg bg-red-500/10 border border-red-500/20 text-red-400 text-sm">
+            {error}
+          </div>
+        )}
+
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="space-y-2">
+            <Label htmlFor="name" className="text-zinc-300">Full Name</Label>
+            <div className="relative">
+              <User className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="name"
+                type="text"
+                placeholder="John Doe"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                required
+                className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <Label htmlFor="email" className="text-zinc-300">Email</Label>
+            <div className="relative">
+              <Mail className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="email"
+                type="email"
+                placeholder="you@example.com"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                required
+                className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <Label htmlFor="password" className="text-zinc-300">Password</Label>
+            <div className="relative">
+              <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="password"
+                type={showPassword ? "text" : "password"}
+                placeholder="••••••••"
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+                required
+                minLength={8}
+                className="pl-10 pr-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300"
+              >
+                {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
+              </button>
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <Label htmlFor="confirmPassword" className="text-zinc-300">Confirm Password</Label>
+            <div className="relative">
+              <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
+              <Input
+                id="confirmPassword"
+                type={showPassword ? "text" : "password"}
+                placeholder="••••••••"
+                value={confirmPassword}
+                onChange={(e) => setConfirmPassword(e.target.value)}
+                required
+                className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
+              />
+            </div>
+          </div>
+
+          <Button
+            type="submit"
+            disabled={loading}
+            className="w-full bg-teal-500 hover:bg-teal-600 text-white"
+          >
+            {loading ? (
+              <Loader2 className="h-4 w-4 animate-spin" />
+            ) : (
+              <>
+                Create Account
+                <ArrowRight className="ml-2 h-4 w-4" />
+              </>
+            )}
+          </Button>
+        </form>
+
+        <div className="mt-6 text-center text-sm text-zinc-400">
+          Already have an account?{" "}
+          <Link
+            href={`/auth/login${redirect !== "/" ? `?redirect=${redirect}` : ""}`}
+            className="text-teal-400 hover:text-teal-300"
+          >
+            Sign in
+          </Link>
+        </div>
+
+        <div className="mt-6 text-center text-xs text-zinc-500">
+          By creating an account, you agree to our{" "}
+          <Link href="/terms" className="text-zinc-400 hover:text-zinc-300">
+            Terms of Service
+          </Link>{" "}
+          and{" "}
+          <Link href="/privacy" className="text-zinc-400 hover:text-zinc-300">
+            Privacy Policy
+          </Link>
+        </div>
+      </div>
+    </>
+  );
+}
+
+function LoadingFallback() {
+  return (
+    <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
+      <div className="flex items-center justify-center py-8">
+        <Loader2 className="h-8 w-8 animate-spin text-teal-500" />
+      </div>
+    </div>
+  );
+}
+
+export default function RegisterPage() {
   return (
     <div className="min-h-screen bg-gradient-to-b from-[#1a1a1a] to-[#262626] flex items-center justify-center p-4">
       <div className="w-full max-w-md">
@@ -77,129 +217,9 @@ export default function RegisterPage() {
           </Link>
         </div>
 
-        {/* Card */}
-        <div className="rounded-2xl border border-zinc-800 bg-zinc-900/50 p-8">
-          <div className="text-center mb-6">
-            <h1 className="text-2xl font-bold text-white mb-2">Create an account</h1>
-            <p className="text-zinc-400">Start translating documents for free</p>
-          </div>
-
-          {error && (
-            <div className="mb-4 p-3 rounded-lg bg-red-500/10 border border-red-500/20 text-red-400 text-sm">
-              {error}
-            </div>
-          )}
-
-          <form onSubmit={handleSubmit} className="space-y-4">
-            <div className="space-y-2">
-              <Label htmlFor="name" className="text-zinc-300">Full Name</Label>
-              <div className="relative">
-                <User className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="name"
-                  type="text"
-                  placeholder="John Doe"
-                  value={name}
-                  onChange={(e) => setName(e.target.value)}
-                  required
-                  className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="email" className="text-zinc-300">Email</Label>
-              <div className="relative">
-                <Mail className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="email"
-                  type="email"
-                  placeholder="you@example.com"
-                  value={email}
-                  onChange={(e) => setEmail(e.target.value)}
-                  required
-                  className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="password" className="text-zinc-300">Password</Label>
-              <div className="relative">
-                <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="password"
-                  type={showPassword ? "text" : "password"}
-                  placeholder="••••••••"
-                  value={password}
-                  onChange={(e) => setPassword(e.target.value)}
-                  required
-                  minLength={8}
-                  className="pl-10 pr-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-                <button
-                  type="button"
-                  onClick={() => setShowPassword(!showPassword)}
-                  className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300"
-                >
-                  {showPassword ? <EyeOff className="h-4 w-4" /> : <Eye className="h-4 w-4" />}
-                </button>
-              </div>
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="confirmPassword" className="text-zinc-300">Confirm Password</Label>
-              <div className="relative">
-                <Lock className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-zinc-500" />
-                <Input
-                  id="confirmPassword"
-                  type={showPassword ? "text" : "password"}
-                  placeholder="••••••••"
-                  value={confirmPassword}
-                  onChange={(e) => setConfirmPassword(e.target.value)}
-                  required
-                  className="pl-10 bg-zinc-800 border-zinc-700 text-white placeholder:text-zinc-500"
-                />
-              </div>
-            </div>
-
-            <Button
-              type="submit"
-              disabled={loading}
-              className="w-full bg-teal-500 hover:bg-teal-600 text-white"
-            >
-              {loading ? (
-                <Loader2 className="h-4 w-4 animate-spin" />
-              ) : (
-                <>
-                  Create Account
-                  <ArrowRight className="ml-2 h-4 w-4" />
-                </>
-              )}
-            </Button>
-          </form>
-
-          <div className="mt-6 text-center text-sm text-zinc-400">
-            Already have an account?{" "}
-            <Link
-              href={`/auth/login${redirect !== "/" ? `?redirect=${redirect}` : ""}`}
-              className="text-teal-400 hover:text-teal-300"
-            >
-              Sign in
-            </Link>
-          </div>
-
-          <div className="mt-6 text-center text-xs text-zinc-500">
-            By creating an account, you agree to our{" "}
-            <Link href="/terms" className="text-zinc-400 hover:text-zinc-300">
-              Terms of Service
-            </Link>{" "}
-            and{" "}
-            <Link href="/privacy" className="text-zinc-400 hover:text-zinc-300">
-              Privacy Policy
-            </Link>
-          </div>
-        </div>
+        <Suspense fallback={<LoadingFallback />}>
+          <RegisterForm />
+        </Suspense>
       </div>
     </div>
   );
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
index 835a5a9..5806703 100644
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -1,30 +1,15 @@
 "use client";
 
 import { FileUploader } from "@/components/file-uploader";
-import { useTranslationStore } from "@/lib/store";
-import { Badge } from "@/components/ui/badge";
-import { Settings } from "lucide-react";
-import Link from "next/link";
 import { 
   LandingHero, 
   FeaturesSection, 
   PricingPreview, 
   SelfHostCTA 
 } from "@/components/landing-sections";
+import Link from "next/link";
 
 export default function Home() {
-  const { settings } = useTranslationStore();
-
-  const providerNames: Record<string, string> = {
-    openrouter: "OpenRouter",
-    google: "Google Translate",
-    ollama: "Ollama",
-    deepl: "DeepL",
-    libre: "LibreTranslate",
-    webllm: "WebLLM",
-    openai: "OpenAI",
-  };
-
   return (
     <div className="space-y-0 -m-8">
       {/* Hero Section */}
@@ -33,28 +18,11 @@ export default function Home() {
       {/* Upload Section */}
       <div id="upload" className="px-8 py-12 bg-zinc-900/30">
         <div className="max-w-6xl mx-auto">
-          <div className="flex items-start justify-between mb-6">
-            <div>
-              <h2 className="text-2xl font-bold text-white">Translate Your Document</h2>
-              <p className="text-zinc-400 mt-1">
-                Upload and translate Excel, Word, and PowerPoint files while preserving all formatting.
-              </p>
-            </div>
-            
-            {/* Current Configuration Badge */}
-            <Link href="/settings/services" className="flex items-center gap-2 px-3 py-2 rounded-lg bg-zinc-800/50 border border-zinc-700 hover:bg-zinc-800 transition-colors">
-              <Settings className="h-4 w-4 text-zinc-400" />
-              <div className="flex items-center gap-2">
-                <Badge variant="outline" className="border-teal-500/50 text-teal-400 text-xs">
-                  {providerNames[settings.defaultProvider]}
-                </Badge>
-                {settings.defaultProvider === "ollama" && settings.ollamaModel && (
-                  <Badge variant="outline" className="border-zinc-600 text-zinc-400 text-xs">
-                    {settings.ollamaModel}
-                  </Badge>
-                )}
-              </div>
-            </Link>
+          <div className="mb-6">
+            <h2 className="text-2xl font-bold text-white">Translate Your Document</h2>
+            <p className="text-zinc-400 mt-1">
+              Upload and translate Excel, Word, and PowerPoint files while preserving all formatting.
+            </p>
           </div>
           
           <FileUploader />
@@ -81,7 +49,6 @@ export default function Home() {
           </div>
           <div className="flex items-center gap-6 text-sm text-zinc-500">
             <Link href="/pricing" className="hover:text-zinc-300">Pricing</Link>
-            <Link href="/ollama-setup" className="hover:text-zinc-300">Self-Host</Link>
             <Link href="/terms" className="hover:text-zinc-300">Terms</Link>
             <Link href="/privacy" className="hover:text-zinc-300">Privacy</Link>
           </div>
diff --git a/frontend/src/components/file-uploader.tsx b/frontend/src/components/file-uploader.tsx
index eb10242..6ac3081 100644
--- a/frontend/src/components/file-uploader.tsx
+++ b/frontend/src/components/file-uploader.tsx
@@ -323,104 +323,34 @@ export function FileUploader() {
         <CardHeader>
           <CardTitle className="text-white">Translation Options</CardTitle>
           <CardDescription>
-            Configure your translation preferences
+            Select your target language and start translating
           </CardDescription>
         </CardHeader>
         <CardContent className="space-y-6">
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-            {/* Target Language */}
-            <div className="space-y-2">
-              <Label htmlFor="language" className="text-zinc-300">Target Language</Label>
-              <Select value={targetLanguage} onValueChange={setTargetLanguage}>
-                <SelectTrigger id="language" className="bg-zinc-800 border-zinc-700 text-white">
-                  <SelectValue placeholder="Select language" />
-                </SelectTrigger>
-                <SelectContent className="bg-zinc-800 border-zinc-700">
-                  {languages.map((lang) => (
-                    <SelectItem
-                      key={lang.code}
-                      value={lang.code}
-                      className="text-white hover:bg-zinc-700"
-                    >
-                      <span className="flex items-center gap-2">
-                        <span>{lang.flag}</span>
-                        <span>{lang.name}</span>
-                      </span>
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-
-            {/* Provider */}
-            <div className="space-y-2">
-              <Label htmlFor="provider" className="text-zinc-300">Translation Provider</Label>
-              <Select value={provider} onValueChange={(value) => setProvider(value as ProviderType)}>
-                <SelectTrigger id="provider" className="bg-zinc-800 border-zinc-700 text-white">
-                  <SelectValue placeholder="Select provider" />
-                </SelectTrigger>
-                <SelectContent className="bg-zinc-800 border-zinc-700">
-                  {providers.map((prov) => (
-                    <SelectItem
-                      key={prov.id}
-                      value={prov.id}
-                      className="text-white hover:bg-zinc-700"
-                    >
-                      <span className="flex items-center gap-2">
-                        <span>{prov.icon}</span>
-                        <span>{prov.name}</span>
-                      </span>
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              {/* Warning if API key not configured */}
-              {provider === "openai" && !settings.openaiApiKey && (
-                <p className="text-xs text-amber-400 mt-1">
-                  ⚠️ OpenAI API key not configured. Go to Settings → Translation Services
-                </p>
-              )}
-              {provider === "deepl" && !settings.deeplApiKey && (
-                <p className="text-xs text-amber-400 mt-1">
-                  ⚠️ DeepL API key not configured. Go to Settings → Translation Services
-                </p>
-              )}
-              {provider === "webllm" && !webllm.isLoaded && (
-                <p className="text-xs text-amber-400 mt-1">
-                  ⚠️ WebLLM model not loaded. Go to Settings → Translation Services to load a model
-                </p>
-              )}
-              {provider === "webllm" && webllm.isLoaded && (
-                <p className="text-xs text-green-400 mt-1 flex items-center gap-1">
-                  <Cpu className="h-3 w-3" />
-                  Model ready: {webllm.currentModel}
-                </p>
-              )}
-              {provider === "webllm" && !webllm.isWebGPUSupported() && (
-                <p className="text-xs text-red-400 mt-1 flex items-center gap-1">
-                  <AlertTriangle className="h-3 w-3" />
-                  WebGPU not supported in this browser
-                </p>
-              )}
-            </div>
+          {/* Target Language */}
+          <div className="space-y-2">
+            <Label htmlFor="language" className="text-zinc-300">Target Language</Label>
+            <Select value={targetLanguage} onValueChange={setTargetLanguage}>
+              <SelectTrigger id="language" className="bg-zinc-800 border-zinc-700 text-white">
+                <SelectValue placeholder="Select language" />
+              </SelectTrigger>
+              <SelectContent className="bg-zinc-800 border-zinc-700 max-h-80">
+                {languages.map((lang) => (
+                  <SelectItem
+                    key={lang.code}
+                    value={lang.code}
+                    className="text-white hover:bg-zinc-700"
+                  >
+                    <span className="flex items-center gap-2">
+                      <span>{lang.flag}</span>
+                      <span>{lang.name}</span>
+                    </span>
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
 
-          {/* Image Translation Toggle */}
-          {(provider === "ollama" || provider === "openai") && (
-            <div className="flex items-center justify-between rounded-lg border border-zinc-800 p-4">
-              <div className="space-y-0.5">
-                <Label className="text-zinc-300">Translate Images</Label>
-                <p className="text-xs text-zinc-500">
-                  Extract and translate text from embedded images using vision model
-                </p>
-              </div>
-              <Switch
-                checked={translateImages}
-                onCheckedChange={setTranslateImages}
-              />
-            </div>
-          )}
-
           {/* Translate Button */}
           <Button
             onClick={handleTranslate}
diff --git a/frontend/src/components/landing-sections.tsx b/frontend/src/components/landing-sections.tsx
index 9bc30fd..88bd788 100644
--- a/frontend/src/components/landing-sections.tsx
+++ b/frontend/src/components/landing-sections.tsx
@@ -135,16 +135,16 @@ export function FeaturesSection() {
       color: "text-purple-400",
     },
     {
-      icon: Server,
-      title: "Self-Host Option",
-      description: "Use your own Ollama server for complete privacy and unlimited usage",
-      color: "text-orange-400",
+      icon: Sparkles,
+      title: "AI-Powered",
+      description: "Advanced neural translation for natural, context-aware results",
+      color: "text-teal-400",
     },
     {
-      icon: Sparkles,
-      title: "Multiple AI Providers",
-      description: "Choose from Google, DeepL, OpenAI, or local Ollama models",
-      color: "text-teal-400",
+      icon: Server,
+      title: "Enterprise Ready",
+      description: "API access, team management, and dedicated support for businesses",
+      color: "text-orange-400",
     },
   ];
 
@@ -186,7 +186,7 @@ export function PricingPreview() {
       name: "Free",
       price: "$0",
       description: "Perfect for trying out",
-      features: ["3 documents/day", "10 pages/doc", "Ollama only"],
+      features: ["5 documents/day", "10 pages/doc", "Basic support"],
       cta: "Get Started",
       href: "/auth/register",
     },
@@ -195,7 +195,7 @@ export function PricingPreview() {
       price: "$29",
       period: "/month",
       description: "For professionals",
-      features: ["200 documents/month", "All providers", "API access", "Priority support"],
+      features: ["200 documents/month", "Unlimited pages", "Priority support", "API access"],
       cta: "Start Free Trial",
       href: "/pricing",
       popular: true,
@@ -284,26 +284,5 @@ export function PricingPreview() {
 }
 
 export function SelfHostCTA() {
-  return (
-    <div className="py-16 px-4">
-      <div className="max-w-4xl mx-auto">
-        <div className="rounded-2xl border border-zinc-800 bg-gradient-to-r from-orange-500/10 to-amber-500/10 p-8 text-center">
-          <Server className="h-12 w-12 text-orange-400 mx-auto mb-4" />
-          <h2 className="text-2xl font-bold text-white mb-2">
-            Prefer Self-Hosting?
-          </h2>
-          <p className="text-zinc-400 mb-6 max-w-xl mx-auto">
-            Run your own Ollama server for complete privacy and unlimited translations. 
-            No API costs, no quotas, your data stays on your machine.
-          </p>
-          <Link href="/ollama-setup">
-            <Button className="bg-orange-500 hover:bg-orange-600 text-white">
-              Setup Ollama
-              <ArrowRight className="ml-2 h-4 w-4" />
-            </Button>
-          </Link>
-        </div>
-      </div>
-    </div>
-  );
+  return null; // Removed for commercial version
 }
diff --git a/frontend/src/components/sidebar.tsx b/frontend/src/components/sidebar.tsx
index 4fc4f66..99939f6 100644
--- a/frontend/src/components/sidebar.tsx
+++ b/frontend/src/components/sidebar.tsx
@@ -5,15 +5,11 @@ import { usePathname } from "next/navigation";
 import { useState, useEffect, useCallback, memo } from "react";
 import { cn } from "@/lib/utils";
 import {
-  Settings,
-  Cloud,
-  BookText,
   Upload,
   LayoutDashboard,
   LogIn,
   Crown,
   LogOut,
-  Server,
 } from "lucide-react";
 import {
   Tooltip,
@@ -37,24 +33,6 @@ const navigation = [
     icon: Upload,
     description: "Translate documents",
   },
-  {
-    name: "Translation Services",
-    href: "/settings/services",
-    icon: Cloud,
-    description: "Configure translation providers",
-  },
-  {
-    name: "Context & Glossary",
-    href: "/settings/context",
-    icon: BookText,
-    description: "System prompts and glossary",
-  },
-  {
-    name: "General Settings",
-    href: "/settings",
-    icon: Settings,
-    description: "Configure general settings",
-  },
 ];
 
 const planColors: Record<string, string> = {
@@ -230,29 +208,6 @@ export function Sidebar() {
               )}
             </div>
           )}
-
-          {/* Self-Host Option */}
-          <div className="mt-4 pt-4 border-t border-zinc-800">
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Link
-                  href="/ollama-setup"
-                  className={cn(
-                    "flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-colors",
-                    pathname === "/ollama-setup"
-                      ? "bg-orange-500/10 text-orange-400"
-                      : "text-zinc-400 hover:bg-zinc-800 hover:text-zinc-100"
-                  )}
-                >
-                  <Server className="h-5 w-5" />
-                  <span>Self-Host (Free)</span>
-                </Link>
-              </TooltipTrigger>
-              <TooltipContent side="right">
-                <p>Run your own Ollama for unlimited free translations</p>
-              </TooltipContent>
-            </Tooltip>
-          </div>
         </nav>
 
         {/* User section at bottom */}