diff --git a/app/blog/page.tsx b/app/blog/page.tsx
index 319bd83..0a61126 100644
--- a/app/blog/page.tsx
+++ b/app/blog/page.tsx
@@ -10,6 +10,9 @@ export const metadata: Metadata = {
   title: 'Blog | Frontend Development Insights & Tutorials',
   description:
     'Deep dives into frontend development, performance optimization, React patterns, CSS techniques, and industry best practices from the Frontend Junction community.',
+  alternates: {
+    canonical: 'https://www.frontend-junction.com/blog',
+  },
 };
 
 const POSTS_PER_PAGE = 6; // Changed to 6 for better grid (2x3)
diff --git a/app/companies/[company]/page.tsx b/app/companies/[company]/page.tsx
index f061e25..ef50e7b 100644
--- a/app/companies/[company]/page.tsx
+++ b/app/companies/[company]/page.tsx
@@ -6,8 +6,7 @@ import { Metadata } from 'next';
 import Script from 'next/script';
 import { FaCalendar, FaUser } from 'react-icons/fa';
 
-export const dynamic = 'force-dynamic';
-export const revalidate = 600; // Cache for 10 minutes
+export const revalidate = 600; // ISR: revalidate every 10 minutes
 
 interface Props {
   params: Promise<{ company: string }>;
@@ -32,6 +31,9 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
       `${companyName} software engineer interview`,
       `${companyName} react interview`,
     ],
