diff --git a/k8s/platform/values-prod.yaml b/k8s/platform/values-prod.yaml
index d70a342f35..6043bc5b08 100644
--- a/k8s/platform/values-prod.yaml
+++ b/k8s/platform/values-prod.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 image:
   repository: eu.gcr.io/airqo-250220/airqo-next-platform
   pullPolicy: Always
-  tag: prod-16e65200-1739133930
+  tag: prod-6a098ecd-1740727843
 imagePullSecrets: []
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/platform/values-stage.yaml b/k8s/platform/values-stage.yaml
index 435920b26e..be349674aa 100644
--- a/k8s/platform/values-stage.yaml
+++ b/k8s/platform/values-stage.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-next-platform
   pullPolicy: Always
-  tag: stage-963fc29b-1740488187
+  tag: stage-93a63a9e-1740727732
 imagePullSecrets: []
 nameOverride: ''
 fullnameOverride: ''
diff --git a/src/platform/src/core/utils/protectedRoute.js b/src/platform/src/core/utils/protectedRoute.js
index cc2bbf2469..7df4e81298 100644
--- a/src/platform/src/core/utils/protectedRoute.js
+++ b/src/platform/src/core/utils/protectedRoute.js
@@ -2,87 +2,17 @@ import React, { useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { useSelector, useDispatch } from 'react-redux';
 import LogoutUser from '@/core/utils/LogoutUser';
-import Cookies from 'js-cookie';
-import jwt_decode from 'jwt-decode';
-import {
-  setUserInfo,
-  setSuccess,
-} from '@/lib/store/services/account/LoginSlice';
-import { getIndividualUserPreferences } from '@/lib/store/services/account/UserDefaultsSlice';
-import { getUserDetails } from '@/core/apis/Account';
-import Spinner from '../../common/components/Spinner';
-
-const MAX_RETRIES = 3;
-const RETRY_DELAY = 1000;
 
 export default function withAuth(Component) {
   return function WithAuthComponent(props) {
     const dispatch = useDispatch();
     const router = useRouter();
     const userCredentials = useSelector((state) => state.login);
-    const [isRedirecting, setIsRedirecting] = React.useState(
-      router.query.success === 'google',
-    );
-
-    const retryWithDelay = async (fn, retries = MAX_RETRIES) => {
-      try {
-        return await fn();
-      } catch (error) {
-        if (retries > 0 && error.response?.status === 429) {
-          await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY));
-          return retryWithDelay(fn, retries - 1);
-        }
-        throw error;
-      }
-    };
-
-    const setupUserSession = async (user) => {
-      if (!user.groups[0]?.grp_title) {
-        throw new Error(
-          'Server error. Contact support to add you to the AirQo Organisation',
-        );
-      }
-
-      localStorage.setItem('loggedUser', JSON.stringify(user));
-
-      const preferencesResponse = await retryWithDelay(() =>
-        dispatch(getIndividualUserPreferences({ identifier: user._id })),
-      );
-      if (preferencesResponse.payload.success) {
-        const preferences = preferencesResponse.payload.preferences;
-        const activeGroup = preferences[0]?.group_id
-          ? user.groups.find((group) => group._id === preferences[0].group_id)
-          : user.groups.find((group) => group.grp_title === 'airqo');
-        localStorage.setItem('activeGroup', JSON.stringify(activeGroup));
-      }
-
-      dispatch(setUserInfo(user));
-      dispatch(setSuccess(true));
-    };
 
     useEffect(() => {
       if (typeof window !== 'undefined') {
-        // Handle Google redirect first
-        if (router.query.success === 'google') {
-          const token = Cookies.get('access_token');
-          if (token) {
-            localStorage.setItem('token', token);
-            const decoded = jwt_decode(token);
-            retryWithDelay(() => getUserDetails(decoded._id, token))
-              .then((response) => setupUserSession(response.users[0]))
-              .catch((error) => {
-                console.error('Google auth error:', error);
-                setIsRedirecting(false);
-                router.push('/account/login');
-              });
-          } else {
-            setIsRedirecting(false);
-            router.push('/account/login');
-          }
-          return; // Exit early to prevent further checks until redirect is resolved
-        }
-
         const storedUserGroup = localStorage.getItem('activeGroup');
+
         if (!userCredentials.success) {
           router.push('/account/login');
         }
@@ -91,12 +21,7 @@ export default function withAuth(Component) {
           LogoutUser(dispatch, router);
         }
       }
-    }, [userCredentials, dispatch, router, retryWithDelay, isRedirecting]);
-
-    // Block rendering until redirect is handled
-    if (isRedirecting) {
-      return <Spinner width={20} height={20} />;
-    }
+    }, [userCredentials, dispatch, router]);
 
     // Render the component if the user is authenticated
     return userCredentials.success ? <Component {...props} /> : null;
diff --git a/src/platform/src/pages/account/creation/index.jsx b/src/platform/src/pages/account/creation/index.jsx
index 94a428bfc2..51c184a39e 100644
--- a/src/platform/src/pages/account/creation/index.jsx
+++ b/src/platform/src/pages/account/creation/index.jsx
@@ -4,18 +4,26 @@ import GoogleLogo from '@/icons/Common/google_logo.svg';
 import { getGoogleAuthDetails } from '@/core/apis/Account';
 import CheckComponent from '@/components/Account/CheckComponent';
 
+const FORM_URL = 'https://forms.gle/VX5p2s65n8U51iBc8';
+
 const userRoles = [
   {
     title: 'Individual',
     subText:
       'Empower yourself with real-time Air Pollution Location Data for research and personal use. Stay informed, stay healthy. Join the clean air revolution today.',
     disabled: false,
+    // Internal route for individuals.
+    route: (router) => router.push(`/account/creation/individual/register`),
   },
   {
     title: 'Organisation',
     subText:
       'Beyond data, gain access to network management tools. Drive meaningful change, one location at a time. Shape a cleaner future for all.',
-    disabled: true,
+    disabled: false,
+    // External route for organisations.
+    route: () => {
+      window.location.href = FORM_URL;
+    },
   },
 ];
 
