diff --git a/backend/api/__pycache__/functions.cpython-313.pyc b/backend/api/__pycache__/functions.cpython-313.pyc
index f2d42fc..06ce5f8 100644
Binary files a/backend/api/__pycache__/functions.cpython-313.pyc and b/backend/api/__pycache__/functions.cpython-313.pyc differ
diff --git a/backend/api/__pycache__/views.cpython-313.pyc b/backend/api/__pycache__/views.cpython-313.pyc
index cd31048..b4d9b59 100644
Binary files a/backend/api/__pycache__/views.cpython-313.pyc and b/backend/api/__pycache__/views.cpython-313.pyc differ
diff --git a/backend/api/functions.py b/backend/api/functions.py
index 8561600..3c579a8 100644
--- a/backend/api/functions.py
+++ b/backend/api/functions.py
@@ -66,7 +66,7 @@ def generate_waf_rule(cve_id: str, description: str, severity: str, mode: str, w
         description (str): CVE description
         severity (str): CVSS/impact level
         mode (str): "JSON" or "cURL"
-        waf (str): Target WAF provider ("AWS", "Azure", "GCP", "Cloudflare")
+        waf (str): Target WAF provider ("AWS", "Azure", "GCP", "Cloudflare", "Akamai", "Imperva")
     Returns:
         dict: { "waf_rule": ... }
     """
@@ -154,5 +154,5 @@ def generate_testing_code(cve_id: str, description: str, severity: str):
     sample_cve_id = "CVE-2025-26000"
     sample_description = "A vulnerability in the Python library 'requests' allows attackers to execute arbitrary code via a crafted HTTP request."
     sample_severity = "High"
-    result = generate_exploit(sample_cve_id, sample_description, sample_severity)
+    result = generate_testing_code(sample_cve_id, sample_description, sample_severity)
     print(result)
diff --git a/backend/api/views.py b/backend/api/views.py
index 4e856ac..c1c2f59 100644
--- a/backend/api/views.py
+++ b/backend/api/views.py
@@ -114,8 +114,17 @@ def post(self, request):
                     }
                 }, status=status.HTTP_201_CREATED)
         else:
+            # Format validation errors for better frontend handling
+            formatted_errors = {}
+            for field, errors in serializer.errors.items():
+                if isinstance(errors, list):
+                    formatted_errors[field] = [str(error) for error in errors]
+                else:
+                    formatted_errors[field] = [str(errors)]
+            
             return Response({
-                "message": f"User Not Created {serializer.errors}"
+                "message": "User registration failed",
+                "errors": formatted_errors
             }, status=status.HTTP_400_BAD_REQUEST)
     
     def _store_cve_data_for_user(self, user):
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index a3c851f..e473907 100644
Binary files a/backend/db.sqlite3 and b/backend/db.sqlite3 differ
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index e4690c1..02db82e 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useState } from "react"
+import { useState, useEffect } from "react"
 import { useRouter } from "next/navigation"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -14,12 +14,25 @@ export default function LoginPage() {
   const [password, setPassword] = useState("")
   const [error, setError] = useState("")
   const [loading, setLoading] = useState(false)
-  const { login } = useAuth()
+  const { login, isAuthenticated, loading: authLoading } = useAuth()
   const router = useRouter()
 
+  // Redirect if already authenticated
+  useEffect(() => {
+    if (!authLoading && isAuthenticated) {
+      router.push("/dashboard")
+    }
+  }, [isAuthenticated, authLoading, router])
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     setError("")
+    
+    // Prevent multiple login attempts
+    if (loading) {
+      return
+    }
+    
     setLoading(true)
 
     try {
@@ -27,18 +40,40 @@ export default function LoginPage() {
       if (result.success) {
         // Add a small delay to ensure authentication state is properly set
         setTimeout(() => {
-          router.push("/dashboard")
+          try {
+            router.push("/dashboard")
+          } catch (navigationError) {
+            console.error("Navigation error:", navigationError)
+            // If navigation fails, the useEffect will handle the redirect
+          }
         }, 100)
       } else {
-        setError(result.error || "Login failed")
+        setError(result.error || "Login failed. Please check your credentials and try again.")
       }
     } catch (err) {
-      setError("An unexpected error occurred")
+      console.error("Login error:", err)
+      setError("An unexpected error occurred. Please try again later.")
     } finally {
       setLoading(false)
     }
   }
 
+  // Show loading state while checking authentication
+  if (authLoading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center bg-black">
+        <Card className="w-full max-w-md">
+          <CardContent className="flex items-center justify-center py-8">
+            <div className="flex flex-col items-center gap-2">
+              <div className="h-8 w-8 animate-spin rounded-full border-2 border-gray-300 border-t-gray-600"></div>
+              <p className="text-sm text-muted-foreground">Checking authentication...</p>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+    )
+  }
+
   return (
     <div className="min-h-screen flex items-center justify-center bg-black">
       <Card className="w-full max-w-md">
@@ -73,7 +108,9 @@ export default function LoginPage() {
               />
             </div>
             {error && (
-              <div className="text-red-600 text-sm text-center">{error}</div>
+              <div className="bg-red-50 border border-red-200 rounded-lg p-3">
+                <div className="text-red-800 text-sm text-center">{error}</div>
+              </div>
             )}
             <Button
               type="submit"
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
index 3631fc2..60c4f96 100644
--- a/frontend/app/page.tsx
+++ b/frontend/app/page.tsx
@@ -30,7 +30,7 @@ export default function LandingPage() {
     {
       icon: Code,
       title: "WAF Rule Generation",
-      description: "Automatically generate WAF rules for AWS, Azure, GCP, and Cloudflare to protect your applications."
+      description: "Automatically generate WAF rules for AWS, Azure, GCP, Cloudflare, Akamai, and Imperva to protect your applications."
     },
     {
       icon: BarChart3,
@@ -48,7 +48,9 @@ export default function LandingPage() {
     { name: "AWS WAF", icon: Cloud, color: "bg-amber-800" },
     { name: "Azure Front Door", icon: Cloud, color: "bg-amber-800" },
     { name: "Google Cloud Armor", icon: Cloud, color: "bg-amber-800" },
-    { name: "Cloudflare", icon: Cloud, color: "bg-amber-800" }
+    { name: "Cloudflare", icon: Cloud, color: "bg-amber-800" },
+    { name: "Akamai", icon: Cloud, color: "bg-amber-800" },
+    { name: "Imperva", icon: Cloud, color: "bg-amber-800" }
   ]
 
   const benefits = [
diff --git a/frontend/app/register/page.tsx b/frontend/app/register/page.tsx
index e36b565..8d92d69 100644
--- a/frontend/app/register/page.tsx
+++ b/frontend/app/register/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useState } from "react"
+import { useState, useEffect } from "react"
 import { useRouter } from "next/navigation"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -15,12 +15,25 @@ export default function RegisterPage() {
   const [email, setEmail] = useState("")
   const [error, setError] = useState("")
   const [loading, setLoading] = useState(false)
-  const { register } = useAuth()
+  const { register, isAuthenticated, loading: authLoading } = useAuth()
   const router = useRouter()
 
+  // Redirect if already authenticated
+  useEffect(() => {
+    if (!authLoading && isAuthenticated) {
+      router.push("/dashboard")
+    }
+  }, [isAuthenticated, authLoading, router])
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     setError("")
+    
+    // Prevent multiple registration attempts
+    if (loading) {
+      return
+    }
+    
     setLoading(true)
 
     try {
@@ -28,18 +41,40 @@ export default function RegisterPage() {
       if (result.success) {
         // Add a small delay to ensure authentication state is properly set
         setTimeout(() => {
-          router.push("/dashboard")
+          try {
+            router.push("/dashboard")
+          } catch (navigationError) {
+            console.error("Navigation error:", navigationError)
+            // If navigation fails, the useEffect will handle the redirect
+          }
         }, 100)
       } else {
-        setError(result.error || "Registration failed")
+        setError(result.error || "Registration failed. Please try again.")
       }
     } catch (err) {
-      setError("An unexpected error occurred")
+      console.error("Registration error:", err)
+      setError("An unexpected error occurred. Please try again later.")
     } finally {
       setLoading(false)
     }
   }
 
+  // Show loading state while checking authentication
+  if (authLoading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center bg-black">
+        <Card className="w-full max-w-md">
+          <CardContent className="flex items-center justify-center py-8">
+            <div className="flex flex-col items-center gap-2">
+              <div className="h-8 w-8 animate-spin rounded-full border-2 border-gray-300 border-t-gray-600"></div>
+              <p className="text-sm text-muted-foreground">Checking authentication...</p>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+    )
+  }
+
   return (
     <div className="min-h-screen flex items-center justify-center bg-black">
       <Card className="w-full max-w-md">
@@ -84,7 +119,9 @@ export default function RegisterPage() {
               />
             </div>
             {error && (
-              <div className="text-red-600 text-sm text-center">{error}</div>
+              <div className="bg-red-50 border border-red-200 rounded-lg p-3">
+                <div className="text-red-800 text-sm text-center">{error}</div>
+              </div>
             )}
             <Button
               type="submit"
diff --git a/frontend/components/cve-data-table.tsx b/frontend/components/cve-data-table.tsx
index 85f79f7..2ced0f6 100644
--- a/frontend/components/cve-data-table.tsx
+++ b/frontend/components/cve-data-table.tsx
@@ -983,6 +983,8 @@ function TableCellViewer({ item, onUpdateStatus }: { item: CVE; onUpdateStatus:
                             <SelectItem value="aws">AWS WAF</SelectItem>
                             <SelectItem value="gcp">GCP Cloud Armor</SelectItem>
                             <SelectItem value="cloudflare">Cloudflare</SelectItem>
+                            <SelectItem value="akamai">Akamai</SelectItem>
+                            <SelectItem value="imperva">Imperva</SelectItem>
                           </SelectContent>
                         </Select>
                       </div>
diff --git a/frontend/hooks/use-auth.ts b/frontend/hooks/use-auth.ts
index cf29323..bfacf99 100644
--- a/frontend/hooks/use-auth.ts
+++ b/frontend/hooks/use-auth.ts
@@ -75,6 +75,11 @@ export function useAuth() {
   }, [])
 
   const login = useCallback(async (username: string, password: string) => {
+    // Prevent login if already authenticated
+    if (authState.isAuthenticated) {
+      return { success: true, message: 'Already logged in' }
+    }
+    
     try {
       const response = await fetch('http://localhost:8000/api/auth/login/', {
         method: 'POST',
@@ -85,12 +90,30 @@ export function useAuth() {
       })
 
       if (!response.ok) {
-        const errorData = await response.json()
-        throw new Error(errorData.error || 'Login failed')
+        let errorMessage = 'Login failed'
+        try {
+          const errorData = await response.json()
+          errorMessage = errorData.error || errorMessage
+        } catch (parseError) {
+          // If we can't parse the error response, use a generic message
+          if (response.status === 401) {
+            errorMessage = 'Invalid username or password'
+          } else if (response.status === 500) {
+            errorMessage = 'Server error. Please try again later.'
+          } else {
+            errorMessage = `Login failed (${response.status})`
+          }
+        }
+        return { success: false, error: errorMessage }
       }
 
       const data = await response.json()
       
+      // Validate response data
+      if (!data.access_token || !data.refresh_token || !data.user) {
+        return { success: false, error: 'Invalid response from server' }
+      }
+      
       // Store tokens and user data
       localStorage.setItem('auth_tokens', JSON.stringify({
         access_token: data.access_token,
@@ -113,7 +136,7 @@ export function useAuth() {
       console.error('Login error:', error)
       return { success: false, error: error instanceof Error ? error.message : 'Login failed' }
     }
-  }, [])
+  }, [authState.isAuthenticated])
 
   const register = useCallback(async (username: string, password: string, email?: string) => {
     try {
@@ -126,12 +149,102 @@ export function useAuth() {
       })
 
       if (!response.ok) {
-        const errorData = await response.json()
-        throw new Error(errorData.message || 'Registration failed')
+        let errorMessage = 'Registration failed'
+        try {
+          const errorData = await response.json()
+          
+          // Handle Django validation errors
+          if (errorData.errors) {
+            // New format from improved backend
+            if (errorData.errors.username && Array.isArray(errorData.errors.username)) {
+              const usernameError = errorData.errors.username[0]
+              if (usernameError.includes('already exists')) {
+                errorMessage = 'This username is already taken. Please choose a different one.'
+              } else {
+                errorMessage = usernameError
+              }
+            } else if (errorData.errors.email && Array.isArray(errorData.errors.email)) {
+              const emailError = errorData.errors.email[0]
+              if (emailError.includes('already exists')) {
+                errorMessage = 'This email is already registered. Please use a different email or try logging in.'
+              } else {
+                errorMessage = emailError
+              }
+            } else if (errorData.errors.password && Array.isArray(errorData.errors.password)) {
+              const passwordError = errorData.errors.password[0]
+              if (passwordError.includes('too common')) {
+                errorMessage = 'This password is too common. Please choose a stronger password.'
+              } else if (passwordError.includes('too short')) {
+                errorMessage = 'Password is too short. Please choose a longer password.'
+              } else {
+                errorMessage = passwordError
+              }
+            } else {
+              // Get the first error from any field
+              const firstField = Object.keys(errorData.errors)[0]
+              if (firstField && Array.isArray(errorData.errors[firstField])) {
+                errorMessage = errorData.errors[firstField][0]
+              }
+            }
+          } else if (errorData.username && Array.isArray(errorData.username)) {
+            // Legacy format
+            const usernameError = errorData.username[0]
+            if (usernameError && usernameError.includes('already exists')) {
+              errorMessage = 'This username is already taken. Please choose a different one.'
+            } else {
+              errorMessage = usernameError || 'Username already exists'
+            }
+          } else if (errorData.email && Array.isArray(errorData.email)) {
+            const emailError = errorData.email[0]
+            if (emailError && emailError.includes('already exists')) {
+              errorMessage = 'This email is already registered. Please use a different email or try logging in.'
+            } else {
+              errorMessage = emailError || 'Email already exists'
+            }
+          } else if (errorData.password && Array.isArray(errorData.password)) {
+            const passwordError = errorData.password[0]
+            if (passwordError && passwordError.includes('too common')) {
+              errorMessage = 'This password is too common. Please choose a stronger password.'
+            } else if (passwordError && passwordError.includes('too short')) {
+              errorMessage = 'Password is too short. Please choose a longer password.'
+            } else {
+              errorMessage = passwordError || 'Password validation failed'
+            }
+          } else if (errorData.message) {
+            errorMessage = errorData.message
+          } else if (errorData.error) {
+            errorMessage = errorData.error
+          } else {
+            // Handle non-array validation errors
+            if (typeof errorData === 'object') {
+              const firstError = Object.values(errorData)[0]
+              if (Array.isArray(firstError) && firstError.length > 0) {
+                errorMessage = firstError[0]
+              } else if (typeof firstError === 'string') {
+                errorMessage = firstError
+              }
+            }
+          }
+        } catch (parseError) {
+          // If we can't parse the error response, use a generic message
+          if (response.status === 400) {
+            errorMessage = 'Invalid registration data. Please check your input.'
+          } else if (response.status === 500) {
+            errorMessage = 'Server error. Please try again later.'
+          } else {
+            errorMessage = `Registration failed (${response.status})`
+          }
+        }
+        return { success: false, error: errorMessage }
       }
 
       const data = await response.json()
       
+      // Validate response data
+      if (!data.access_token || !data.refresh_token || !data.user) {
+        return { success: false, error: 'Invalid response from server' }
+      }
+      
       // Store tokens and user data
       localStorage.setItem('auth_tokens', JSON.stringify({
         access_token: data.access_token,