+    alternates: {
+      canonical: `https://www.frontend-junction.com/companies/${company}`,
+    },
     openGraph: {
       title: `${companyName} Frontend Interview Experiences`,
       description: `Browse real ${companyName} frontend engineer interview experiences.`,
diff --git a/app/companies/page.tsx b/app/companies/page.tsx
index 86a82db..096f8d5 100644
--- a/app/companies/page.tsx
+++ b/app/companies/page.tsx
@@ -3,13 +3,15 @@ import Link from 'next/link';
 import { Metadata } from 'next';
 import Script from 'next/script';
 
-export const dynamic = 'force-dynamic';
-export const revalidate = 3600; // Cache for 1 hour
+export const revalidate = 3600; // ISR: revalidate every 1 hour
 
 export const metadata: Metadata = {
   title: 'Top Companies for Frontend Interviews | Frontend Junction',
   description:
     'Browse frontend interview experiences by company. Prepare for your next interview at Google, Amazon, Uber, and more.',
+  alternates: {
+    canonical: 'https://www.frontend-junction.com/companies',
+  },
   openGraph: {
     title: 'Top Companies for Frontend Interviews',
     description:
diff --git a/app/error.tsx b/app/error.tsx
new file mode 100644
index 0000000..724a910
--- /dev/null
+++ b/app/error.tsx
@@ -0,0 +1,36 @@
+'use client';
+
+import Link from 'next/link';
+
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  return (
+    <div className='container mx-auto flex min-h-[60vh] flex-col items-center justify-center px-4 text-center'>
+      <h1 className='text-5xl font-black text-destructive mb-4'>Oops!</h1>
+      <h2 className='text-xl font-bold mb-2'>Something went wrong</h2>
+      <p className='text-muted-foreground mb-8 max-w-md'>
+        An unexpected error occurred. Please try again or navigate to another
+        page.
+      </p>
+      <div className='flex flex-wrap gap-4 justify-center'>
+        <button
+          onClick={reset}
+          className='px-6 py-3 rounded-lg bg-primary text-primary-foreground font-semibold hover:opacity-90 transition-opacity'
+        >
+          Try Again
+        </button>
+        <Link
+          href='/'
+          className='px-6 py-3 rounded-lg border border-border font-semibold hover:bg-accent transition-colors'
+        >
+          Go Home
+        </Link>
+      </div>
+    </div>
+  );
+}
diff --git a/app/interview-experience/[slug]/page.tsx b/app/interview-experience/[slug]/page.tsx
index 0523170..11e5a39 100644
--- a/app/interview-experience/[slug]/page.tsx
+++ b/app/interview-experience/[slug]/page.tsx
@@ -1,4 +1,5 @@
 import { getExperienceBySlug } from '@/lib/getExperienceBySlug';
+import { sanitizeHtml } from '@/lib/sanitize-html';
 import { notFound } from 'next/navigation';
 import Link from 'next/link';
 import { FaExternalLinkAlt, FaCalendar, FaUser } from 'react-icons/fa';
@@ -7,8 +8,7 @@ import ReactMarkdown from 'react-markdown';
 import ViewCounter from '@/components/view-counter';
 import Script from 'next/script';
 
-export const dynamic = 'force-dynamic';
-export const revalidate = 60; // ISR
+export const revalidate = 60; // ISR: revalidate every 60 seconds
 
 interface Props {
   params: Promise<{ slug: string }>;
@@ -202,7 +202,7 @@ export default async function ExperienceSlugPage({ params }: Props) {
           {/* Content Analysis (AI Generated or Raw) */}
           <div className='prose prose-lg dark:prose-invert max-w-none prose-headings:font-bold prose-headings:text-foreground prose-p:text-muted-foreground prose-strong:text-foreground prose-a:text-primary hover:prose-a:underline prose-img:rounded-xl'>
             {experience.content?.trim().startsWith('<') ? (
-              <div dangerouslySetInnerHTML={{ __html: experience.content }} />
+              <div dangerouslySetInnerHTML={{ __html: sanitizeHtml(experience.content) }} />
             ) : (
               <ReactMarkdown>
                 {experience.content || experience.summary || ''}
diff --git a/app/interview-experience/page.tsx b/app/interview-experience/page.tsx
index 0d0f2df..689501b 100644
--- a/app/interview-experience/page.tsx
+++ b/app/interview-experience/page.tsx
@@ -8,21 +8,23 @@ import { Suspense } from 'react';
 import Loading from '../loading';
 
 export const dynamic = 'force-dynamic';
-export const revalidate = 0;
 
 export const metadata: Metadata = {
-  title: 'Interview Experience',
+  title: 'Frontend Interview Experiences | Real Stories from Top Companies',
   description:
-    'Browse through real front-end interview experiences from candidates at various companies. Get insights, tips, and prepare better for your next interview.',
+    'Browse 400+ real frontend interview experiences from Google, Amazon, Meta, Flipkart, and more. Get insights, tips, and prepare better for your next interview.',
   keywords:
-    'front-end interview experiences, front-end developer interviews, front-end interview preparation, front-end interview insights, front-end interview stories',
+    'frontend interview experiences, frontend developer interviews, frontend interview preparation, frontend interview insights, frontend interview stories',
+  alternates: {
+    canonical: 'https://www.frontend-junction.com/interview-experience',
+  },
   openGraph: {
     type: 'website',
     url: 'https://www.frontend-junction.com/interview-experience',
-    title: 'Front-end Interview Experiences | Front-end Junction',
+    title: 'Frontend Interview Experiences | Real Stories from Top Companies',
     description:
-      'Browse through real front-end interview experiences from candidates at various companies. Get insights, tips, and prepare better for your next interview.',
-    siteName: 'Front-end Junction',
+      'Browse 400+ real frontend interview experiences from Google, Amazon, Meta, Flipkart, and more.',
+    siteName: 'Frontend Junction',
   },
 };
 
diff --git a/app/layout.tsx b/app/layout.tsx
index a919598..7d1983e 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,5 +1,6 @@
 import './globals.css';
 import type { Metadata } from 'next';
+import { Inter } from 'next/font/google';
 import { cn } from '@/lib/utils';
 import { SiteHeader } from '@/components/common/site-header';
 import { ThemeProvider } from '@/components/common/theme-provider';
@@ -13,6 +14,12 @@ import {
 } from '@/components/structured-data';
 import { Analytics } from '@vercel/analytics/next';
 
+const inter = Inter({
+  subsets: ['latin'],
+  display: 'swap',
+  variable: '--font-inter',
+});
+
 export const metadata: Metadata = {
   metadataBase: new URL('https://www.frontend-junction.com'),
   title: {
@@ -99,12 +106,12 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang='en' suppressHydrationWarning>
+    <html lang='en' suppressHydrationWarning className={inter.variable}>
       <head>
         <meta name='google-adsense-account' content='ca-pub-4467873688771542' />
         <Script
           id='google-adsense'
-          strategy='beforeInteractive'
+          strategy='lazyOnload'
           async
           src='https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-4467873688771542'
           crossOrigin='anonymous'
@@ -112,17 +119,6 @@ export default function RootLayout({
         {/* Structured Data */}
         <OrganizationSchema />
         <WebsiteSchema />
-        <link rel='preconnect' href='https://fonts.googleapis.com' />
-        <link
-          rel='preconnect'
-          href='https://fonts.gstatic.com'
-          crossOrigin='anonymous'
-        />
-        {/* eslint-disable-next-line @next/next/no-page-custom-font */}
-        <link
-          href='https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800;900&display=swap'
-          rel='stylesheet'
-        />
       </head>
       {process.env.NEXT_GOOGLE_ANALYTICS && (
         <Script
@@ -144,7 +140,7 @@ export default function RootLayout({
           }}
         />
       )}
-      <body className={cn('font-sans antialiased')}>
+      <body className={cn('font-sans antialiased', inter.className)}>
         {/* Skip to main content - Accessibility */}
         <a
           href='#main-content'
diff --git a/app/not-found.tsx b/app/not-found.tsx
new file mode 100644
index 0000000..33d32be
--- /dev/null
+++ b/app/not-found.tsx
@@ -0,0 +1,40 @@
+import Link from 'next/link';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Page Not Found | Frontend Junction',
+  description: 'The page you are looking for does not exist.',
+};
+
+export default function NotFound() {
+  return (
+    <div className='container mx-auto flex min-h-[60vh] flex-col items-center justify-center px-4 text-center'>
+      <h1 className='text-6xl font-black text-primary mb-4'>404</h1>
+      <h2 className='text-2xl font-bold mb-2'>Page Not Found</h2>
+      <p className='text-muted-foreground mb-8 max-w-md'>
+        The page you&apos;re looking for doesn&apos;t exist or has been moved.
+        Check out our latest interview experiences or blog posts instead.
+      </p>
+      <div className='flex flex-wrap gap-4 justify-center'>
+        <Link
+          href='/interview-experience'
+          className='px-6 py-3 rounded-lg bg-primary text-primary-foreground font-semibold hover:opacity-90 transition-opacity'
+        >
+          Browse Experiences
+        </Link>
+        <Link
+          href='/blog'
+          className='px-6 py-3 rounded-lg border border-border font-semibold hover:bg-accent transition-colors'
+        >
+          Read Blog
+        </Link>
+        <Link
+          href='/companies'
+          className='px-6 py-3 rounded-lg border border-border font-semibold hover:bg-accent transition-colors'
+        >
+          View Companies
+        </Link>
+      </div>
+    </div>
+  );
+}
diff --git a/app/sitemap.ts b/app/sitemap.ts
index 80fa379..a9a4a8b 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -50,7 +50,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
 
   try {
     const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
-    const supabaseKey = process.env.SUPABASE_SERVICE_ROLE_KEY;
+    // Use service role key if available, fall back to anon key
+    const supabaseKey =
+      process.env.SUPABASE_SERVICE_ROLE_KEY ||
+      process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
 
     // Fetch Companies
     const companies = await getCompanies();
@@ -67,12 +70,17 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
       const supabase = createClient(supabaseUrl, supabaseKey);
 
       // Fetch scraped experiences with slugs
-      const { data: scrapedExperiences } = await supabase
+      const { data: scrapedExperiences, error: scrapedError } = await supabase
         .from('scraped_experiences')
         .select('slug, updated_at')
+        .eq('status', 'approved')
         .not('slug', 'is', null)
         .order('updated_at', { ascending: false })
-        .limit(500);
+        .limit(1000);
+
+      if (scrapedError) {
+        console.error('[Sitemap] Error fetching scraped experiences:', scrapedError.message);
+      }
 
       if (scrapedExperiences) {
         experiencePages = scrapedExperiences.map((exp) => ({
@@ -84,12 +92,16 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
       }
 
       // Fetch user-submitted experiences
-      const { data: userExperiences } = await supabase
+      const { data: userExperiences, error: userError } = await supabase
         .from('new_interview')
         .select('slug, updated_at')
         .not('slug', 'is', null)
         .order('updated_at', { ascending: false })
-        .limit(200);
+        .limit(500);
+
+      if (userError) {
+        console.error('[Sitemap] Error fetching user experiences:', userError.message);
+      }
 
       if (userExperiences) {
         experiencePages = [
@@ -102,6 +114,12 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
           })),
         ];
       }
+
+      console.log(
+        `[Sitemap] Generated ${experiencePages.length} experience URLs, ${companyPages.length} company URLs, ${blogPages.length} blog URLs`
+      );
+    } else {
+      console.warn('[Sitemap] Missing Supabase credentials — experience pages will not be included');
     }
   } catch (error) {
     console.error('[Sitemap] Error fetching data:', error);
diff --git a/app/tags/page.tsx b/app/tags/page.tsx
index 8eb0c70..f7d6908 100644
--- a/app/tags/page.tsx
+++ b/app/tags/page.tsx
@@ -4,8 +4,12 @@ import { posts } from '#site/content';
 import { Tag } from '@/components/tag';
 
 export const metadata: Metadata = {
-  title: 'Tags',
-  description: "Topic I've written about",
+  title: 'Tags | Browse All Frontend Topics',
+  description:
+    'Browse all frontend development topics — React, JavaScript, CSS, Next.js, TypeScript, and more. Find articles and guides by tag.',
+  alternates: {
+    canonical: 'https://www.frontend-junction.com/tags',
+  },
 };
 
 export default async function TagsPage() {
diff --git a/components/add-new-experience.tsx b/components/add-new-experience.tsx
index ae9a86d..e38ec9b 100644
--- a/components/add-new-experience.tsx
+++ b/components/add-new-experience.tsx
@@ -151,7 +151,7 @@ const InterviewExperienceForm: React.FC = () => {
     setFormSubmitAttempted(true);
 
     if (validateForm()) {
-      console.log('Form submitted:', formData);
+
       setIsLoading(true); // Set loading to true when the request starts
 
       try {
diff --git a/components/common/footer.tsx b/components/common/footer.tsx
index e56234e..b876e77 100644
--- a/components/common/footer.tsx
+++ b/components/common/footer.tsx
@@ -63,7 +63,7 @@ export default function FooterComponent() {
             <h4 className='font-semibold mb-4 text-foreground'>Community</h4>
             <div className='flex gap-4'>
               <a
-                href='https://github.com/depaksharma'
+                href='https://github.com/deepu0'
                 target='_blank'
                 rel='noopener noreferrer'
                 className='text-muted-foreground hover:text-white transition-colors'
@@ -72,7 +72,7 @@ export default function FooterComponent() {
                 <FaGithub size={20} />
               </a>
               <a
-                href='https://twitter.com'
+                href='https://twitter.com/frontendjunction'
                 target='_blank'
                 rel='noopener noreferrer'
                 className='text-muted-foreground hover:text-[#1DA1F2] transition-colors'
diff --git a/components/session-provider.tsx b/components/session-provider.tsx
index 8e26e60..d3dd470 100644
--- a/components/session-provider.tsx
+++ b/components/session-provider.tsx
@@ -88,7 +88,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     const {
       data: { subscription },
     } = supabase.auth.onAuthStateChange(async (event: any, newSession: any) => {
-      console.log('[Auth] State changed:', event);
+
 
       if (!mounted) return;
 
diff --git a/config/site.ts b/config/site.ts
index 7fbf3a8..4c4a5ae 100644
--- a/config/site.ts
+++ b/config/site.ts
@@ -1,10 +1,11 @@
 export const siteConfig = {
   name: 'Frontend Junction',
   url: 'https://www.frontend-junction.com/',
-  description: 'Interview experience frontend, Frontend interview preparation',
-  author: 'Sharmag',
+  description:
+    'Your hub for frontend interview experiences, preparation guides, and developer jobs at top tech companies.',
+  author: 'Deepak Sharma',
   links: {
-    twitter: 'https://twitter.com/sharmag',
+    twitter: 'https://twitter.com/frontendjunction',
     github: 'https://github.com/deepu0',
     linkedin: 'https://www.linkedin.com/in/depaksharma/',
   },
diff --git a/lib/sanitize-html.ts b/lib/sanitize-html.ts
new file mode 100644
index 0000000..de2a201
--- /dev/null
+++ b/lib/sanitize-html.ts
@@ -0,0 +1,30 @@
+/**
+ * Basic HTML sanitizer for user-generated content.
+ * Strips <script>, <iframe>, event handlers (onclick, onerror, etc.),
+ * javascript: URIs, and data: URIs from HTML strings.
+ *
+ * For a production-grade solution, consider using DOMPurify on the client
+ * or sanitize-html on the server.
+ */
+export function sanitizeHtml(html: string): string {
+  if (!html) return '';
+
+  return (
+    html
+      // Remove <script> tags and contents
+      .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
+      // Remove <iframe> tags
+      .replace(/<iframe\b[^>]*>[\s\S]*?<\/iframe>/gi, '')
+      // Remove <object>, <embed>, <applet> tags
+      .replace(/<(object|embed|applet)\b[^>]*>[\s\S]*?<\/\1>/gi, '')
+      // Remove event handlers (onclick, onerror, onload, etc.)
+      .replace(/\s+on\w+\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]*)/gi, '')
+      // Remove javascript: URIs
+      .replace(/href\s*=\s*["']?\s*javascript\s*:/gi, 'href="')
+      // Remove data: URIs in src attributes (except images)
+      .replace(
+        /src\s*=\s*["']?\s*data\s*:(?!image\/)/gi,
+        'src="data:removed'
+      )
+  );
+}
diff --git a/next.config.mjs b/next.config.mjs
index b17a400..031edd3 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -18,6 +18,27 @@ export default {
   },
   async headers() {
     return [
+      {
+        source: '/:path*',
+        headers: [
+          {
+            key: 'X-Content-Type-Options',
+            value: 'nosniff',
+          },
+          {
+            key: 'X-Frame-Options',
+            value: 'DENY',
+          },
+          {
+            key: 'X-DNS-Prefetch-Control',
+            value: 'on',
+          },
+          {
+            key: 'Referrer-Policy',
+            value: 'origin-when-cross-origin',
+          },
+        ],
+      },
       {
         source: '/companies/:path*',
         headers: [