@@ -23,24 +31,27 @@ const UserDesignation = () => {
   const [clickedRole, setClickedRole] = useState('');
   const router = useRouter();
 
-  const routeToCreation = () => {
-    if (clickedRole) {
-      router.push(`/account/creation/${clickedRole.toLowerCase()}/register`);
-    }
+  const handleRoleClick = (roleTitle, disabled) => {
+    if (disabled) return;
+    setClickedRole((prevRole) => (prevRole === roleTitle ? '' : roleTitle));
   };
 
-  const handleRoleClick = (roleTitle) => {
-    setClickedRole((prevRole) => (prevRole === roleTitle ? '' : roleTitle));
+  const routeToCreation = () => {
+    if (!clickedRole) return;
+    const selectedRole = userRoles.find((role) => role.title === clickedRole);
+    if (selectedRole && selectedRole.route) {
+      selectedRole.route(router);
+    }
   };
 
   return (
     <div className="relative w-screen h-screen bg-white overflow-x-hidden">
-      <div className="absolute left-0 right-0 top-0 bottom-0 mb-0 mt-14 sm:mt-20 lg:mt-44 mx-auto w-11/12 lg:w-7/12 h-auto flex flex-col items-center">
+      <div className="absolute left-0 right-0 top-0 bottom-0 mt-14 sm:mt-20 lg:mt-44 mx-auto w-11/12 lg:w-7/12 flex flex-col items-center">
         <h2 className="text-3xl text-black-700 font-semibold text-center">
           How are you planning to use AirQo Analytics?
         </h2>
         <p className="text-xl text-black-700 font-normal mt-3 text-center">
-          We'll streamline your setup experience accordingly
+          We&apos;ll streamline your setup experience accordingly
         </p>
         <div className="mt-10 flex justify-center items-center">
           <div className="flex flex-col lg:flex-row lg:items-stretch lg:ml-20">
@@ -48,24 +59,18 @@ const UserDesignation = () => {
               <div
                 key={index}
                 className="w-full cursor-pointer mb-8 lg:w-10/12 lg:mb-0 flex flex-col"
-                onClick={() => {
-                  if (role.disabled) {
-                    return;
-                  }
-                  handleRoleClick(role.title);
-                }}
+                role="button"
+                tabIndex={0}
+                onClick={() => handleRoleClick(role.title, role.disabled)}
                 onKeyUp={(e) => {
                   if (e.key === 'Enter' || e.key === ' ') {
-                    if (role.disabled) {
-                      return;
-                    }
-                    handleRoleClick(role.title);
+                    handleRoleClick(role.title, role.disabled);
                   }
                 }}
               >
                 <CheckComponent
                   text={role.title}
-                  width={'w-full lg:w-10/12'}
+                  width="w-full lg:w-10/12"
                   subText={role.subText}
                   checked={clickedRole === role.title}
                   disabled={role.disabled}
@@ -79,7 +84,7 @@ const UserDesignation = () => {
             onClick={routeToCreation}
             className="mt-6 w-[262px] flex justify-center items-center px-4 py-2 bg-blue-600 text-white rounded-[12px]"
           >
-            Continue
+            {clickedRole === 'Organisation' ? 'Get started' : 'Continue'}
           </button>
         )}
       </div>
@@ -87,31 +92,27 @@ const UserDesignation = () => {
   );
 };
 
-const GoogleAccountCreation = () => {
-  return (
-    <div className="w-full">
-      <div className="mt-6 grid grid-cols-3 items-center justify-center">
-        <span className="w-full border border-grey-200"></span>
-        <span className="justify-self-center w-fit">Or</span>
-        <span className="w-full border border-grey-200"></span>
-      </div>
-      <div className="mt-6">
-        <button
-          className="btn bg-form-input rounded-none w-full outline-none border-none flex flex-row items-center justify-center hover:bg-grey-200"
-          onClick={() => {
-            getGoogleAuthDetails();
-          }}
-        >
-          <span style={{ color: '#000000', fontWeight: '400', opacity: '0.5' }}>
-            Sign up with
-          </span>
-          <span className="pl-2">
-            <GoogleLogo />
-          </span>
-        </button>
-      </div>
+const GoogleAccountCreation = () => (
+  <div className="w-full mt-6">
+    <div className="grid grid-cols-3 items-center justify-center">
+      <span className="w-full border border-grey-200"></span>
+      <span className="justify-self-center w-fit">Or</span>
+      <span className="w-full border border-grey-200"></span>
     </div>
-  );
-};
+    <div className="mt-6">
+      <button
+        className="btn bg-form-input rounded-none w-full outline-none border-none flex flex-row items-center justify-center hover:bg-grey-200"
+        onClick={getGoogleAuthDetails}
+      >
+        <span style={{ color: '#000000', fontWeight: '400', opacity: '0.5' }}>
+          Sign up with
+        </span>
+        <span className="pl-2">
+          <GoogleLogo />
+        </span>
+      </button>
+    </div>
+  </div>
+);
 
 export default UserDesignation;
diff --git a/src/platform/src/pages/account/login/index.jsx b/src/platform/src/pages/account/login/index.jsx
index edbf1b764d..4a28bdac20 100644
--- a/src/platform/src/pages/account/login/index.jsx
+++ b/src/platform/src/pages/account/login/index.jsx
@@ -18,7 +18,6 @@ import {
 } from '@/lib/store/services/account/LoginSlice';
 import { getIndividualUserPreferences } from '@/lib/store/services/account/UserDefaultsSlice';
 import { postUserLoginDetails, getUserDetails } from '@/core/apis/Account';
-import { GOOGLE_AUTH_URL } from '@/core/urls/authentication';
 
 const MAX_RETRIES = 3;
 const RETRY_DELAY = 1000;
@@ -111,15 +110,6 @@ const UserLogin = () => {
     dispatch(setUserData({ key, value }));
   };
 
-  const handleGoogleLogin = async () => {
-    try {
-      // Redirect to Google auth URL
-      window.location.href = GOOGLE_AUTH_URL;
-    } catch (error) {
-      console.error('Login error:', error);
-    }
-  };
-
   return (
     <AccountPageLayout
       pageTitle="AirQo Analytics | Login"
@@ -178,7 +168,6 @@ const UserLogin = () => {
               </div>
             </div>
           </div>
-
           <div className="mt-10">
             <button
               data-testid="login-btn"
@@ -192,19 +181,6 @@ const UserLogin = () => {
                 'Login'
               )}
             </button>
-
-            <button
-              data-testid="google-login-btn"
-              className="w-full btn border-blue-900 rounded-[12px] text-white text-sm outline-none border"
-              disabled={loading}
-              onClick={handleGoogleLogin}
-            >
-              {loading ? (
-                <Spinner data-testid="spinner" width={25} height={25} />
-              ) : (
-                'Login with Google'
-              )}
-            </button>
           </div>
         </form>
         <div className="mt-8 w-full flex justify-center">
diff --git a/src/website2/next.config.mjs b/src/website2/next.config.mjs
index 60418cc7cc..8a23ebaa96 100644
--- a/src/website2/next.config.mjs
+++ b/src/website2/next.config.mjs
@@ -46,6 +46,21 @@ const nextConfig = {
         destination: '/clean-air-forum/about',
         permanent: true,
       },
+      {
+        source: '/clean-air-network',
+        destination: '/clean-air-network/about',
+        permanent: true,
+      },
+      {
+        source: '/clean-air/about',
+        destination: '/clean-air-network/about',
+        permanent: true,
+      },
+      {
+        source: '/clean-air',
+        destination: '/clean-air-network/about',
+        permanent: true,
+      },
     ];
   },
 };
diff --git a/src/website2/public/Logo.png b/src/website2/public/Logo.png
new file mode 100644
index 0000000000..bf64b5cbd5
Binary files /dev/null and b/src/website2/public/Logo.png differ
diff --git a/src/website2/public/apple-icon.png b/src/website2/public/apple-icon.png
new file mode 100644
index 0000000000..6af6fa1c8e
Binary files /dev/null and b/src/website2/public/apple-icon.png differ
diff --git a/src/website2/public/assets/icons/Icon1.tsx b/src/website2/public/assets/icons/Icon1.tsx
index 76615bec02..be291f7323 100644
--- a/src/website2/public/assets/icons/Icon1.tsx
+++ b/src/website2/public/assets/icons/Icon1.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon1.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon2.tsx b/src/website2/public/assets/icons/Icon2.tsx
index dbd81a690d..3e6d88d384 100644
--- a/src/website2/public/assets/icons/Icon2.tsx
+++ b/src/website2/public/assets/icons/Icon2.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon2.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon3.tsx b/src/website2/public/assets/icons/Icon3.tsx
index 5812824619..71fa508107 100644
--- a/src/website2/public/assets/icons/Icon3.tsx
+++ b/src/website2/public/assets/icons/Icon3.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon3.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon4.tsx b/src/website2/public/assets/icons/Icon4.tsx
index 40c3fa8ba1..46f132ef6b 100644
--- a/src/website2/public/assets/icons/Icon4.tsx
+++ b/src/website2/public/assets/icons/Icon4.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon4.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon5.tsx b/src/website2/public/assets/icons/Icon5.tsx
index 7da0d0487b..5483e5940f 100644
--- a/src/website2/public/assets/icons/Icon5.tsx
+++ b/src/website2/public/assets/icons/Icon5.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon5.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon6.tsx b/src/website2/public/assets/icons/Icon6.tsx
index 3b62e3f341..26911b5ca2 100644
--- a/src/website2/public/assets/icons/Icon6.tsx
+++ b/src/website2/public/assets/icons/Icon6.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon6.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon7.tsx b/src/website2/public/assets/icons/Icon7.tsx
index 38af9fcba9..a8ebbde45c 100644
--- a/src/website2/public/assets/icons/Icon7.tsx
+++ b/src/website2/public/assets/icons/Icon7.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon6.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/assets/icons/Icon8.tsx b/src/website2/public/assets/icons/Icon8.tsx
index 272fbb43a8..e7016fc1e5 100644
--- a/src/website2/public/assets/icons/Icon8.tsx
+++ b/src/website2/public/assets/icons/Icon8.tsx
@@ -1,4 +1,4 @@
-// components/icons/Icon6.tsx
+
 import React from 'react';
 
 interface IconProps {
diff --git a/src/website2/public/favicon.ico b/src/website2/public/favicon.ico
new file mode 100644
index 0000000000..80f940cae3
Binary files /dev/null and b/src/website2/public/favicon.ico differ
diff --git a/src/website2/public/icon.png b/src/website2/public/icon.png
new file mode 100644
index 0000000000..fd9cd302d8
Binary files /dev/null and b/src/website2/public/icon.png differ
diff --git a/src/website2/public/icon.svg b/src/website2/public/icon.svg
new file mode 100644
index 0000000000..e925bedccd
--- /dev/null
+++ b/src/website2/public/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="1000" height="1000"><g clip-path="url(#SvgjsClipPath1047)"><rect width="1000" height="1000" fill="#ffffff" data-darkreader-inline-fill="" style="--darkreader-inline-fill: var(--darkreader-background-ffffff, #181a1b);"></rect><g transform="matrix(2.464788732394366,0,0,2.464788732394366,150,263.38028169014086)"><svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" width="284" height="192" viewBox="0 0 284 192"><image width="284" height="192" xlink:href="data:image/png;base64,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"></image></svg></g></g><defs><clipPath id="SvgjsClipPath1047"><rect width="1000" height="1000" x="0" y="0" rx="350" ry="350"></rect></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/website2/public/manifest.json b/src/website2/public/manifest.json
new file mode 100644
index 0000000000..859342a095
--- /dev/null
+++ b/src/website2/public/manifest.json
@@ -0,0 +1,21 @@
+{
+  "name": "AirQo Website",
+  "short_name": "AirQo",
+  "icons": [
+    {
+      "src": "/web-app-manifest-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "/web-app-manifest-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}
\ No newline at end of file
diff --git a/src/website2/public/web-app-manifest-192x192.png b/src/website2/public/web-app-manifest-192x192.png
new file mode 100644
index 0000000000..1f574466b5
Binary files /dev/null and b/src/website2/public/web-app-manifest-192x192.png differ
diff --git a/src/website2/public/web-app-manifest-512x512.png b/src/website2/public/web-app-manifest-512x512.png
new file mode 100644
index 0000000000..9a57e19709
Binary files /dev/null and b/src/website2/public/web-app-manifest-512x512.png differ
diff --git a/src/website2/src/app/clean-air-forum/about/page.tsx b/src/website2/src/app/clean-air-forum/about/page.tsx
index 20109a061c..edb4bd14f0 100644
--- a/src/website2/src/app/clean-air-forum/about/page.tsx
+++ b/src/website2/src/app/clean-air-forum/about/page.tsx
@@ -1,8 +1,14 @@
-import React from 'react';
+import { Metadata } from 'next';
 
-import AboutPage from '@/views/Forum/AboutPage';
+import AboutPage from '@/views/cleanairforum/about/AboutPage';
 
-const page = () => {
+export const metadata: Metadata = {
+  title: 'About Clean Air Forum | AirQo',
+  description:
+    'Discover the Clean Air Forum – learn about our mission, vision, and how we foster collaboration to advance clean air solutions and improve air quality.',
+};
+
+const Page = () => {
   return (
     <div>
       <AboutPage />
@@ -10,4 +16,4 @@ const page = () => {
   );
 };
 
-export default page;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/glossary/page.tsx b/src/website2/src/app/clean-air-forum/glossary/page.tsx
index d099dd930e..6ee00f95fc 100644
--- a/src/website2/src/app/clean-air-forum/glossary/page.tsx
+++ b/src/website2/src/app/clean-air-forum/glossary/page.tsx
@@ -1,115 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import Link from 'next/link';
-import React from 'react';
+import GlossaryPage from '@/views/cleanairforum/glossary/GlossaryPage';
 
-import Loading from '@/components/loading';
-import { Divider } from '@/components/ui';
-import { NoData } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-import { ForumEvent } from '@/types/forum';
-import { isValidGlossaryContent } from '@/utils/glossaryValidator';
-import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const GlossaryPage: React.FC = () => {
-  // Access data from the context.
-  const { selectedEvent, eventTitles } = useForumData();
-
-  // If either is not available, show a loading state.
-  if (!selectedEvent || !eventTitles) {
-    return <Loading />;
-  }
-
-  // Extract the events list from eventTitles.
-  // If eventTitles is an array, use it directly; otherwise, assume it's a ForumTitlesResponse.
-  const eventsList: ForumEvent[] = Array.isArray(eventTitles)
-    ? eventTitles
-    : eventTitles.forum_events;
-
-  if (eventsList.length === 0) {
-    return <NoData message="No events found" />;
-  }
-
-  // Render the main glossary content using the selected event.
-  const glossaryHTML = renderContent(selectedEvent.glossary_details);
-  const showGlossaryMain = isValidGlossaryContent(glossaryHTML);
-
-  const glossarySections = selectedEvent.sections?.filter((section: any) => {
-    if (!section.pages.includes('glossary')) return false;
-    const html = renderContent(section.content);
-    return html.trim().length > 0;
-  });
-
-  return (
-    <div className="px-4 lg:px-0 prose max-w-none flex flex-col gap-6">
-      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-
-      {/* Clean Air Forum Events Section (Sidebar) */}
-      <div className="flex flex-col md:flex-row py-6 md:space-x-8">
-        {/* Left column: Heading */}
-        <div className="md:w-1/3 mb-4 md:mb-0">
-          <h1 className="text-2xl mt-4 font-semibold">
-            Clean Air Forum Events
-          </h1>
-        </div>
-        {/* Right column: List of event links */}
-        <div className="md:w-2/3">
-          <ul className="space-y-2">
-            {eventsList.map((event) => {
-              // Use the unique_title directly in the link.
-              const href = `/clean-air-forum/about?slug=${encodeURIComponent(
-                event.unique_title,
-              )}`;
-              return (
-                <li key={event.id}>
-                  <Link
-                    href={href}
-                    target="_blank"
-                    className="text-blue-600 hover:underline"
-                  >
-                    {event.title}
-                  </Link>
-                </li>
-              );
-            })}
-          </ul>
-        </div>
-      </div>
-
-      {/* Clean Air Glossary Section */}
-      {showGlossaryMain && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="flex flex-col py-6 md:flex-row md:space-x-8">
-            {/* Left column: Heading */}
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h1 className="text-2xl mt-4 font-bold text-gray-900">
-                Clean Air Glossary
-              </h1>
-            </div>
-            {/* Right column: Glossary content */}
-            <div
-              className="md:w-2/3"
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(glossaryHTML),
-              }}
-            ></div>
-          </div>
-        </>
-      )}
+export const metadata: Metadata = {
+  title: 'Glossary | Clean Air Forum',
+  description:
+    'Explore our glossary of key terms and pollutant types used at Clean Air Forum, providing clear definitions to help you better understand air quality management.',
+};
 
-      {/* Additional Glossary Sections (if any) */}
-      {glossarySections && glossarySections.length > 0 && (
-        <>
-          {glossarySections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <GlossaryPage />;
 };
 
-export default GlossaryPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/layout.tsx b/src/website2/src/app/clean-air-forum/layout.tsx
index 260174194f..6b1604d5f7 100644
--- a/src/website2/src/app/clean-air-forum/layout.tsx
+++ b/src/website2/src/app/clean-air-forum/layout.tsx
@@ -1,4 +1,3 @@
-// components/layouts/CleanAirLayout.tsx
 'use client';
 
 import { useSearchParams } from 'next/navigation';
@@ -12,7 +11,8 @@ import { NoData } from '@/components/ui';
 import mainConfig from '@/configs/mainConfigs';
 import { ForumDataProvider } from '@/context/ForumDataContext';
 import { useForumEventDetails, useForumEventTitles } from '@/hooks/useApiHooks';
-import BannerSection from '@/views/Forum/BannerSection';
+
+import BannerSection from '../../views/cleanairforum/BannerSection';
 
 type CleanAirLayoutProps = {
   children: ReactNode;
diff --git a/src/website2/src/app/clean-air-forum/logistics/page.tsx b/src/website2/src/app/clean-air-forum/logistics/page.tsx
index abbadd07df..a358f9dc32 100644
--- a/src/website2/src/app/clean-air-forum/logistics/page.tsx
+++ b/src/website2/src/app/clean-air-forum/logistics/page.tsx
@@ -1,96 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import React from 'react';
+import LogisticsPage from '@/views/cleanairforum/logistics/LogisticsPage';
 
-import Loading from '@/components/loading';
-import { Divider } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-import { isValidHTMLContent } from '@/utils/htmlValidator';
-import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const LogisticsPage: React.FC = () => {
-  // Destructure the selected event from the context.
-  const { selectedEvent } = useForumData();
-
-  // If selectedEvent is not available, show a loading state.
-  if (!selectedEvent) {
-    return <Loading />;
-  }
-
-  // Render static content from the event model.
-  const vaccinationHTML = renderContent(
-    selectedEvent.travel_logistics_vaccination_details,
-  );
-  const visaHTML = renderContent(selectedEvent.travel_logistics_visa_details);
-
-  const showVaccination = isValidHTMLContent(vaccinationHTML);
-  const showVisa = isValidHTMLContent(visaHTML);
-
-  // Filter extra sections assigned to the "logistics" page.
-  const logisticsSections = selectedEvent.sections?.filter(
-    (section: any) =>
-      section.pages.includes('logistics') &&
-      isValidHTMLContent(renderContent(section.content)),
-  );
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      {/* Render Vaccination Section if content exists */}
-      {showVaccination && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="py-6">
-            <div className="flex flex-col md:flex-row md:space-x-8">
-              <div className="md:w-1/3 mb-4 md:mb-0">
-                <h1 className="text-2xl mt-4 font-bold text-gray-900">
-                  Vaccination
-                </h1>
-              </div>
-              <div
-                className="md:w-2/3 space-y-4"
-                dangerouslySetInnerHTML={{
-                  __html: DOMPurify.sanitize(vaccinationHTML),
-                }}
-              />
-            </div>
-          </div>
-        </>
-      )}
-
-      {/* Render Visa Invitation Letter Section if content exists */}
-      {showVisa && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="py-6">
-            <div className="flex flex-col md:flex-row md:space-x-8">
-              <div className="md:w-1/3 mb-4 md:mb-0">
-                <h1 className="text-2xl mt-4 font-bold text-gray-900">
-                  Visa invitation letter
-                </h1>
-              </div>
-              <div
-                className="md:w-2/3 space-y-4"
-                dangerouslySetInnerHTML={{
-                  __html: DOMPurify.sanitize(visaHTML),
-                }}
-              />
-            </div>
-          </div>
-        </>
-      )}
+export const metadata: Metadata = {
+  title: 'Logistics | Clean Air Forum',
+  description:
+    'Get all the essential logistics information for attending the Clean Air Forum, including travel, accommodation, event schedules, and practical tips for participants.',
+};
 
-      {/* Render additional Logistics Sections, if any */}
-      {logisticsSections && logisticsSections.length > 0 && (
-        <>
-          {logisticsSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <LogisticsPage />;
 };
 
-export default LogisticsPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/partners/page.tsx b/src/website2/src/app/clean-air-forum/partners/page.tsx
index ab8ecb1556..feffb94e35 100644
--- a/src/website2/src/app/clean-air-forum/partners/page.tsx
+++ b/src/website2/src/app/clean-air-forum/partners/page.tsx
@@ -1,148 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import React from 'react';
+import PartnersPage from '@/views/cleanairforum/partners/PartnersPage';
 
-import { Divider } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-import { isValidHTMLContent } from '@/utils/htmlValidator';
-import { renderContent } from '@/utils/quillUtils';
-import PaginatedSection from '@/views/cleanairforum/PaginatedSection';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const PartnersPage: React.FC = () => {
-  const { selectedEvent } = useForumData();
-  if (!selectedEvent) return null;
-
-  const conveningPartners = selectedEvent.partners
-    ?.filter((partner: any) => partner.category === 'Co-Convening Partner')
-    .map((partner: any) => ({
-      id: partner.id,
-      logoUrl: partner.partner_logo_url,
-    }));
-
-  const hostPartners = selectedEvent.partners
-    ?.filter((partner: any) => partner.category === 'Host Partner')
-    .map((partner: any) => ({
-      id: partner.id,
-      logoUrl: partner.partner_logo_url,
-    }));
-
-  const programPartners = selectedEvent.partners
-    ?.filter((partner: any) => partner.category === 'Program Partner')
-    .map((partner: any) => ({
-      id: partner.id,
-      logoUrl: partner.partner_logo_url,
-    }));
-
-  const fundingPartners = selectedEvent.partners
-    ?.filter((partner: any) => partner.category === 'Funding Partner')
-    .map((partner: any) => ({
-      id: partner.id,
-      logoUrl: partner.partner_logo_url,
-    }));
-
-  const mainPartnersHTML = renderContent(selectedEvent.partners_text_section);
-  const showMainPartners = isValidHTMLContent(mainPartnersHTML);
-
-  const partnersSections = selectedEvent.sections?.filter((section: any) => {
-    if (!section.pages.includes('partners')) return false;
-    const sectionHTML = renderContent(section.content);
-    return isValidHTMLContent(sectionHTML);
-  });
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      {showMainPartners && (
-        <div className="py-4">
-          <h1 className="text-2xl font-bold">Partners</h1>
-          <div
-            dangerouslySetInnerHTML={{
-              __html: DOMPurify.sanitize(mainPartnersHTML),
-            }}
-          />
-        </div>
-      )}
-
-      {partnersSections && partnersSections.length > 0 && (
-        <>
-          {partnersSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-
-      {conveningPartners && conveningPartners.length > 0 && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="flex flex-col md:flex-row md:space-x-8">
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h2 className="text-2xl font-bold text-gray-900">
-                Convening partners and Collaborators
-              </h2>
-            </div>
-            <PaginatedSection
-              noClick={true}
-              logos={conveningPartners}
-              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
-            />
-          </div>
-        </>
-      )}
-
-      {hostPartners && hostPartners.length > 0 && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="flex flex-col md:flex-row md:space-x-8">
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h2 className="text-2xl font-bold text-gray-900">
-                Host partners
-              </h2>
-            </div>
-            <PaginatedSection
-              noClick={true}
-              logos={hostPartners}
-              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
-            />
-          </div>
-        </>
-      )}
-
-      {programPartners && programPartners.length > 0 && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="flex flex-col md:flex-row md:space-x-8">
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h2 className="text-2xl font-bold text-gray-900">Exhibitors</h2>
-            </div>
-            <PaginatedSection
-              noClick={true}
-              logos={programPartners}
-              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
-            />
-          </div>
-        </>
-      )}
+export const metadata: Metadata = {
+  title: 'Partners | Clean Air Forum | AirQo',
+  description:
+    'Discover the partners collaborating with Clean Air Forum to advance clean air solutions and improve air quality through innovation and community engagement.',
+};
 
-      {fundingPartners && fundingPartners.length > 0 && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="flex flex-col md:flex-row md:space-x-8">
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h2 className="text-2xl font-bold text-gray-900">
-                Funding Partners and Sponsors
-              </h2>
-            </div>
-            <PaginatedSection
-              noClick={true}
-              logos={fundingPartners}
-              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
-            />
-          </div>
-        </>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <PartnersPage />;
 };
 
-export default PartnersPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/program-committee/page.tsx b/src/website2/src/app/clean-air-forum/program-committee/page.tsx
index ab3f7d2b3d..b594c3c863 100644
--- a/src/website2/src/app/clean-air-forum/program-committee/page.tsx
+++ b/src/website2/src/app/clean-air-forum/program-committee/page.tsx
@@ -1,121 +1,15 @@
-/* eslint-disable react-hooks/exhaustive-deps */
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import React, { useMemo, useState } from 'react';
+import CommitteePage from '@/views/cleanairforum/program-committee/CommitteePage';
 
-import { Divider, MemberCard, Pagination } from '@/components/ui/';
-import { useForumData } from '@/context/ForumDataContext';
-import { isValidHTMLContent } from '@/utils/htmlValidator';
-import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const CommitteePage: React.FC = () => {
-  // Always call useForumData to get the selectedEvent.
-  const { selectedEvent } = useForumData();
-
-  // Instead of conditionally calling hooks based on selectedEvent,
-  // extract fallback values unconditionally.
-  const persons = selectedEvent?.persons || [];
-  const sections = selectedEvent?.sections || [];
-  const committeeText = selectedEvent?.committee_text_section || '';
-
-  // Local state for pagination.
-  const [currentPage, setCurrentPage] = useState<number>(1);
-  const membersPerPage = 6;
-
-  // Memoize committee members using a fallback empty array.
-  const committeeMembers = useMemo(() => {
-    return persons.filter(
-      (person: any) =>
-        person.category === 'Committee Member' ||
-        person.category === 'Committee Member and Key Note Speaker' ||
-        person.category === 'Speaker and Committee Member',
-    );
-  }, [persons]);
-
-  // Calculate total pages.
-  const totalPages = useMemo(() => {
-    return Math.ceil(committeeMembers.length / membersPerPage);
-  }, [committeeMembers, membersPerPage]);
-
-  // Get members for the current page.
-  const displayedMembers = useMemo(() => {
-    const startIdx = (currentPage - 1) * membersPerPage;
-    return committeeMembers.slice(startIdx, startIdx + membersPerPage);
-  }, [currentPage, committeeMembers, membersPerPage]);
-
-  // Render main committee text.
-  const committeeHTML = renderContent(committeeText);
-  const showCommitteeMain = isValidHTMLContent(committeeHTML);
-
-  // Filter extra sections assigned to the "committee" page.
-  const committeeSections = useMemo(() => {
-    return sections.filter((section: any) => {
-      if (!section.pages.includes('committee')) return false;
-      const sectionHTML = renderContent(section.content);
-      return isValidHTMLContent(sectionHTML);
-    });
-  }, [sections]);
-
-  const handlePageChange = (newPage: number) => setCurrentPage(newPage);
-
-  // If selectedEvent is still not available, you might render a loading indicator.
-  if (!selectedEvent) {
-    return null;
-  }
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-
-      {/* Program Committee Text Section */}
-      <div>
-        {showCommitteeMain && (
-          <>
-            <h2 className="text-2xl font-bold">Program Committee</h2>
-            <div
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(committeeHTML),
-              }}
-            />
-          </>
-        )}
-      </div>
-
-      {/* Extra Committee Sections using SectionDisplay */}
-      {committeeSections.length > 0 && (
-        <>
-          {committeeSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-
-      {/* Member Cards Grid */}
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
-        {displayedMembers.map((person: any) => (
-          <MemberCard
-            key={person.id}
-            member={person}
-            btnText="Read Bio"
-            cardClassName="bg-gray-100 p-2 rounded-md"
-          />
-        ))}
-      </div>
+export const metadata: Metadata = {
+  title: 'Program Committee | Clean Air Forum | AirQo',
+  description:
+    'Meet the expert program committee of Clean Air Forum. Learn about the thought leaders and industry experts driving innovative strategies for better air quality.',
+};
 
-      {/* Pagination Component */}
-      {totalPages > 1 && (
-        <div className="py-6">
-          <Pagination
-            totalPages={totalPages}
-            currentPage={currentPage}
-            onPageChange={handlePageChange}
-          />
-        </div>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <CommitteePage />;
 };
 
-export default CommitteePage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/resources/page.tsx b/src/website2/src/app/clean-air-forum/resources/page.tsx
index a107048955..7e848f67e6 100644
--- a/src/website2/src/app/clean-air-forum/resources/page.tsx
+++ b/src/website2/src/app/clean-air-forum/resources/page.tsx
@@ -1,148 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import React, { useState } from 'react';
-import { FaChevronDown, FaChevronUp, FaFilePdf } from 'react-icons/fa';
+import ResourcesPage from '@/views/cleanairforum/resources/ResourcesPage';
 
-import { Divider } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-
-const getFileNameFromUrl = (url: string | null | undefined): string | null => {
-  if (!url || typeof url !== 'string') {
-    console.error('Invalid URL:', url);
-    return null;
-  }
-  const segments = url.split('/');
-  return segments.pop() || null;
-};
-
-const AccordionItem = ({ session, isOpen, toggleAccordion }: any) => {
-  return (
-    <div className="bg-gray-100 rounded-lg shadow-sm py-2 px-4 mb-4">
-      <div
-        className="flex justify-between items-center cursor-pointer"
-        onClick={toggleAccordion}
-      >
-        <h3 className="text-lg font-semibold text-blue-700">
-          {session.session_title}
-        </h3>
-        <span>{isOpen ? <FaChevronUp /> : <FaChevronDown />}</span>
-      </div>
-      {isOpen && (
-        <div className="mt-4">
-          {session?.resource_files?.map((file: any) => (
-            <div key={file.id} className="mb-4">
-              <div className="flex items-start space-x-2 pl-4">
-                <div>
-                  <p className="text-sm text-gray-900 font-semibold">
-                    {file.resource_summary}
-                  </p>
-                  <a
-                    href={file.file_url}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-red-600 flex items-center"
-                  >
-                    <FaFilePdf className="mr-2" />
-                    {getFileNameFromUrl(file.file_url)}
-                  </a>
-                </div>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
+export const metadata: Metadata = {
+  title: 'Resources | Clean Air Forum | AirQo',
+  description:
+    'Access comprehensive resources, presentations, and documents from Clean Air Forum to stay informed about the latest trends and innovations in air quality management.',
 };
 
-const ResourcesPage: React.FC = () => {
-  const { selectedEvent } = useForumData();
-  const [openAccordions, setOpenAccordions] = useState<{
-    [resourceIndex: number]: { [sessionIndex: number]: boolean };
-  }>({});
-  const [allExpanded, setAllExpanded] = useState(false);
-
-  if (!selectedEvent) {
-    return null;
-  }
-
-  const handleToggleAccordion = (
-    resourceIndex: number,
-    sessionIndex: number,
-  ) => {
-    setOpenAccordions((prevState) => ({
-      ...prevState,
-      [resourceIndex]: {
-        ...prevState[resourceIndex],
-        [sessionIndex]: !prevState[resourceIndex]?.[sessionIndex],
-      },
-    }));
-  };
-
-  const handleExpandAll = () => {
-    setAllExpanded(true);
-    const expandedAccordions: any = {};
-    selectedEvent.forum_resources?.forEach(
-      (resource: any, resourceIndex: number) => {
-        expandedAccordions[resourceIndex] = {};
-        resource.resource_sessions?.forEach((_: any, sessionIndex: number) => {
-          expandedAccordions[resourceIndex][sessionIndex] = true;
-        });
-      },
-    );
-    setOpenAccordions(expandedAccordions);
-  };
-
-  const handleCollapseAll = () => {
-    setAllExpanded(false);
-    setOpenAccordions({});
-  };
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      <div className="flex justify-end space-x-4 mb-4">
-        <button
-          onClick={handleExpandAll}
-          className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700"
-        >
-          Expand All
-        </button>
-        <button
-          onClick={handleCollapseAll}
-          className="bg-gray-500 text-white px-4 py-2 rounded hover:bg-gray-600"
-        >
-          Collapse All
-        </button>
-      </div>
-
-      {selectedEvent.forum_resources?.map(
-        (resource: any, resourceIndex: number) => (
-          <div key={resource.id} className="mb-8">
-            <h2 className="text-2xl font-bold text-gray-900 mb-4">
-              {resource.resource_title}
-            </h2>
-            {resource.resource_sessions?.map(
-              (session: any, sessionIndex: number) => (
-                <AccordionItem
-                  key={session.id}
-                  session={session}
-                  isOpen={
-                    allExpanded ||
-                    openAccordions[resourceIndex]?.[sessionIndex] ||
-                    false
-                  }
-                  toggleAccordion={() =>
-                    handleToggleAccordion(resourceIndex, sessionIndex)
-                  }
-                />
-              ),
-            )}
-            <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          </div>
-        ),
-      )}
-    </div>
-  );
+const Page = () => {
+  return <ResourcesPage />;
 };
 
-export default ResourcesPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/sessions/page.tsx b/src/website2/src/app/clean-air-forum/sessions/page.tsx
index 010ab091cf..ecb0a22762 100644
--- a/src/website2/src/app/clean-air-forum/sessions/page.tsx
+++ b/src/website2/src/app/clean-air-forum/sessions/page.tsx
@@ -1,158 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import { format } from 'date-fns';
-import DOMPurify from 'dompurify';
-import React, { useState } from 'react';
-import { FaChevronDown, FaChevronUp } from 'react-icons/fa';
+import ProgramsPage from '@/views/cleanairforum/sessions-programs/ProgramsPage';
 
-import { Divider } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-import { isValidHTMLContent } from '@/utils/htmlValidator';
-import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-interface AccordionItemProps {
-  title: string;
-  subText: string;
-  sessions: any[];
-  isOpen: boolean;
-  onToggle: () => void;
-}
-
-const AccordionItem: React.FC<AccordionItemProps> = ({
-  title,
-  subText,
-  sessions,
-  isOpen,
-  onToggle,
-}) => {
-  const formatTime = (time: string) => {
-    try {
-      return format(new Date(`1970-01-01T${time}Z`), 'p');
-    } catch (error) {
-      console.error(error);
-      return time;
-    }
-  };
-
-  return (
-    <div className="bg-gray-100 rounded-lg shadow-sm py-2 px-4 mb-4">
-      <div
-        className="flex justify-between items-center cursor-pointer"
-        onClick={onToggle}
-      >
-        <div>
-          <h2 className="text-lg font-bold">{title}</h2>
-          <div
-            className="text-sm text-gray-600"
-            dangerouslySetInnerHTML={{ __html: renderContent(subText) }}
-          />
-        </div>
-        <span>{isOpen ? <FaChevronUp /> : <FaChevronDown />}</span>
-      </div>
-      {isOpen && (
-        <div className="mt-4 pt-4">
-          {sessions?.map((item: any, index: number) => (
-            <div className="flex flex-col gap-4" key={index}>
-              <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-              <div className="grid grid-cols-12 gap-4 mb-4">
-                <div className="col-span-2 text-sm font-semibold">
-                  {formatTime(item.start_time)}
-                </div>
-                <div className="col-span-10">
-                  <h3 className="font-bold">{item.session_title}</h3>
-                  <div
-                    className="text-sm"
-                    dangerouslySetInnerHTML={{
-                      __html: renderContent(item.session_details),
-                    }}
-                  />
-                </div>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
+export const metadata: Metadata = {
+  title: 'Sessions & Programs | Clean Air Forum | AirQo',
+  description:
+    'Explore the schedule and detailed program information for Clean Air Forum. Find out about the sessions, topics, and speakers shaping the future of air quality management.',
 };
 
-const ProgramsPage: React.FC = () => {
-  const { selectedEvent } = useForumData();
-  const [openAccordion, setOpenAccordion] = useState<string | null>(null);
-
-  if (!selectedEvent) {
-    return null;
-  }
-
-  const scheduleHTML = renderContent(selectedEvent.schedule_details);
-  const showSchedule = isValidHTMLContent(scheduleHTML);
-
-  const registrationHTML = renderContent(selectedEvent.registration_details);
-  const showRegistration = isValidHTMLContent(registrationHTML);
-
-  const sessionSections = selectedEvent.sections?.filter((section: any) => {
-    if (!section.pages.includes('session')) return false;
-    const sectionHTML = renderContent(section.content);
-    return isValidHTMLContent(sectionHTML);
-  });
-
-  const handleToggle = (id: string) => {
-    setOpenAccordion(openAccordion === id ? null : id);
-  };
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      {showSchedule && (
-        <div className="py-4">
-          <h1 className="text-2xl font-bold">Schedule</h1>
-          <div
-            dangerouslySetInnerHTML={{
-              __html: DOMPurify.sanitize(scheduleHTML),
-            }}
-          />
-        </div>
-      )}
-
-      {sessionSections && sessionSections.length > 0 && (
-        <>
-          {sessionSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-
-      <>
-        {selectedEvent.programs?.map((program: any) => (
-          <AccordionItem
-            key={program.id}
-            title={program.title}
-            subText={program.sub_text}
-            sessions={program.sessions}
-            isOpen={openAccordion === program.id}
-            onToggle={() => handleToggle(program.id)}
-          />
-        ))}
-      </>
-
-      {showRegistration && (
-        <div>
-          <Divider className="bg-black p-0 mb-4 h-[1px] w-full" />
-          <div className="flex flex-col md:flex-row md:space-x-8 py-6">
-            <div className="md:w-1/3 mb-4 md:mb-0">
-              <h1 className="text-2xl mt-4 pt-0 font-bold">Registration</h1>
-            </div>
-            <div
-              className="md:w-2/3 space-y-4"
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(registrationHTML),
-              }}
-            />
-          </div>
-        </div>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <ProgramsPage />;
 };
 
-export default ProgramsPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/speakers/page.tsx b/src/website2/src/app/clean-air-forum/speakers/page.tsx
index af98135d6f..155bca24e6 100644
--- a/src/website2/src/app/clean-air-forum/speakers/page.tsx
+++ b/src/website2/src/app/clean-air-forum/speakers/page.tsx
@@ -1,147 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import React, { useState } from 'react';
+import SpeakersPage from '@/views/cleanairforum/speakers/SpeakersPage';
 
-import { Divider, MemberCard, Pagination } from '@/components/ui/';
-import { useForumData } from '@/context/ForumDataContext';
-import { isValidHTMLContent } from '@/utils/htmlValidator';
-import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const SpeakersPage: React.FC = () => {
-  // Now we use the selectedEvent from context
-  const { selectedEvent } = useForumData();
-  const membersPerPage = 6;
-  const [currentKeyNotePage, setCurrentKeyNotePage] = useState(1);
-  const [currentSpeakersPage, setCurrentSpeakersPage] = useState(1);
-
-  if (!selectedEvent) {
-    return null;
-  }
-
-  // Filter keynote speakers and speakers from selectedEvent.persons.
-  // (Adjust your filtering logic as needed.)
-  const keyNoteSpeakers =
-    selectedEvent.persons?.filter(
-      (person: any) =>
-        person.category === 'Key Note Speaker' ||
-        person.category === 'Committee Member and Key Note Speaker',
-    ) || [];
-  const speakers =
-    selectedEvent.persons?.filter(
-      (person: any) =>
-        person.category === 'Speaker' ||
-        person.category === 'Speaker and Committee Member',
-    ) || [];
-
-  // Pagination calculations for Keynote Speakers.
-  const totalKeyNotePages = Math.ceil(keyNoteSpeakers.length / membersPerPage);
-  const startKeyNoteIdx = (currentKeyNotePage - 1) * membersPerPage;
-  const displayedKeyNoteSpeakers = keyNoteSpeakers.slice(
-    startKeyNoteIdx,
-    startKeyNoteIdx + membersPerPage,
-  );
-
-  // Pagination calculations for Speakers.
-  const totalSpeakersPages = Math.ceil(speakers.length / membersPerPage);
-  const startSpeakersIdx = (currentSpeakersPage - 1) * membersPerPage;
-  const displayedSpeakers = speakers.slice(
-    startSpeakersIdx,
-    startSpeakersIdx + membersPerPage,
-  );
-
-  // Handlers for page changes.
-  const handleKeyNotePageChange = (newPage: number) =>
-    setCurrentKeyNotePage(newPage);
-  const handleSpeakersPageChange = (newPage: number) =>
-    setCurrentSpeakersPage(newPage);
-
-  // Validate the main speakers text section.
-  const mainSpeakersHTML = renderContent(selectedEvent.speakers_text_section);
-  const showMainSpeakers = isValidHTMLContent(mainSpeakersHTML);
-
-  // Filter extra sections assigned to the "speakers" page.
-  const speakersExtraSections = selectedEvent.sections?.filter(
-    (section: any) => {
-      if (!section.pages.includes('speakers')) return false;
-      const sectionHTML = renderContent(section.content);
-      return isValidHTMLContent(sectionHTML);
-    },
-  );
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-
-      {/* Speakers Text Section */}
-      {showMainSpeakers && (
-        <div className="py-4">
-          <div
-            dangerouslySetInnerHTML={{
-              __html: DOMPurify.sanitize(mainSpeakersHTML),
-            }}
-          />
-        </div>
-      )}
-
-      {/* Keynote Speakers Section */}
-      <h1 className="text-2xl font-bold">Keynote Speakers</h1>
-
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
-        {displayedKeyNoteSpeakers.map((person: any) => (
-          <MemberCard
-            key={person.id}
-            member={person}
-            btnText="Read Bio"
-            cardClassName="bg-gray-100 p-2 rounded-md"
-          />
-        ))}
-      </div>
-      {totalKeyNotePages > 1 && (
-        <div className="py-6">
-          <Pagination
-            totalPages={totalKeyNotePages}
-            currentPage={currentKeyNotePage}
-            onPageChange={handleKeyNotePageChange}
-          />
-        </div>
-      )}
-
-      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-
-      {/* Speakers Section */}
-      <h2 className="text-2xl font-bold">Speakers</h2>
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
-        {displayedSpeakers.map((person: any) => (
-          <MemberCard
-            key={person.id}
-            member={person}
-            btnText="Read Bio"
-            cardClassName="bg-gray-100 p-2 rounded-md"
-          />
-        ))}
-      </div>
-      {totalSpeakersPages > 1 && (
-        <div className="py-6">
-          <Pagination
-            totalPages={totalSpeakersPages}
-            currentPage={currentSpeakersPage}
-            onPageChange={handleSpeakersPageChange}
-          />
-        </div>
-      )}
+export const metadata: Metadata = {
+  title: 'Speakers | Clean Air Forum | AirQo',
+  description:
+    'Meet the distinguished speakers at Clean Air Forum. Learn from industry leaders and experts who are driving change in air quality and environmental management.',
+};
 
-      {/* Extra Speakers Sections */}
-      {speakersExtraSections && speakersExtraSections.length > 0 && (
-        <>
-          {speakersExtraSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <SpeakersPage />;
 };
 
-export default SpeakersPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-forum/sponsorships/page.tsx b/src/website2/src/app/clean-air-forum/sponsorships/page.tsx
index 28e2a89534..7e3e96f2eb 100644
--- a/src/website2/src/app/clean-air-forum/sponsorships/page.tsx
+++ b/src/website2/src/app/clean-air-forum/sponsorships/page.tsx
@@ -1,82 +1,15 @@
-'use client';
+import { Metadata } from 'next';
 
-import DOMPurify from 'dompurify';
-import React from 'react';
+import SponsorshipPage from '@/views/cleanairforum/sponsorship/SponsorshipPage';
 
-import { Divider } from '@/components/ui';
-import { useForumData } from '@/context/ForumDataContext';
-import { renderContent } from '@/utils/quillUtils';
-import PaginatedSection from '@/views/cleanairforum/PaginatedSection';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
-
-const SponsorshipPage: React.FC = () => {
-  const { selectedEvent } = useForumData();
-  if (!selectedEvent) return null;
-
-  const sponsorPartner = selectedEvent.partners
-    ?.filter((partner: any) => partner.category === 'Sponsor Partner')
-    .map((partner: any) => ({
-      id: partner.id,
-      logoUrl: partner.partner_logo_url,
-    }));
-
-  const sponsorshipSections = selectedEvent.sections?.filter((section: any) => {
-    if (!section.pages.includes('sponsorships')) return false;
-    const html = renderContent(section.content);
-    return html.trim().length > 0;
-  });
-
-  const mainSponsorshipHTML = renderContent(
-    selectedEvent.sponsorship_opportunities_partners,
-  );
-  const showMainSponsorship = mainSponsorshipHTML.trim().length > 0;
-
-  return (
-    <div className="px-4 prose max-w-none lg:px-0">
-      {showMainSponsorship && (
-        <div>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div className="py-6">
-            <h1 className="text-2xl font-bold">Sponsorship opportunities</h1>
-
-            <div
-              dangerouslySetInnerHTML={{
-                __html: DOMPurify.sanitize(mainSponsorshipHTML),
-              }}
-            />
-          </div>
-        </div>
-      )}
-
-      {sponsorshipSections && sponsorshipSections.length > 0 && (
-        <>
-          {sponsorshipSections.map((section: any) => (
-            <SectionDisplay key={section.id} section={section} />
-          ))}
-        </>
-      )}
+export const metadata: Metadata = {
+  title: 'Sponsorship | Clean Air Forum | AirQo',
+  description:
+    'Discover sponsorship opportunities for Clean Air Forum. Learn about tailored sponsorship packages designed to support innovation and community engagement in air quality management.',
+};
 
-      {sponsorPartner && sponsorPartner.length > 0 && (
-        <>
-          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
-          <div>
-            <div className="flex flex-col md:flex-row md:space-x-8 py-6">
-              <div className="md:w-1/3 mb-4 md:mb-0">
-                <h1 className="text-2xl mt-0 font-bold text-gray-900">
-                  Sponsors
-                </h1>
-              </div>
-              <PaginatedSection
-                noClick={true}
-                logos={sponsorPartner}
-                sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
-              />
-            </div>
-          </div>
-        </>
-      )}
-    </div>
-  );
+const Page = () => {
+  return <SponsorshipPage />;
 };
 
-export default SponsorshipPage;
+export default Page;
diff --git a/src/website2/src/app/clean-air-network/about/page.tsx b/src/website2/src/app/clean-air-network/about/page.tsx
new file mode 100644
index 0000000000..b97864b717
--- /dev/null
+++ b/src/website2/src/app/clean-air-network/about/page.tsx
@@ -0,0 +1,19 @@
+import { Metadata } from 'next';
+
+import CleanAirPage from '@/views/cleanAirNetwork/about/CleanAirPage';
+
+export const metadata: Metadata = {
+  title: 'About Clean Air Network | AirQo',
+  description:
+    'Discover Clean Air Network – our mission, vision, and the collaborative efforts we undertake to drive innovation and improve air quality through community and stakeholder engagement.',
+};
+
+const Page = () => {
+  return (
+    <div>
+      <CleanAirPage />
+    </div>
+  );
+};
+
+export default Page;
diff --git a/src/website2/src/app/clean-air-network/events/[id]/page.tsx b/src/website2/src/app/clean-air-network/events/[id]/page.tsx
index 6b46e523ca..a30542cae5 100644
--- a/src/website2/src/app/clean-air-network/events/[id]/page.tsx
+++ b/src/website2/src/app/clean-air-network/events/[id]/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import SingleEvent from '@/views/cleanairforum/events/SingleEvent';
+import SingleEvent from '@/views/cleanAirNetwork/events/SingleEvent';
 
 const page = ({ params }: { params: any }) => {
   return (
diff --git a/src/website2/src/app/clean-air-network/events/page.tsx b/src/website2/src/app/clean-air-network/events/page.tsx
index 1033d25b12..e2b83ddc5e 100644
--- a/src/website2/src/app/clean-air-network/events/page.tsx
+++ b/src/website2/src/app/clean-air-network/events/page.tsx
@@ -1,6 +1,14 @@
-import EventsPage from '@/views/cleanairforum/events/EventsPage';
+import { Metadata } from 'next';
 
-const page = () => {
+import EventsPage from '@/views/cleanAirNetwork/events/EventsPage';
+
+export const metadata: Metadata = {
+  title: 'Events | Clean Air Network | AirQo',
+  description:
+    'Explore upcoming and past events hosted by Clean Air Network. Stay informed about conferences, webinars, and networking opportunities designed to advance clean air initiatives.',
+};
+
+const Page = () => {
   return (
     <div>
       <EventsPage />
@@ -8,4 +16,4 @@ const page = () => {
   );
 };
 
-export default page;
+export default Page;
diff --git a/src/website2/src/app/clean-air-network/membership/page.tsx b/src/website2/src/app/clean-air-network/membership/page.tsx
index ee1803b08d..f57f069738 100644
--- a/src/website2/src/app/clean-air-network/membership/page.tsx
+++ b/src/website2/src/app/clean-air-network/membership/page.tsx
@@ -1,6 +1,14 @@
-import MemberPage from '@/views/cleanairforum/membership/MemberPage';
+import { Metadata } from 'next';
 
-const page = () => {
+import MemberPage from '@/views/cleanAirNetwork/membership/MemberPage';
+
+export const metadata: Metadata = {
+  title: 'Membership | Clean Air Network | AirQo',
+  description:
+    'Join Clean Air Network – connect with professionals dedicated to advancing air quality. Learn about membership benefits, exclusive resources, and opportunities for collaboration.',
+};
+
+const Page = () => {
   return (
     <div>
       <MemberPage />
@@ -8,4 +16,4 @@ const page = () => {
   );
 };
 
-export default page;
+export default Page;
diff --git a/src/website2/src/app/clean-air-network/page.tsx b/src/website2/src/app/clean-air-network/page.tsx
deleted file mode 100644
index b7a801b61d..0000000000
--- a/src/website2/src/app/clean-air-network/page.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-
-import CleanAirPage from './CleanAirPage';
-
-const page = () => {
-  return (
-    <div>
-      <CleanAirPage />
-    </div>
-  );
-};
-
-export default page;
diff --git a/src/website2/src/app/clean-air-network/resources/page.tsx b/src/website2/src/app/clean-air-network/resources/page.tsx
index 805d6b0e40..985d5abf52 100644
--- a/src/website2/src/app/clean-air-network/resources/page.tsx
+++ b/src/website2/src/app/clean-air-network/resources/page.tsx
@@ -1,6 +1,14 @@
-import ResourcePage from '@/views/cleanairforum/resources/ResourcePage';
+import { Metadata } from 'next';
 
-const page = () => {
+import ResourcePage from '@/views/cleanAirNetwork/resources/ResourcePage';
+
+export const metadata: Metadata = {
+  title: 'Resources | Clean Air Network | AirQo',
+  description:
+    'Access a wide range of resources and insights on air quality management from Clean Air Network. Explore reports, case studies, and research to stay ahead in clean air initiatives.',
+};
+
+const Page = () => {
   return (
     <div>
       <ResourcePage />
@@ -8,4 +16,4 @@ const page = () => {
   );
 };
 
-export default page;
+export default Page;
diff --git a/src/website2/src/app/favicon.ico b/src/website2/src/app/favicon.ico
index 2e026677d8..80f940cae3 100644
Binary files a/src/website2/src/app/favicon.ico and b/src/website2/src/app/favicon.ico differ
diff --git a/src/website2/src/app/layout.tsx b/src/website2/src/app/layout.tsx
index 2f8b995d6f..a6061ec024 100644
--- a/src/website2/src/app/layout.tsx
+++ b/src/website2/src/app/layout.tsx
@@ -1,7 +1,7 @@
 import './globals.css';
 
-import dynamic from 'next/dynamic';
 import localFont from 'next/font/local';
+import Script from 'next/script';
 import { ReactNode, Suspense } from 'react';
 
 import EngagementDialog from '@/components/dialogs/EngagementDialog';
@@ -12,11 +12,6 @@ import { checkMaintenance } from '@/lib/maintenance';
 
 import MaintenancePage from './MaintenancePage';
 
-// Load the GA component dynamically, disabling SSR so that it runs only on the client.
-const GoogleAnalytics = dynamic(() => import('@/components/GoogleAnalytics'), {
-  ssr: false,
-});
-
 const interFont = localFont({
   src: [
     {
@@ -38,19 +33,128 @@ export default async function RootLayout({
 }: {
   children: ReactNode;
 }) {
+  const GA_ID = process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID || 'G-79ZVCLEDSG';
+  const siteUrl = 'https://airqo.net/';
+  const title = 'AirQo | Bridging the Air Quality Data Gap in Africa';
+  const description =
+    'AirQo is transforming air quality management in Africa by providing low-cost sensors, real-time data, and actionable insights to help communities and organizations improve air quality.';
+
+  const keywords = [
+    'AirQo',
+    'air quality monitoring',
+    'air pollution',
+    'PM1',
+    'PM2.5',
+    'PM10',
+    'NO2',
+    'SO2',
+    'CO',
+    'O3',
+    'air quality index',
+    'AQI',
+    'real-time air quality data',
+    'low-cost air sensors',
+    'urban air pollution',
+    'environmental monitoring',
+    'climate change',
+    'air quality management',
+    'clean air solutions',
+    'air quality in Africa',
+    'environmental health',
+    'ambient air monitoring',
+    'particulate matter',
+    'air quality forecasting',
+    'air quality analytics',
+    'pollution mitigation',
+    'environmental data',
+    'sustainable cities',
+    'public health',
+    'respiratory health',
+    'environmental policy',
+    'air quality research',
+    'air quality standards',
+    'air quality compliance',
+    'air pollution control',
+    'air quality education',
+  ].join(', ');
+
   const maintenance = await checkMaintenance();
-  const GA_MEASUREMENT_ID =
-    process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID || 'G-79ZVCLEDSG';
 
   return (
     <html lang="en" className={interFont.variable}>
+      <head>
+        {/* Primary SEO */}
+        <title>{title}</title>
+        <meta name="description" content={description} />
+        <meta name="keywords" content={keywords} />
+        <meta name="author" content="AirQo" />
+        <meta name="robots" content="index, follow" />
+        <meta name="apple-mobile-web-app-title" content="AirQo" />
+
+        {/* Real Favicon Generator / Favicon + App Icons */}
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon.png" />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="192x192"
+          href="/web-app-manifest-192x192.png"
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="512x512"
+          href="/web-app-manifest-512x512.png"
+        />
+        <link rel="icon" type="image/png" href="/icon.png" />
+        <link rel="shortcut icon" href="/favicon.ico" />
+
+        {/* Windows / MS Tiles */}
+        <meta name="msapplication-TileColor" content="#ffffff" />
+        <meta name="msapplication-TileImage" content="/ms-icon-144x144.png" />
+
+        {/* Manifest */}
+        <link rel="manifest" href="/manifest.json" />
+        <meta name="theme-color" content="#ffffff" />
+
+        {/* Open Graph / Facebook */}
+        <meta property="og:type" content="website" />
+        <meta property="og:url" content={siteUrl} />
+        <meta property="og:title" content={title} />
+        <meta property="og:description" content={description} />
+        <meta property="og:image" content={`${siteUrl}icon.png`} />
+        <meta property="og:image:width" content="1200" />
+        <meta property="og:image:height" content="630" />
+
+        {/* Twitter */}
+        <meta name="twitter:card" content="summary_large_image" />
+        <meta name="twitter:url" content={siteUrl} />
+        <meta name="twitter:title" content={title} />
+        <meta name="twitter:description" content={description} />
+        <meta name="twitter:image" content={`${siteUrl}icon.png`} />
+
+        {/* Canonical URL */}
+        <link rel="canonical" href={siteUrl} />
+
+        {/* GA snippet must appear in <head> for Search Console verification */}
+        <Script
+          src={`https://www.googletagmanager.com/gtag/js?id=${GA_ID}`}
+          strategy="beforeInteractive"
+        />
+        <Script id="ga-init" strategy="beforeInteractive">
+          {`
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){ dataLayer.push(arguments); }
+            gtag('js', new Date());
+            gtag('config', '${GA_ID}', {
+              page_path: window.location.pathname,
+            });
+          `}
+        </Script>
+      </head>
       <body>
         <ErrorBoundary>
           <ReduxDataProvider>
             <Suspense fallback={<Loading />}>
-              {/* Initialize & Track Google Analytics only on the client */}
-              <GoogleAnalytics measurementId={GA_MEASUREMENT_ID} />
-
               {maintenance.isActive ? (
                 <MaintenancePage message={maintenance.message} />
               ) : (
diff --git a/src/website2/src/components/dialogs/EngagementDialog.tsx b/src/website2/src/components/dialogs/EngagementDialog.tsx
index b058037e42..1bfd87d414 100644
--- a/src/website2/src/components/dialogs/EngagementDialog.tsx
+++ b/src/website2/src/components/dialogs/EngagementDialog.tsx
@@ -10,6 +10,7 @@ import { useDispatch, useSelector } from '@/hooks';
 import { postContactUs } from '@/services/externalService';
 import { closeModal } from '@/store/slices/modalSlice';
 
+import { trackEvent } from '../GoogleAnalytics';
 import { CustomButton } from '../ui';
 
 interface EngagementOption {
@@ -172,6 +173,17 @@ const EngagementDialog = () => {
         const res = await postContactUs(requestBody);
         if (res.success) {
           setSubmissionSuccess(true);
+
+          // Fire the tracking event only on successful submission.
+          trackEvent({
+            action: 'submit_form',
+            category: 'engagement_dialog',
+            label: selectedCategory
+              ? `engagement_dialog_submit_form_success_${selectedCategory}`
+              : 'engagement_dialog_submit_form_success',
+          });
+
+          // Reset form data after successful submission
           setFormData({
             firstName: '',
             lastName: '',
diff --git a/src/website2/src/components/layouts/Footer.tsx b/src/website2/src/components/layouts/Footer.tsx
index 24c76d3f8e..d70f13fd4f 100644
--- a/src/website2/src/components/layouts/Footer.tsx
+++ b/src/website2/src/components/layouts/Footer.tsx
@@ -1,12 +1,8 @@
 import Image from 'next/image';
 import Link from 'next/link';
 import React from 'react';
-import {
-  FaFacebookF,
-  FaLinkedinIn,
-  FaTwitter,
-  FaYoutube,
-} from 'react-icons/fa';
+import { FaFacebookF, FaLinkedinIn, FaYoutube } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 
 import mainConfig from '@/configs/mainConfigs';
 
@@ -33,9 +29,9 @@ const Footer = () => {
               width={70}
               height={60}
             />
-            <p className="text-gray-800 text-[16px] font-semibold mt-4">
+            <h1 className="text-gray-700 font-semibold mt-4">
               Clean air for all <br /> African Cities.
-            </p>
+            </h1>
           </div>
           <div className="flex space-x-4 mt-6">
             <Link
@@ -65,7 +61,7 @@ const Footer = () => {
               aria-label="Twitter"
               className="text-blue-600 bg-blue-50 rounded-full p-2 hover:bg-blue-200 transition-all"
             >
-              <FaTwitter size={14} />
+              <FaXTwitter size={14} />
             </Link>
           </div>
         </div>
diff --git a/src/website2/src/components/layouts/Navbar.tsx b/src/website2/src/components/layouts/Navbar.tsx
index 8d266dad70..fbb9938c36 100644
--- a/src/website2/src/components/layouts/Navbar.tsx
+++ b/src/website2/src/components/layouts/Navbar.tsx
@@ -20,7 +20,7 @@ import {
 import mainConfig from '@/configs/mainConfigs';
 import { useDispatch } from '@/hooks';
 import { openModal } from '@/store/slices/modalSlice';
-import TabNavigation from '@/views/cleanairforum/TabNavigation';
+import TabNavigation from '@/views/cleanAirNetwork/TabNavigation';
 
 import { trackEvent } from '../GoogleAnalytics';
 import NotificationBanner from './NotificationBanner';
@@ -225,13 +225,27 @@ const Navbar: React.FC = () => {
                 </NavigationMenuItem>
               ))}
               <CustomButton
-                onClick={() => dispatch(openModal())}
+                onClick={() => {
+                  trackEvent({
+                    action: 'button_click',
+                    category: 'engagement',
+                    label: 'get_involved',
+                  });
+                  dispatch(openModal());
+                }}
                 className="text-blue-600 bg-blue-50 transition rounded-none"
               >
                 Get involved
               </CustomButton>
               <CustomButton
-                onClick={() => router.push('/explore-data')}
+                onClick={() => {
+                  trackEvent({
+                    action: 'button_click',
+                    category: 'navigation',
+                    label: 'explore_data',
+                  });
+                  router.push('/explore-data');
+                }}
                 className="rounded-none"
               >
                 Explore data
diff --git a/src/website2/src/components/layouts/NewsLetter.tsx b/src/website2/src/components/layouts/NewsLetter.tsx
index 8c8f93706c..da39b56ca9 100644
--- a/src/website2/src/components/layouts/NewsLetter.tsx
+++ b/src/website2/src/components/layouts/NewsLetter.tsx
@@ -5,6 +5,8 @@ import { CustomButton } from '@/components/ui';
 import mainConfig from '@/configs/mainConfigs';
 import { subscribeToNewsletter } from '@/services/externalService';
 
+import { trackEvent } from '../GoogleAnalytics';
+
 const NewsLetter: React.FC = () => {
   const [formStatus, setFormStatus] = useState<'idle' | 'success' | 'error'>(
     'idle',
@@ -32,6 +34,11 @@ const NewsLetter: React.FC = () => {
       const response = await subscribeToNewsletter(formData);
       if (response.success) {
         setFormStatus('success');
+        trackEvent({
+          action: 'submit_form',
+          category: 'newsletter',
+          label: 'newsletter_subscription',
+        });
       } else {
         setFormStatus('error');
       }
@@ -71,7 +78,7 @@ const NewsLetter: React.FC = () => {
           // Split layout for idle state (header and form side-by-side on lg screens)
           <div className="flex flex-col lg:flex-row items-center lg:items-start lg:justify-between gap-12 w-full">
             <div className="lg:w-1/2 text-center lg:text-left space-y-4">
-              <h2 className="text-2xl md:text-[40px] font-bold text-blue-600">
+              <h2 className="text-2xl leading-tight md:text-[40px] font-bold text-blue-600">
                 Subscribe to our Newsletter
               </h2>
               <p className="text-blue-600 text-[20px]">
diff --git a/src/website2/src/components/layouts/NotificationBanner.tsx b/src/website2/src/components/layouts/NotificationBanner.tsx
index f80e02c09f..dd4348ad7d 100644
--- a/src/website2/src/components/layouts/NotificationBanner.tsx
+++ b/src/website2/src/components/layouts/NotificationBanner.tsx
@@ -10,7 +10,7 @@ import mainConfig from '@/configs/mainConfigs';
 
 import { trackEvent } from '../GoogleAnalytics';
 
-const CLEAN_AIR_NETWORK_ROUTE = '/clean-air-network';
+const CLEAN_AIR_NETWORK_ROUTE = '/clean-air-network/about';
 
 const NotificationBanner: React.FC = () => {
   const handleNetworkClick = (version: 'desktop' | 'mobile') => {
@@ -52,7 +52,7 @@ const NotificationBanner: React.FC = () => {
           <div
             className="items-center space-x-2 flex md:hidden cursor-pointer"
             onClick={(e) => {
-              e.stopPropagation(); // Prevent double event firing
+              e.stopPropagation();
               handleNetworkClick('mobile');
             }}
           >
diff --git a/src/website2/src/components/sections/footer/CountrySelectorDialog.tsx b/src/website2/src/components/sections/footer/CountrySelectorDialog.tsx
index 2c7fa9e713..fd206c8dd9 100644
--- a/src/website2/src/components/sections/footer/CountrySelectorDialog.tsx
+++ b/src/website2/src/components/sections/footer/CountrySelectorDialog.tsx
@@ -5,6 +5,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { FiChevronDown } from 'react-icons/fi';
 import { IoLocationSharp } from 'react-icons/io5';
 
+import { trackEvent } from '@/components/GoogleAnalytics';
 import {
   CustomButton,
   Dialog,
@@ -224,7 +225,16 @@ const CountrySelectorDialog: React.FC = () => {
   return (
     <Dialog open={isOpen} onOpenChange={setIsOpen}>
       <DialogTrigger asChild>
-        <button className="flex items-center space-x-2 px-4 py-2 bg-gray-100 rounded-xl text-gray-800 hover:bg-gray-200 transition-all">
+        <button
+          onClick={() => {
+            trackEvent({
+              action: 'button_click',
+              category: 'navigation',
+              label: 'country_selector',
+            });
+          }}
+          className="flex items-center space-x-2 px-4 py-2 bg-gray-100 rounded-xl text-gray-800 hover:bg-gray-200 transition-all"
+        >
           <IoLocationSharp size={20} color="#2563eb" />
           <span>
             {selectedCountryData?.long_name.replace('_', ' ') ||
diff --git a/src/website2/src/views/Forum/TabNavigation.tsx b/src/website2/src/views/Forum/TabNavigation.tsx
deleted file mode 100644
index e34eeb07dc..0000000000
--- a/src/website2/src/views/Forum/TabNavigation.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// components/layouts/TabNavigation.tsx
-'use client';
-
-import Link from 'next/link';
-import { usePathname, useSearchParams } from 'next/navigation';
-import React from 'react';
-
-const TabNavigation: React.FC = () => {
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  // Read the current slug, if it exists.
-  const currentSlug = searchParams.get('slug');
-
-  // Function to check if the tab is active based on the current pathname.
-  const isActiveTab = (path: string) =>
-    pathname === path || pathname.startsWith(path);
-
-  // Define the tabs list.
-  const tabs = [
-    { href: '/clean-air-forum/about', text: 'About' },
-    { href: '/clean-air-forum/program-committee', text: 'Programme Committee' },
-    { href: '/clean-air-forum/sessions', text: 'Call for Sessions' },
-    { href: '/clean-air-forum/speakers', text: 'Speakers' },
-    { href: '/clean-air-forum/partners', text: 'Partners' },
-    { href: '/clean-air-forum/sponsorships', text: 'Sponsorships' },
-    { href: '/clean-air-forum/logistics', text: 'Travel Logistics' },
-    { href: '/clean-air-forum/glossary', text: 'Glossary' },
-    { href: '/clean-air-forum/resources', text: 'Resources' },
-  ];
-
-  // If currentSlug exists, append it to the URL as a query parameter.
-  const buildHref = (href: string) => {
-    if (currentSlug) {
-      return `${href}?slug=${encodeURIComponent(currentSlug)}`;
-    }
-    return href;
-  };
-
-  return (
-    <div className="w-full py-10">
-      <div className="w-full bg-gray-50 py-4 overflow-x-auto">
-        <div className="max-w-5xl mx-auto flex flex-nowrap items-center space-x-6 px-4 lg:px-0">
-          {tabs.map((link, index) => (
-            <Link
-              key={index}
-              href={buildHref(link.href)}
-              className={`relative flex-shrink-0 no-underline text-gray-700 hover:text-gray-900 transition ${
-                isActiveTab(link.href) ? 'font-semibold text-gray-900' : ''
-              }`}
-            >
-              {link.text}
-              {isActiveTab(link.href) && (
-                <span className="absolute left-0 -bottom-2 h-[2px] w-full bg-gray-900" />
-              )}
-            </Link>
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default TabNavigation;
diff --git a/src/website2/src/views/about/AboutPage.tsx b/src/website2/src/views/about/AboutPage.tsx
index 55da3ea15e..c6ffd06b9e 100644
--- a/src/website2/src/views/about/AboutPage.tsx
+++ b/src/website2/src/views/about/AboutPage.tsx
@@ -15,7 +15,7 @@ import {
   useTeamMembers,
 } from '@/hooks/useApiHooks';
 import { openModal } from '@/store/slices/modalSlice';
-import PaginatedSection from '@/views/cleanairforum/PaginatedSection';
+import PaginatedSection from '@/views/cleanAirNetwork/PaginatedSection';
 
 /** Skeleton Loader Component **/
 
diff --git a/src/website2/src/views/cleanairforum/ContentSection.tsx b/src/website2/src/views/cleanAirNetwork/ContentSection.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/ContentSection.tsx
rename to src/website2/src/views/cleanAirNetwork/ContentSection.tsx
diff --git a/src/website2/src/views/cleanairforum/EventCard.tsx b/src/website2/src/views/cleanAirNetwork/EventCard.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/EventCard.tsx
rename to src/website2/src/views/cleanAirNetwork/EventCard.tsx
diff --git a/src/website2/src/views/cleanairforum/EventSkeleton.tsx b/src/website2/src/views/cleanAirNetwork/EventSkeleton.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/EventSkeleton.tsx
rename to src/website2/src/views/cleanAirNetwork/EventSkeleton.tsx
diff --git a/src/website2/src/views/cleanairforum/FeaturedEvent.tsx b/src/website2/src/views/cleanAirNetwork/FeaturedEvent.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/FeaturedEvent.tsx
rename to src/website2/src/views/cleanAirNetwork/FeaturedEvent.tsx
diff --git a/src/website2/src/views/cleanairforum/PaginatedSection.tsx b/src/website2/src/views/cleanAirNetwork/PaginatedSection.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/PaginatedSection.tsx
rename to src/website2/src/views/cleanAirNetwork/PaginatedSection.tsx
diff --git a/src/website2/src/views/cleanairforum/RegisterBanner.tsx b/src/website2/src/views/cleanAirNetwork/RegisterBanner.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/RegisterBanner.tsx
rename to src/website2/src/views/cleanAirNetwork/RegisterBanner.tsx
diff --git a/src/website2/src/views/cleanAirNetwork/TabNavigation.tsx b/src/website2/src/views/cleanAirNetwork/TabNavigation.tsx
new file mode 100644
index 0000000000..8733cdeac7
--- /dev/null
+++ b/src/website2/src/views/cleanAirNetwork/TabNavigation.tsx
@@ -0,0 +1,49 @@
+'use client';
+
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import type React from 'react';
+
+import mainConfig from '@/configs/mainConfigs';
+
+const tabs = [
+  { label: 'About', value: '/clean-air-network/about' },
+  { label: 'Membership', value: '/clean-air-network/membership' },
+  { label: 'Events', value: '/clean-air-network/events' },
+  { label: 'Resources', value: '/clean-air-network/resources' },
+];
+
+const TabNavigation: React.FC = () => {
+  const pathname = usePathname();
+
+  const isActiveTab = (tabValue: string) => {
+    if (tabValue === '/clean-air-network/about') {
+      return pathname === tabValue;
+    }
+    return pathname.startsWith(tabValue);
+  };
+
+  return (
+    <nav className="border-y pt-4 overflow-x-auto bg-white border-gray-200">
+      <div
+        className={`flex space-x-8 ${mainConfig.containerClass} px-4 lg:px-0`}
+      >
+        {tabs.map((tab) => (
+          <Link
+            key={tab.value}
+            href={tab.value}
+            className={`pb-2 text-[14px] font-normal transition-colors duration-300 ${
+              isActiveTab(tab.value)
+                ? 'text-blue-600 border-b-2 border-blue-600'
+                : 'text-gray-400 hover:text-gray-600'
+            }`}
+          >
+            {tab.label}
+          </Link>
+        ))}
+      </div>
+    </nav>
+  );
+};
+
+export default TabNavigation;
diff --git a/src/website2/src/app/clean-air-network/CleanAirPage.tsx b/src/website2/src/views/cleanAirNetwork/about/CleanAirPage.tsx
similarity index 95%
rename from src/website2/src/app/clean-air-network/CleanAirPage.tsx
rename to src/website2/src/views/cleanAirNetwork/about/CleanAirPage.tsx
index cd9601bc89..8b58f6e837 100644
--- a/src/website2/src/app/clean-air-network/CleanAirPage.tsx
+++ b/src/website2/src/views/cleanAirNetwork/about/CleanAirPage.tsx
@@ -2,8 +2,8 @@
 import Image from 'next/image';
 import React from 'react';
 
-import ContentSection from '@/views/cleanairforum/ContentSection';
-import FeaturedEvent from '@/views/cleanairforum/FeaturedEvent';
+import ContentSection from '@/views/cleanAirNetwork/ContentSection';
+import FeaturedEvent from '@/views/cleanAirNetwork/FeaturedEvent';
 
 const CleanAirPage = () => {
   const goals = [
diff --git a/src/website2/src/views/cleanairforum/events/EventsPage.tsx b/src/website2/src/views/cleanAirNetwork/events/EventsPage.tsx
similarity index 95%
rename from src/website2/src/views/cleanairforum/events/EventsPage.tsx
rename to src/website2/src/views/cleanAirNetwork/events/EventsPage.tsx
index b0b0302d78..d3d5e434c7 100644
--- a/src/website2/src/views/cleanairforum/events/EventsPage.tsx
+++ b/src/website2/src/views/cleanAirNetwork/events/EventsPage.tsx
@@ -14,9 +14,9 @@ import {
 } from '@/components/ui';
 import mainConfig from '@/configs/mainConfigs';
 import { useCleanAirEvents } from '@/hooks/useApiHooks';
-import EventCard from '@/views/cleanairforum/EventCard';
-import EventSkeleton from '@/views/cleanairforum/EventSkeleton';
-import RegisterBanner from '@/views/cleanairforum/RegisterBanner';
+import EventCard from '@/views/cleanAirNetwork/EventCard';
+import EventSkeleton from '@/views/cleanAirNetwork/EventSkeleton';
+import RegisterBanner from '@/views/cleanAirNetwork/RegisterBanner';
 
 const months = [
   'January',
diff --git a/src/website2/src/views/cleanairforum/events/SingleEvent.tsx b/src/website2/src/views/cleanAirNetwork/events/SingleEvent.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/events/SingleEvent.tsx
rename to src/website2/src/views/cleanAirNetwork/events/SingleEvent.tsx
diff --git a/src/website2/src/views/cleanairforum/membership/MemberPage.tsx b/src/website2/src/views/cleanAirNetwork/membership/MemberPage.tsx
similarity index 95%
rename from src/website2/src/views/cleanairforum/membership/MemberPage.tsx
rename to src/website2/src/views/cleanAirNetwork/membership/MemberPage.tsx
index 277bfb2a6e..8ee68149d2 100644
--- a/src/website2/src/views/cleanairforum/membership/MemberPage.tsx
+++ b/src/website2/src/views/cleanAirNetwork/membership/MemberPage.tsx
@@ -5,8 +5,8 @@ import React, { useMemo } from 'react';
 
 import mainConfig from '@/configs/mainConfigs';
 import { usePartners } from '@/hooks/useApiHooks';
-import PaginatedSection from '@/views/cleanairforum/PaginatedSection';
-import RegisterBanner from '@/views/cleanairforum/RegisterBanner';
+import PaginatedSection from '@/views/cleanAirNetwork/PaginatedSection';
+import RegisterBanner from '@/views/cleanAirNetwork/RegisterBanner';
 
 const SkeletonPaginatedSection: React.FC = () => {
   return (
diff --git a/src/website2/src/views/cleanairforum/resources/ResourceCard.tsx b/src/website2/src/views/cleanAirNetwork/resources/ResourceCard.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/resources/ResourceCard.tsx
rename to src/website2/src/views/cleanAirNetwork/resources/ResourceCard.tsx
diff --git a/src/website2/src/views/cleanairforum/resources/ResourcePage.tsx b/src/website2/src/views/cleanAirNetwork/resources/ResourcePage.tsx
similarity index 100%
rename from src/website2/src/views/cleanairforum/resources/ResourcePage.tsx
rename to src/website2/src/views/cleanAirNetwork/resources/ResourcePage.tsx
diff --git a/src/website2/src/views/Forum/BannerSection.tsx b/src/website2/src/views/cleanairforum/BannerSection.tsx
similarity index 92%
rename from src/website2/src/views/Forum/BannerSection.tsx
rename to src/website2/src/views/cleanairforum/BannerSection.tsx
index e7886bf2dc..c201a56a96 100644
--- a/src/website2/src/views/Forum/BannerSection.tsx
+++ b/src/website2/src/views/cleanairforum/BannerSection.tsx
@@ -8,11 +8,7 @@ import { CustomButton } from '@/components/ui';
 
 import TabNavigation from './TabNavigation';
 
-type BannerSectionProps = {
-  data: any; // Type it accordingly
-};
-
-const BannerSection: React.FC<BannerSectionProps> = ({ data }) => {
+const BannerSection = ({ data }: { data: any }) => {
   if (!data) {
     return null;
   }
diff --git a/src/website2/src/views/Forum/SectionDisplay.tsx b/src/website2/src/views/cleanairforum/SectionDisplay.tsx
similarity index 100%
rename from src/website2/src/views/Forum/SectionDisplay.tsx
rename to src/website2/src/views/cleanairforum/SectionDisplay.tsx
diff --git a/src/website2/src/views/cleanairforum/TabNavigation.tsx b/src/website2/src/views/cleanairforum/TabNavigation.tsx
index 9fb60cf74e..e34eeb07dc 100644
--- a/src/website2/src/views/cleanairforum/TabNavigation.tsx
+++ b/src/website2/src/views/cleanairforum/TabNavigation.tsx
@@ -1,48 +1,62 @@
+// components/layouts/TabNavigation.tsx
 'use client';
 
 import Link from 'next/link';
-import { usePathname } from 'next/navigation';
-import type React from 'react';
-
-import mainConfig from '@/configs/mainConfigs';
-
-const tabs = [
-  { label: 'About', value: '/clean-air-network' },
-  { label: 'Membership', value: '/clean-air-network/membership' },
-  { label: 'Events', value: '/clean-air-network/events' },
-  { label: 'Resources', value: '/clean-air-network/resources' },
-];
+import { usePathname, useSearchParams } from 'next/navigation';
+import React from 'react';
 
 const TabNavigation: React.FC = () => {
   const pathname = usePathname();
+  const searchParams = useSearchParams();
+  // Read the current slug, if it exists.
+  const currentSlug = searchParams.get('slug');
+
+  // Function to check if the tab is active based on the current pathname.
+  const isActiveTab = (path: string) =>
+    pathname === path || pathname.startsWith(path);
+
+  // Define the tabs list.
+  const tabs = [
+    { href: '/clean-air-forum/about', text: 'About' },
+    { href: '/clean-air-forum/program-committee', text: 'Programme Committee' },
+    { href: '/clean-air-forum/sessions', text: 'Call for Sessions' },
+    { href: '/clean-air-forum/speakers', text: 'Speakers' },
+    { href: '/clean-air-forum/partners', text: 'Partners' },
+    { href: '/clean-air-forum/sponsorships', text: 'Sponsorships' },
+    { href: '/clean-air-forum/logistics', text: 'Travel Logistics' },
+    { href: '/clean-air-forum/glossary', text: 'Glossary' },
+    { href: '/clean-air-forum/resources', text: 'Resources' },
+  ];
 
-  const isActiveTab = (tabValue: string) => {
-    if (tabValue === '/clean-air-network') {
-      return pathname === tabValue;
+  // If currentSlug exists, append it to the URL as a query parameter.
+  const buildHref = (href: string) => {
+    if (currentSlug) {
+      return `${href}?slug=${encodeURIComponent(currentSlug)}`;
     }
-    return pathname.startsWith(tabValue);
+    return href;
   };
 
   return (
-    <nav className="border-y pt-4 overflow-x-auto bg-white border-gray-200">
-      <div
-        className={`flex space-x-8 ${mainConfig.containerClass} px-4 lg:px-0`}
-      >
-        {tabs.map((tab) => (
-          <Link
-            key={tab.value}
-            href={tab.value}
-            className={`pb-2 text-[14px] font-normal transition-colors duration-300 ${
-              isActiveTab(tab.value)
-                ? 'text-blue-600 border-b-2 border-blue-600'
-                : 'text-gray-400 hover:text-gray-600'
-            }`}
-          >
-            {tab.label}
-          </Link>
-        ))}
+    <div className="w-full py-10">
+      <div className="w-full bg-gray-50 py-4 overflow-x-auto">
+        <div className="max-w-5xl mx-auto flex flex-nowrap items-center space-x-6 px-4 lg:px-0">
+          {tabs.map((link, index) => (
+            <Link
+              key={index}
+              href={buildHref(link.href)}
+              className={`relative flex-shrink-0 no-underline text-gray-700 hover:text-gray-900 transition ${
+                isActiveTab(link.href) ? 'font-semibold text-gray-900' : ''
+              }`}
+            >
+              {link.text}
+              {isActiveTab(link.href) && (
+                <span className="absolute left-0 -bottom-2 h-[2px] w-full bg-gray-900" />
+              )}
+            </Link>
+          ))}
+        </div>
       </div>
-    </nav>
+    </div>
   );
 };
 
diff --git a/src/website2/src/views/Forum/AboutPage.tsx b/src/website2/src/views/cleanairforum/about/AboutPage.tsx
similarity index 94%
rename from src/website2/src/views/Forum/AboutPage.tsx
rename to src/website2/src/views/cleanairforum/about/AboutPage.tsx
index c0ec9f38b3..a8112a636d 100644
--- a/src/website2/src/views/Forum/AboutPage.tsx
+++ b/src/website2/src/views/cleanairforum/about/AboutPage.tsx
@@ -7,7 +7,7 @@ import { Divider, NoData } from '@/components/ui';
 import { useForumData } from '@/context/ForumDataContext';
 import { isValidHTMLContent } from '@/utils/htmlValidator';
 import { renderContent } from '@/utils/quillUtils';
-import SectionDisplay from '@/views/Forum/SectionDisplay';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
 
 type SectionRowProps = {
   title: string;
@@ -27,7 +27,7 @@ const SectionRow: React.FC<SectionRowProps> = ({ title, children }) => (
   </>
 );
 
-const AboutPage: React.FC = () => {
+const AboutPage = () => {
   const { selectedEvent } = useForumData();
 
   if (!selectedEvent) {
diff --git a/src/website2/src/views/cleanairforum/glossary/GlossaryPage.tsx b/src/website2/src/views/cleanairforum/glossary/GlossaryPage.tsx
new file mode 100644
index 0000000000..e4a9f3d637
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/glossary/GlossaryPage.tsx
@@ -0,0 +1,115 @@
+'use client';
+
+import DOMPurify from 'dompurify';
+import Link from 'next/link';
+import React from 'react';
+
+import Loading from '@/components/loading';
+import { Divider } from '@/components/ui';
+import { NoData } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+import { ForumEvent } from '@/types/forum';
+import { isValidGlossaryContent } from '@/utils/glossaryValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+
+const GlossaryPage = () => {
+  // Access data from the context.
+  const { selectedEvent, eventTitles } = useForumData();
+
+  // If either is not available, show a loading state.
+  if (!selectedEvent || !eventTitles) {
+    return <Loading />;
+  }
+
+  // Extract the events list from eventTitles.
+  // If eventTitles is an array, use it directly; otherwise, assume it's a ForumTitlesResponse.
+  const eventsList: ForumEvent[] = Array.isArray(eventTitles)
+    ? eventTitles
+    : eventTitles.forum_events;
+
+  if (eventsList.length === 0) {
+    return <NoData message="No events found" />;
+  }
+
+  // Render the main glossary content using the selected event.
+  const glossaryHTML = renderContent(selectedEvent.glossary_details);
+  const showGlossaryMain = isValidGlossaryContent(glossaryHTML);
+
+  const glossarySections = selectedEvent.sections?.filter((section: any) => {
+    if (!section.pages.includes('glossary')) return false;
+    const html = renderContent(section.content);
+    return html.trim().length > 0;
+  });
+
+  return (
+    <div className="px-4 lg:px-0 prose max-w-none flex flex-col gap-6">
+      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+
+      {/* Clean Air Forum Events Section (Sidebar) */}
+      <div className="flex flex-col md:flex-row py-6 md:space-x-8">
+        {/* Left column: Heading */}
+        <div className="md:w-1/3 mb-4 md:mb-0">
+          <h1 className="text-2xl mt-4 font-semibold">
+            Clean Air Forum Events
+          </h1>
+        </div>
+        {/* Right column: List of event links */}
+        <div className="md:w-2/3">
+          <ul className="space-y-2">
+            {eventsList.map((event) => {
+              // Use the unique_title directly in the link.
+              const href = `/clean-air-forum/about?slug=${encodeURIComponent(
+                event.unique_title,
+              )}`;
+              return (
+                <li key={event.id}>
+                  <Link
+                    href={href}
+                    target="_blank"
+                    className="text-blue-600 hover:underline"
+                  >
+                    {event.title}
+                  </Link>
+                </li>
+              );
+            })}
+          </ul>
+        </div>
+      </div>
+
+      {/* Clean Air Glossary Section */}
+      {showGlossaryMain && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="flex flex-col py-6 md:flex-row md:space-x-8">
+            {/* Left column: Heading */}
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h1 className="text-2xl mt-4 font-bold text-gray-900">
+                Clean Air Glossary
+              </h1>
+            </div>
+            {/* Right column: Glossary content */}
+            <div
+              className="md:w-2/3"
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(glossaryHTML),
+              }}
+            ></div>
+          </div>
+        </>
+      )}
+
+      {/* Additional Glossary Sections (if any) */}
+      {glossarySections && glossarySections.length > 0 && (
+        <>
+          {glossarySections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default GlossaryPage;
diff --git a/src/website2/src/views/cleanairforum/logistics/LogisticsPage.tsx b/src/website2/src/views/cleanairforum/logistics/LogisticsPage.tsx
new file mode 100644
index 0000000000..dacaa3a9e1
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/logistics/LogisticsPage.tsx
@@ -0,0 +1,96 @@
+'use client';
+
+import DOMPurify from 'dompurify';
+import React from 'react';
+
+import Loading from '@/components/loading';
+import { Divider } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+import { isValidHTMLContent } from '@/utils/htmlValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+
+const LogisticsPage = () => {
+  // Destructure the selected event from the context.
+  const { selectedEvent } = useForumData();
+
+  // If selectedEvent is not available, show a loading state.
+  if (!selectedEvent) {
+    return <Loading />;
+  }
+
+  // Render static content from the event model.
+  const vaccinationHTML = renderContent(
+    selectedEvent.travel_logistics_vaccination_details,
+  );
+  const visaHTML = renderContent(selectedEvent.travel_logistics_visa_details);
+
+  const showVaccination = isValidHTMLContent(vaccinationHTML);
+  const showVisa = isValidHTMLContent(visaHTML);
+
+  // Filter extra sections assigned to the "logistics" page.
+  const logisticsSections = selectedEvent.sections?.filter(
+    (section: any) =>
+      section.pages.includes('logistics') &&
+      isValidHTMLContent(renderContent(section.content)),
+  );
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      {/* Render Vaccination Section if content exists */}
+      {showVaccination && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="py-6">
+            <div className="flex flex-col md:flex-row md:space-x-8">
+              <div className="md:w-1/3 mb-4 md:mb-0">
+                <h1 className="text-2xl mt-4 font-bold text-gray-900">
+                  Vaccination
+                </h1>
+              </div>
+              <div
+                className="md:w-2/3 space-y-4"
+                dangerouslySetInnerHTML={{
+                  __html: DOMPurify.sanitize(vaccinationHTML),
+                }}
+              />
+            </div>
+          </div>
+        </>
+      )}
+
+      {/* Render Visa Invitation Letter Section if content exists */}
+      {showVisa && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="py-6">
+            <div className="flex flex-col md:flex-row md:space-x-8">
+              <div className="md:w-1/3 mb-4 md:mb-0">
+                <h1 className="text-2xl mt-4 font-bold text-gray-900">
+                  Visa invitation letter
+                </h1>
+              </div>
+              <div
+                className="md:w-2/3 space-y-4"
+                dangerouslySetInnerHTML={{
+                  __html: DOMPurify.sanitize(visaHTML),
+                }}
+              />
+            </div>
+          </div>
+        </>
+      )}
+
+      {/* Render additional Logistics Sections, if any */}
+      {logisticsSections && logisticsSections.length > 0 && (
+        <>
+          {logisticsSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default LogisticsPage;
diff --git a/src/website2/src/views/cleanairforum/partners/PartnersPage.tsx b/src/website2/src/views/cleanairforum/partners/PartnersPage.tsx
new file mode 100644
index 0000000000..00a70287b6
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/partners/PartnersPage.tsx
@@ -0,0 +1,148 @@
+'use client';
+
+import DOMPurify from 'dompurify';
+import React from 'react';
+
+import { Divider } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+import { isValidHTMLContent } from '@/utils/htmlValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+import PaginatedSection from '@/views/cleanAirNetwork/PaginatedSection';
+
+const PartnersPage = () => {
+  const { selectedEvent } = useForumData();
+  if (!selectedEvent) return null;
+
+  const conveningPartners = selectedEvent.partners
+    ?.filter((partner: any) => partner.category === 'Co-Convening Partner')
+    .map((partner: any) => ({
+      id: partner.id,
+      logoUrl: partner.partner_logo_url,
+    }));
+
+  const hostPartners = selectedEvent.partners
+    ?.filter((partner: any) => partner.category === 'Host Partner')
+    .map((partner: any) => ({
+      id: partner.id,
+      logoUrl: partner.partner_logo_url,
+    }));
+
+  const programPartners = selectedEvent.partners
+    ?.filter((partner: any) => partner.category === 'Program Partner')
+    .map((partner: any) => ({
+      id: partner.id,
+      logoUrl: partner.partner_logo_url,
+    }));
+
+  const fundingPartners = selectedEvent.partners
+    ?.filter((partner: any) => partner.category === 'Funding Partner')
+    .map((partner: any) => ({
+      id: partner.id,
+      logoUrl: partner.partner_logo_url,
+    }));
+
+  const mainPartnersHTML = renderContent(selectedEvent.partners_text_section);
+  const showMainPartners = isValidHTMLContent(mainPartnersHTML);
+
+  const partnersSections = selectedEvent.sections?.filter((section: any) => {
+    if (!section.pages.includes('partners')) return false;
+    const sectionHTML = renderContent(section.content);
+    return isValidHTMLContent(sectionHTML);
+  });
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      {showMainPartners && (
+        <div className="py-4">
+          <h1 className="text-2xl font-bold">Partners</h1>
+          <div
+            dangerouslySetInnerHTML={{
+              __html: DOMPurify.sanitize(mainPartnersHTML),
+            }}
+          />
+        </div>
+      )}
+
+      {partnersSections && partnersSections.length > 0 && (
+        <>
+          {partnersSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+
+      {conveningPartners && conveningPartners.length > 0 && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="flex flex-col md:flex-row md:space-x-8">
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h2 className="text-2xl font-bold text-gray-900">
+                Convening partners and Collaborators
+              </h2>
+            </div>
+            <PaginatedSection
+              noClick={true}
+              logos={conveningPartners}
+              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
+            />
+          </div>
+        </>
+      )}
+
+      {hostPartners && hostPartners.length > 0 && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="flex flex-col md:flex-row md:space-x-8">
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h2 className="text-2xl font-bold text-gray-900">
+                Host partners
+              </h2>
+            </div>
+            <PaginatedSection
+              noClick={true}
+              logos={hostPartners}
+              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
+            />
+          </div>
+        </>
+      )}
+
+      {programPartners && programPartners.length > 0 && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="flex flex-col md:flex-row md:space-x-8">
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h2 className="text-2xl font-bold text-gray-900">Exhibitors</h2>
+            </div>
+            <PaginatedSection
+              noClick={true}
+              logos={programPartners}
+              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
+            />
+          </div>
+        </>
+      )}
+
+      {fundingPartners && fundingPartners.length > 0 && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="flex flex-col md:flex-row md:space-x-8">
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h2 className="text-2xl font-bold text-gray-900">
+                Funding Partners and Sponsors
+              </h2>
+            </div>
+            <PaginatedSection
+              noClick={true}
+              logos={fundingPartners}
+              sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
+            />
+          </div>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default PartnersPage;
diff --git a/src/website2/src/views/cleanairforum/program-committee/CommitteePage.tsx b/src/website2/src/views/cleanairforum/program-committee/CommitteePage.tsx
new file mode 100644
index 0000000000..dae9c51ee7
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/program-committee/CommitteePage.tsx
@@ -0,0 +1,121 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client';
+
+import DOMPurify from 'dompurify';
+import React, { useMemo, useState } from 'react';
+
+import { Divider, MemberCard, Pagination } from '@/components/ui/';
+import { useForumData } from '@/context/ForumDataContext';
+import { isValidHTMLContent } from '@/utils/htmlValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+
+const CommitteePage = () => {
+  // Always call useForumData to get the selectedEvent.
+  const { selectedEvent } = useForumData();
+
+  // Instead of conditionally calling hooks based on selectedEvent,
+  // extract fallback values unconditionally.
+  const persons = selectedEvent?.persons || [];
+  const sections = selectedEvent?.sections || [];
+  const committeeText = selectedEvent?.committee_text_section || '';
+
+  // Local state for pagination.
+  const [currentPage, setCurrentPage] = useState<number>(1);
+  const membersPerPage = 6;
+
+  // Memoize committee members using a fallback empty array.
+  const committeeMembers = useMemo(() => {
+    return persons.filter(
+      (person: any) =>
+        person.category === 'Committee Member' ||
+        person.category === 'Committee Member and Key Note Speaker' ||
+        person.category === 'Speaker and Committee Member',
+    );
+  }, [persons]);
+
+  // Calculate total pages.
+  const totalPages = useMemo(() => {
+    return Math.ceil(committeeMembers.length / membersPerPage);
+  }, [committeeMembers, membersPerPage]);
+
+  // Get members for the current page.
+  const displayedMembers = useMemo(() => {
+    const startIdx = (currentPage - 1) * membersPerPage;
+    return committeeMembers.slice(startIdx, startIdx + membersPerPage);
+  }, [currentPage, committeeMembers, membersPerPage]);
+
+  // Render main committee text.
+  const committeeHTML = renderContent(committeeText);
+  const showCommitteeMain = isValidHTMLContent(committeeHTML);
+
+  // Filter extra sections assigned to the "committee" page.
+  const committeeSections = useMemo(() => {
+    return sections.filter((section: any) => {
+      if (!section.pages.includes('committee')) return false;
+      const sectionHTML = renderContent(section.content);
+      return isValidHTMLContent(sectionHTML);
+    });
+  }, [sections]);
+
+  const handlePageChange = (newPage: number) => setCurrentPage(newPage);
+
+  // If selectedEvent is still not available, you might render a loading indicator.
+  if (!selectedEvent) {
+    return null;
+  }
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+
+      {/* Program Committee Text Section */}
+      <div>
+        {showCommitteeMain && (
+          <>
+            <h2 className="text-2xl font-bold">Program Committee</h2>
+            <div
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(committeeHTML),
+              }}
+            />
+          </>
+        )}
+      </div>
+
+      {/* Extra Committee Sections using SectionDisplay */}
+      {committeeSections.length > 0 && (
+        <>
+          {committeeSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+
+      {/* Member Cards Grid */}
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
+        {displayedMembers.map((person: any) => (
+          <MemberCard
+            key={person.id}
+            member={person}
+            btnText="Read Bio"
+            cardClassName="bg-gray-100 p-2 rounded-md"
+          />
+        ))}
+      </div>
+
+      {/* Pagination Component */}
+      {totalPages > 1 && (
+        <div className="py-6">
+          <Pagination
+            totalPages={totalPages}
+            currentPage={currentPage}
+            onPageChange={handlePageChange}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default CommitteePage;
diff --git a/src/website2/src/views/cleanairforum/resources/ResourcesPage.tsx b/src/website2/src/views/cleanairforum/resources/ResourcesPage.tsx
new file mode 100644
index 0000000000..e07c787345
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/resources/ResourcesPage.tsx
@@ -0,0 +1,148 @@
+'use client';
+
+import React, { useState } from 'react';
+import { FaChevronDown, FaChevronUp, FaFilePdf } from 'react-icons/fa';
+
+import { Divider } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+
+const getFileNameFromUrl = (url: string | null | undefined): string | null => {
+  if (!url || typeof url !== 'string') {
+    console.error('Invalid URL:', url);
+    return null;
+  }
+  const segments = url.split('/');
+  return segments.pop() || null;
+};
+
+const AccordionItem = ({ session, isOpen, toggleAccordion }: any) => {
+  return (
+    <div className="bg-gray-100 rounded-lg shadow-sm py-2 px-4 mb-4">
+      <div
+        className="flex justify-between items-center cursor-pointer"
+        onClick={toggleAccordion}
+      >
+        <h3 className="text-lg font-semibold text-blue-700">
+          {session.session_title}
+        </h3>
+        <span>{isOpen ? <FaChevronUp /> : <FaChevronDown />}</span>
+      </div>
+      {isOpen && (
+        <div className="mt-4">
+          {session?.resource_files?.map((file: any) => (
+            <div key={file.id} className="mb-4">
+              <div className="flex items-start space-x-2 pl-4">
+                <div>
+                  <p className="text-sm text-gray-900 font-semibold">
+                    {file.resource_summary}
+                  </p>
+                  <a
+                    href={file.file_url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-red-600 flex items-center"
+                  >
+                    <FaFilePdf className="mr-2" />
+                    {getFileNameFromUrl(file.file_url)}
+                  </a>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const ResourcesPage = () => {
+  const { selectedEvent } = useForumData();
+  const [openAccordions, setOpenAccordions] = useState<{
+    [resourceIndex: number]: { [sessionIndex: number]: boolean };
+  }>({});
+  const [allExpanded, setAllExpanded] = useState(false);
+
+  if (!selectedEvent) {
+    return null;
+  }
+
+  const handleToggleAccordion = (
+    resourceIndex: number,
+    sessionIndex: number,
+  ) => {
+    setOpenAccordions((prevState) => ({
+      ...prevState,
+      [resourceIndex]: {
+        ...prevState[resourceIndex],
+        [sessionIndex]: !prevState[resourceIndex]?.[sessionIndex],
+      },
+    }));
+  };
+
+  const handleExpandAll = () => {
+    setAllExpanded(true);
+    const expandedAccordions: any = {};
+    selectedEvent.forum_resources?.forEach(
+      (resource: any, resourceIndex: number) => {
+        expandedAccordions[resourceIndex] = {};
+        resource.resource_sessions?.forEach((_: any, sessionIndex: number) => {
+          expandedAccordions[resourceIndex][sessionIndex] = true;
+        });
+      },
+    );
+    setOpenAccordions(expandedAccordions);
+  };
+
+  const handleCollapseAll = () => {
+    setAllExpanded(false);
+    setOpenAccordions({});
+  };
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      <div className="flex justify-end space-x-4 mb-4">
+        <button
+          onClick={handleExpandAll}
+          className="bg-blue-600 text-white px-4 py-2 rounded hover:bg-blue-700"
+        >
+          Expand All
+        </button>
+        <button
+          onClick={handleCollapseAll}
+          className="bg-gray-500 text-white px-4 py-2 rounded hover:bg-gray-600"
+        >
+          Collapse All
+        </button>
+      </div>
+
+      {selectedEvent.forum_resources?.map(
+        (resource: any, resourceIndex: number) => (
+          <div key={resource.id} className="mb-8">
+            <h2 className="text-2xl font-bold text-gray-900 mb-4">
+              {resource.resource_title}
+            </h2>
+            {resource.resource_sessions?.map(
+              (session: any, sessionIndex: number) => (
+                <AccordionItem
+                  key={session.id}
+                  session={session}
+                  isOpen={
+                    allExpanded ||
+                    openAccordions[resourceIndex]?.[sessionIndex] ||
+                    false
+                  }
+                  toggleAccordion={() =>
+                    handleToggleAccordion(resourceIndex, sessionIndex)
+                  }
+                />
+              ),
+            )}
+            <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          </div>
+        ),
+      )}
+    </div>
+  );
+};
+
+export default ResourcesPage;
diff --git a/src/website2/src/views/cleanairforum/sessions-programs/ProgramsPage.tsx b/src/website2/src/views/cleanairforum/sessions-programs/ProgramsPage.tsx
new file mode 100644
index 0000000000..904e9cf4b3
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/sessions-programs/ProgramsPage.tsx
@@ -0,0 +1,158 @@
+'use client';
+
+import { format } from 'date-fns';
+import DOMPurify from 'dompurify';
+import React, { useState } from 'react';
+import { FaChevronDown, FaChevronUp } from 'react-icons/fa';
+
+import { Divider } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+import { isValidHTMLContent } from '@/utils/htmlValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+
+interface AccordionItemProps {
+  title: string;
+  subText: string;
+  sessions: any[];
+  isOpen: boolean;
+  onToggle: () => void;
+}
+
+const AccordionItem: React.FC<AccordionItemProps> = ({
+  title,
+  subText,
+  sessions,
+  isOpen,
+  onToggle,
+}) => {
+  const formatTime = (time: string) => {
+    try {
+      return format(new Date(`1970-01-01T${time}Z`), 'p');
+    } catch (error) {
+      console.error(error);
+      return time;
+    }
+  };
+
+  return (
+    <div className="bg-gray-100 rounded-lg shadow-sm py-2 px-4 mb-4">
+      <div
+        className="flex justify-between items-center cursor-pointer"
+        onClick={onToggle}
+      >
+        <div>
+          <h2 className="text-lg font-bold">{title}</h2>
+          <div
+            className="text-sm text-gray-600"
+            dangerouslySetInnerHTML={{ __html: renderContent(subText) }}
+          />
+        </div>
+        <span>{isOpen ? <FaChevronUp /> : <FaChevronDown />}</span>
+      </div>
+      {isOpen && (
+        <div className="mt-4 pt-4">
+          {sessions?.map((item: any, index: number) => (
+            <div className="flex flex-col gap-4" key={index}>
+              <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+              <div className="grid grid-cols-12 gap-4 mb-4">
+                <div className="col-span-2 text-sm font-semibold">
+                  {formatTime(item.start_time)}
+                </div>
+                <div className="col-span-10">
+                  <h3 className="font-bold">{item.session_title}</h3>
+                  <div
+                    className="text-sm prose"
+                    dangerouslySetInnerHTML={{
+                      __html: DOMPurify.sanitize(item.session_details),
+                    }}
+                  />
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
+
+const ProgramsPage = () => {
+  const { selectedEvent } = useForumData();
+  const [openAccordion, setOpenAccordion] = useState<string | null>(null);
+
+  if (!selectedEvent) {
+    return null;
+  }
+
+  const scheduleHTML = renderContent(selectedEvent.schedule_details);
+  const showSchedule = isValidHTMLContent(scheduleHTML);
+
+  const registrationHTML = renderContent(selectedEvent.registration_details);
+  const showRegistration = isValidHTMLContent(registrationHTML);
+
+  const sessionSections = selectedEvent.sections?.filter((section: any) => {
+    if (!section.pages.includes('session')) return false;
+    const sectionHTML = renderContent(section.content);
+    return isValidHTMLContent(sectionHTML);
+  });
+
+  const handleToggle = (id: string) => {
+    setOpenAccordion(openAccordion === id ? null : id);
+  };
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      {showSchedule && (
+        <div className="py-4">
+          <h1 className="text-2xl font-bold">Schedule</h1>
+          <div
+            dangerouslySetInnerHTML={{
+              __html: DOMPurify.sanitize(scheduleHTML),
+            }}
+          />
+        </div>
+      )}
+
+      {sessionSections && sessionSections.length > 0 && (
+        <>
+          {sessionSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+
+      <>
+        {selectedEvent.programs?.map((program: any) => (
+          <AccordionItem
+            key={program.id}
+            title={program.title}
+            subText={program.sub_text}
+            sessions={program.sessions}
+            isOpen={openAccordion === program.id}
+            onToggle={() => handleToggle(program.id)}
+          />
+        ))}
+      </>
+
+      {showRegistration && (
+        <div>
+          <Divider className="bg-black p-0 mb-4 h-[1px] w-full" />
+          <div className="flex flex-col md:flex-row md:space-x-8 py-6">
+            <div className="md:w-1/3 mb-4 md:mb-0">
+              <h1 className="text-2xl mt-4 pt-0 font-bold">Registration</h1>
+            </div>
+            <div
+              className="md:w-2/3 space-y-4"
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(registrationHTML),
+              }}
+            />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ProgramsPage;
diff --git a/src/website2/src/views/cleanairforum/speakers/SpeakersPage.tsx b/src/website2/src/views/cleanairforum/speakers/SpeakersPage.tsx
new file mode 100644
index 0000000000..b39f1a042c
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/speakers/SpeakersPage.tsx
@@ -0,0 +1,147 @@
+'use client';
+
+import DOMPurify from 'dompurify';
+import React, { useState } from 'react';
+
+import { Divider, MemberCard, Pagination } from '@/components/ui/';
+import { useForumData } from '@/context/ForumDataContext';
+import { isValidHTMLContent } from '@/utils/htmlValidator';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+
+const SpeakersPage = () => {
+  // Now we use the selectedEvent from context
+  const { selectedEvent } = useForumData();
+  const membersPerPage = 6;
+  const [currentKeyNotePage, setCurrentKeyNotePage] = useState(1);
+  const [currentSpeakersPage, setCurrentSpeakersPage] = useState(1);
+
+  if (!selectedEvent) {
+    return null;
+  }
+
+  // Filter keynote speakers and speakers from selectedEvent.persons.
+  // (Adjust your filtering logic as needed.)
+  const keyNoteSpeakers =
+    selectedEvent.persons?.filter(
+      (person: any) =>
+        person.category === 'Key Note Speaker' ||
+        person.category === 'Committee Member and Key Note Speaker',
+    ) || [];
+  const speakers =
+    selectedEvent.persons?.filter(
+      (person: any) =>
+        person.category === 'Speaker' ||
+        person.category === 'Speaker and Committee Member',
+    ) || [];
+
+  // Pagination calculations for Keynote Speakers.
+  const totalKeyNotePages = Math.ceil(keyNoteSpeakers.length / membersPerPage);
+  const startKeyNoteIdx = (currentKeyNotePage - 1) * membersPerPage;
+  const displayedKeyNoteSpeakers = keyNoteSpeakers.slice(
+    startKeyNoteIdx,
+    startKeyNoteIdx + membersPerPage,
+  );
+
+  // Pagination calculations for Speakers.
+  const totalSpeakersPages = Math.ceil(speakers.length / membersPerPage);
+  const startSpeakersIdx = (currentSpeakersPage - 1) * membersPerPage;
+  const displayedSpeakers = speakers.slice(
+    startSpeakersIdx,
+    startSpeakersIdx + membersPerPage,
+  );
+
+  // Handlers for page changes.
+  const handleKeyNotePageChange = (newPage: number) =>
+    setCurrentKeyNotePage(newPage);
+  const handleSpeakersPageChange = (newPage: number) =>
+    setCurrentSpeakersPage(newPage);
+
+  // Validate the main speakers text section.
+  const mainSpeakersHTML = renderContent(selectedEvent.speakers_text_section);
+  const showMainSpeakers = isValidHTMLContent(mainSpeakersHTML);
+
+  // Filter extra sections assigned to the "speakers" page.
+  const speakersExtraSections = selectedEvent.sections?.filter(
+    (section: any) => {
+      if (!section.pages.includes('speakers')) return false;
+      const sectionHTML = renderContent(section.content);
+      return isValidHTMLContent(sectionHTML);
+    },
+  );
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+
+      {/* Speakers Text Section */}
+      {showMainSpeakers && (
+        <div className="py-4">
+          <div
+            dangerouslySetInnerHTML={{
+              __html: DOMPurify.sanitize(mainSpeakersHTML),
+            }}
+          />
+        </div>
+      )}
+
+      {/* Keynote Speakers Section */}
+      <h1 className="text-2xl font-bold">Keynote Speakers</h1>
+
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
+        {displayedKeyNoteSpeakers.map((person: any) => (
+          <MemberCard
+            key={person.id}
+            member={person}
+            btnText="Read Bio"
+            cardClassName="bg-gray-100 p-2 rounded-md"
+          />
+        ))}
+      </div>
+      {totalKeyNotePages > 1 && (
+        <div className="py-6">
+          <Pagination
+            totalPages={totalKeyNotePages}
+            currentPage={currentKeyNotePage}
+            onPageChange={handleKeyNotePageChange}
+          />
+        </div>
+      )}
+
+      <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+
+      {/* Speakers Section */}
+      <h2 className="text-2xl font-bold">Speakers</h2>
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-4 py-6">
+        {displayedSpeakers.map((person: any) => (
+          <MemberCard
+            key={person.id}
+            member={person}
+            btnText="Read Bio"
+            cardClassName="bg-gray-100 p-2 rounded-md"
+          />
+        ))}
+      </div>
+      {totalSpeakersPages > 1 && (
+        <div className="py-6">
+          <Pagination
+            totalPages={totalSpeakersPages}
+            currentPage={currentSpeakersPage}
+            onPageChange={handleSpeakersPageChange}
+          />
+        </div>
+      )}
+
+      {/* Extra Speakers Sections */}
+      {speakersExtraSections && speakersExtraSections.length > 0 && (
+        <>
+          {speakersExtraSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default SpeakersPage;
diff --git a/src/website2/src/views/cleanairforum/sponsorship/SponsorshipPage.tsx b/src/website2/src/views/cleanairforum/sponsorship/SponsorshipPage.tsx
new file mode 100644
index 0000000000..397a6e3e79
--- /dev/null
+++ b/src/website2/src/views/cleanairforum/sponsorship/SponsorshipPage.tsx
@@ -0,0 +1,82 @@
+'use client';
+
+import DOMPurify from 'dompurify';
+import React from 'react';
+
+import { Divider } from '@/components/ui';
+import { useForumData } from '@/context/ForumDataContext';
+import { renderContent } from '@/utils/quillUtils';
+import SectionDisplay from '@/views/cleanairforum/SectionDisplay';
+import PaginatedSection from '@/views/cleanAirNetwork/PaginatedSection';
+
+const SponsorshipPage = () => {
+  const { selectedEvent } = useForumData();
+  if (!selectedEvent) return null;
+
+  const sponsorPartner = selectedEvent.partners
+    ?.filter((partner: any) => partner.category === 'Sponsor Partner')
+    .map((partner: any) => ({
+      id: partner.id,
+      logoUrl: partner.partner_logo_url,
+    }));
+
+  const sponsorshipSections = selectedEvent.sections?.filter((section: any) => {
+    if (!section.pages.includes('sponsorships')) return false;
+    const html = renderContent(section.content);
+    return html.trim().length > 0;
+  });
+
+  const mainSponsorshipHTML = renderContent(
+    selectedEvent.sponsorship_opportunities_partners,
+  );
+  const showMainSponsorship = mainSponsorshipHTML.trim().length > 0;
+
+  return (
+    <div className="px-4 prose max-w-none lg:px-0">
+      {showMainSponsorship && (
+        <div>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div className="py-6">
+            <h1 className="text-2xl font-bold">Sponsorship opportunities</h1>
+
+            <div
+              dangerouslySetInnerHTML={{
+                __html: DOMPurify.sanitize(mainSponsorshipHTML),
+              }}
+            />
+          </div>
+        </div>
+      )}
+
+      {sponsorshipSections && sponsorshipSections.length > 0 && (
+        <>
+          {sponsorshipSections.map((section: any) => (
+            <SectionDisplay key={section.id} section={section} />
+          ))}
+        </>
+      )}
+
+      {sponsorPartner && sponsorPartner.length > 0 && (
+        <>
+          <Divider className="bg-black p-0 m-0 h-[1px] w-full" />
+          <div>
+            <div className="flex flex-col md:flex-row md:space-x-8 py-6">
+              <div className="md:w-1/3 mb-4 md:mb-0">
+                <h1 className="text-2xl mt-0 font-bold text-gray-900">
+                  Sponsors
+                </h1>
+              </div>
+              <PaginatedSection
+                noClick={true}
+                logos={sponsorPartner}
+                sectionClassName="grid grid-cols-1 lg:grid-cols-2 w-full"
+              />
+            </div>
+          </div>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default SponsorshipPage;
diff --git a/src/website2/src/views/home/HomePlayerSection.tsx b/src/website2/src/views/home/HomePlayerSection.tsx
index 102fa7629a..c30499e92b 100644
--- a/src/website2/src/views/home/HomePlayerSection.tsx
+++ b/src/website2/src/views/home/HomePlayerSection.tsx
@@ -192,6 +192,11 @@ const HomePlayerSection: React.FC = () => {
   const modalPlayerRef = useRef<any>(null);
 
   const handlePlayButtonClick = useCallback(() => {
+    trackEvent({
+      action: 'video_play',
+      category: 'video',
+      label: 'home_page_video',
+    });
     setVideoState((prev) => ({ ...prev, isModalOpen: true }));
   }, []);