diff --git a/package-lock.json b/package-lock.json
index 77273f4..dcf24d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2338,7 +2338,7 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
       "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -4977,7 +4977,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/bulk-replace": {
@@ -6368,7 +6368,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
+      "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
         "detect-libc": "bin/detect-libc.js"
@@ -8804,7 +8804,7 @@
       "version": "1.21.7",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
@@ -9024,7 +9024,7 @@
       "version": "1.28.2",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.28.2.tgz",
       "integrity": "sha512-ePLRrbt3fgjXI5VFZOLbvkLD5ZRuxGKm+wJ3ujCqBtL3NanDHPo/5zicR5uEKAPiIjBYF99BM4K4okvMznjkVA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MPL-2.0",
       "dependencies": {
         "detect-libc": "^1.0.3"
@@ -13039,7 +13039,7 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
@@ -13050,7 +13050,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -13558,7 +13558,7 @@
       "version": "5.37.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
       "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
-      "dev": true,
+      "devOptional": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -13577,7 +13577,7 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/thenify": {
@@ -13819,7 +13819,6 @@
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -14950,7 +14949,7 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
       "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
diff --git a/src/components/ui/Form.astro b/src/components/ui/Form.astro
index b8324d8..160c848 100644
--- a/src/components/ui/Form.astro
+++ b/src/components/ui/Form.astro
@@ -84,12 +84,12 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
   {
     disclaimer && (
       <div class="mt-3 flex items-start mb-6">
-        <div class="flex mt-0.5">
+        <div class="flex items-center h-5">
           <input
             id="disclaimer"
             name="disclaimer"
             type="checkbox"
-            class="cursor-pointer mt-1 py-3 px-4 block w-full text-md rounded-lg border border-gray-200 dark:border-gray-700 bg-white dark:bg-slate-900"
+            class="w-4 h-4 cursor-pointer rounded border-gray-300 dark:border-gray-600 text-blue-600 focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400 dark:bg-slate-700 dark:checked:bg-blue-600"
             required
             aria-describedby="invalid-feedback-disclaimer"
           />
@@ -163,13 +163,10 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
   <div id="manual-review-result" class="mt-4 text-center text-green-700 dark:text-green-400 font-medium"></div>
 </div>
 
-<script>
-  // TypeScript: declare the property on window
-  declare global {
-    interface Window {
-      __originalEmail?: string;
-    }
-  }
+<script define:vars={{ spamReviewConfig: spamReview }}>
+  // Make spamReview accessible in client script
+  const spamReview = spamReviewConfig || {};
+  
   async function setCsrfToken() {
     try {
       const res = await fetch('/api/contact?csrf=true');
@@ -177,7 +174,7 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
         const data = await res.json();
         const csrfInput = document.getElementById('csrf_token');
         if (csrfInput && data.csrfToken) {
-          (csrfInput as HTMLInputElement).value = data.csrfToken;
+          csrfInput.value = data.csrfToken;
         }
       }
     } catch (e) {
@@ -187,7 +184,7 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
 
   document.addEventListener('DOMContentLoaded', setCsrfToken);
 
-  const form = document.getElementById('contact-form') as HTMLFormElement | null;
+  const form = document.getElementById('contact-form');
 
   if (form) {
     form.addEventListener('submit', async (event) => {
@@ -198,14 +195,29 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
         response = await fetch('/api/contact', {
           method: 'POST',
           body: formData,
+          headers: {
+            'Accept': 'application/json',
+          },
         });
-        result = await response.json();
+        
+        // Check if response is JSON before parsing
+        const contentType = response.headers.get('content-type');
+        if (contentType && contentType.includes('application/json')) {
+          result = await response.json();
+        } else {
+          const text = await response.text();
+          throw new Error(`Unexpected response type: ${contentType || 'unknown'}. Response: ${text.substring(0, 100)}`);
+        }
         console.log('Contact API response:', result);
-      } catch (_err) {
+      } catch (err) {
         const errorElement = document.getElementById('form-error');
-        if (errorElement) errorElement.classList.remove('hidden');
         const successElement = document.getElementById('form-success');
         if (successElement) successElement.classList.add('hidden');
+        if (errorElement) {
+          errorElement.textContent = 'Network error. Please check your connection and try again.';
+          errorElement.classList.remove('hidden');
+        }
+        console.error('Form submission error:', err);
         return;
       }
 
@@ -214,8 +226,8 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
         console.log('Spam detected, showing manual review UI.');
         form.style.display = 'none';
         const spamWarning = document.getElementById('spam-warning');
-        const manualEmail = document.getElementById('manual-email') as HTMLInputElement | null;
-        const manualToken = document.getElementById('manual-token') as HTMLInputElement | null;
+        const manualEmail = document.getElementById('manual-email');
+        const manualToken = document.getElementById('manual-token');
         // Store the original email in a variable (not in the input)
         window.__originalEmail = String(formData.get('email'));
         if (spamWarning && manualEmail && manualToken) {
@@ -228,17 +240,64 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
 
       if (!response.ok) {
         const errorElement = document.getElementById('form-error');
-        if (errorElement) errorElement.classList.remove('hidden');
         const successElement = document.getElementById('form-success');
         if (successElement) successElement.classList.add('hidden');
+        
+        // Handle specific error cases
+        if (result.message && result.message.includes('Please use POST')) {
+          if (errorElement) {
+            errorElement.textContent = 'There was an error with the form submission. Please refresh the page and try again.';
+            errorElement.classList.remove('hidden');
+          }
+        } else if (result.errors) {
+          // Handle field-specific validation errors
+          if (errorElement) {
+            errorElement.textContent = 'Please check all fields and try again.';
+            errorElement.classList.remove('hidden');
+          }
+          
+          // Show field-specific errors
+          Object.keys(result.errors).forEach((fieldName) => {
+            const field = form.querySelector(`[name="${fieldName}"]`);
+            const feedback = document.getElementById(`invalid-feedback-${fieldName}`);
+            
+            if (field && feedback) {
+              field.classList.add('border-red-500');
+              feedback.textContent = result.errors[fieldName];
+              feedback.classList.remove('hidden');
+            }
+          });
+        } else if (result.error) {
+          if (errorElement) {
+            errorElement.textContent = result.error;
+            errorElement.classList.remove('hidden');
+          }
+        } else {
+          if (errorElement) {
+            errorElement.textContent = 'There was an error sending your message. Please try again.';
+            errorElement.classList.remove('hidden');
+          }
+        }
         return;
       }
 
       // Success
       const successElement = document.getElementById('form-success');
-      if (successElement) successElement.classList.remove('hidden');
+      if (successElement) {
+        successElement.textContent = result.message || 'Your message has been sent successfully. We will get back to you soon!';
+        successElement.classList.remove('hidden');
+      }
       const errorElement = document.getElementById('form-error');
       if (errorElement) errorElement.classList.add('hidden');
+      
+      // Clear any field error states
+      form.querySelectorAll('.border-red-500').forEach((el) => {
+        el.classList.remove('border-red-500');
+      });
+      form.querySelectorAll('.invalid-feedback').forEach((el) => {
+        el.classList.add('hidden');
+      });
+      
       form.reset();
       setCsrfToken();
     });
@@ -249,11 +308,11 @@ const { inputs, textarea, disclaimer, button = 'Contact us', description = '', s
   if (manualReviewForm) {
     manualReviewForm.onsubmit = async function (e) {
       e.preventDefault();
-      const manualEmail = document.getElementById('manual-email') as HTMLInputElement | null;
-      const manualJustification = document.getElementById('manual-justification') as HTMLTextAreaElement | null;
-      const manualToken = document.getElementById('manual-token') as HTMLInputElement | null;
+      const manualEmail = document.getElementById('manual-email');
+      const manualJustification = document.getElementById('manual-justification');
+      const manualToken = document.getElementById('manual-token');
       const resultDiv = document.getElementById('manual-review-result');
-      const form = document.getElementById('contact-form') as HTMLFormElement | null;
+      const form = document.getElementById('contact-form');
       const spamWarning = document.getElementById('spam-warning');
       if (!manualEmail || !manualJustification || !manualToken || !resultDiv) return;
       const email = manualEmail.value;
diff --git a/src/utils/gemini-spam-check.ts b/src/utils/gemini-spam-check.ts
index 250c4b6..7a860dc 100644
--- a/src/utils/gemini-spam-check.ts
+++ b/src/utils/gemini-spam-check.ts
@@ -10,7 +10,7 @@ export async function isSpamWithGemini(message: string): Promise<boolean> {
       console.warn('[Gemini] API key not set; skipping spam check.');
       return false;
     }
-    const model = genAI.getGenerativeModel({ model: "gemini-1.5-flash" });
+    const model = genAI.getGenerativeModel({ model: "gemini-2.5-flash" });
     const prompt = `Is the following message spam? Reply with only 'yes' or 'no'.\n\nMessage:\n${message}`;
     const result = await model.generateContent(prompt);
     const response = result.response.text().trim().toLowerCase();