diff --git a/app/main.wasp b/app/main.wasp
index d2f3c37..1c55f03 100644
--- a/app/main.wasp
+++ b/app/main.wasp
@@ -31,7 +31,7 @@ app OpenSaaS {
       },
     },
     onAuthFailedRedirectTo: "/login",
-    onAuthSucceededRedirectTo: "/",
+    onAuthSucceededRedirectTo: "/chat",
   },
   db: { 
     system: PostgreSQL,
diff --git a/app/src/client/App.tsx b/app/src/client/App.tsx
index d961a65..546e916 100644
--- a/app/src/client/App.tsx
+++ b/app/src/client/App.tsx
@@ -108,7 +108,24 @@ export default function App({ children }: { children: ReactNode }) {
                 <TosAndMarketingEmailsModal />
               </>
             ) : (
-              children
+              <>
+                {isAdminDashboard ? (
+                  children
+                ) : (
+                  <div className='relative flex flex-col min-h-screen justify-between'>
+                    {shouldDisplayAppNavBar && <AppNavBar />}
+                    {children}
+                    <div>
+                      <Footer />
+                      <div className='flex items-center h-20 bg-airt-footer-copyrights'>
+                        <p className='text-center w-full text-sm text-airt-font-base opacity-50'>
+                          © 2024 airt. All rights reserved.
+                        </p>
+                      </div>
+                    </div>
+                  </div>
+                )}
+              </>
             )}
           </>
         ) : (
diff --git a/app/src/client/app/AccountPage.tsx b/app/src/client/app/AccountPage.tsx
index bec1673..7f23888 100644
--- a/app/src/client/app/AccountPage.tsx
+++ b/app/src/client/app/AccountPage.tsx
@@ -5,6 +5,7 @@ import { STRIPE_CUSTOMER_PORTAL_LINK } from '../../shared/constants';
 import { TierIds } from '../../shared/constants';
 import Button from '../components/Button';
 import FreeTrialButton from '../components/FreeTrialButton';
+import { MarketingEmailPreferenceSwitcher } from '../components/MarketingEmailPreferenceSwitcher';
 
 export default function AccountPage({ user }: { user: User }) {
   return (
@@ -63,10 +64,12 @@ export default function AccountPage({ user }: { user: User }) {
               )}
             </div>
             <div className='py-4 sm:grid sm:grid-cols-3 sm:gap-4 sm:py-5 sm:px-6'>
-              <dt className='text-sm font-medium text-airt-font-base dark:text-white'>About</dt>
-              <dd className='mt-1 text-sm text-airt-font-base dark:text-airt-font-base sm:col-span-2 sm:mt-0'>
-                I'm a cool customer.
-              </dd>
+              <dt className='text-sm font-medium text-airt-font-base'>I agree to receiving marketing emails</dt>
+              <>
+                <MarketingEmailPreferenceSwitcher
+                  hasSubscribedToMarketingEmails={user.hasSubscribedToMarketingEmails}
+                />
+              </>
             </div>
           </dl>
         </div>
diff --git a/app/src/client/auth/Auth.tsx b/app/src/client/auth/Auth.tsx
index a7ec8c3..6ed8365 100644
--- a/app/src/client/auth/Auth.tsx
+++ b/app/src/client/auth/Auth.tsx
@@ -27,7 +27,7 @@ export const MessageSuccess = styled(Message, {
 });
 
 const logoStyle = {
-  height: '6rem',
+  height: '3rem',
 };
 
 const Container = styled('div', {
@@ -75,24 +75,14 @@ function Auth({
 
   // const title = titles[state];
 
-  const socialButtonsDirection =
-    socialLayout === 'vertical' ? 'vertical' : 'horizontal';
+  const socialButtonsDirection = socialLayout === 'vertical' ? 'vertical' : 'horizontal';
 
   return (
     <div className={customTheme}>
       <div>
-        {logo && (
-          <img
-            className='mt-10 mx-auto'
-            style={logoStyle}
-            src={logo}
-            alt='Capt’n.ai'
-          />
-        )}
+        {logo && <img className='mt-10 mx-auto' style={logoStyle} src={logo} alt='Capt’n.ai' />}
         {/* <HeaderText>{title}</HeaderText> */}
-        <p className='mt-7 text-2xl'>
-          {state === 'signup' ? titles.signup : titles.login}
-        </p>
+        <p className='mt-7 text-2xl'>{state === 'signup' ? titles.signup : titles.login}</p>
       </div>
 
       {/* {errorMessage && (
@@ -103,9 +93,7 @@ function Auth({
         </MessageError>
       )} */}
       {successMessage && <MessageSuccess>{successMessage}</MessageSuccess>}
-      <AuthContext.Provider
-        value={{ isLoading, setIsLoading, setErrorMessage, setSuccessMessage }}
-      >
+      <AuthContext.Provider value={{ isLoading, setIsLoading, setErrorMessage, setSuccessMessage }}>
         {(state === 'login' || state === 'signup') && (
           <LoginSignupForm
             state={state}
diff --git a/app/src/client/auth/LoginSignupForm.tsx b/app/src/client/auth/LoginSignupForm.tsx
index a42de1d..f3529cf 100644
--- a/app/src/client/auth/LoginSignupForm.tsx
+++ b/app/src/client/auth/LoginSignupForm.tsx
@@ -45,8 +45,7 @@ const SocialAuthButtons = styled('div', {
 const googleSignInUrl = `${config.apiUrl}/auth/google/login`;
 
 export const checkBoxErrMsg = {
-  title:
-    "To proceed, please ensure you've accepted our Terms & Conditions and Privacy Policy.",
+  title: "To proceed, please ensure you've accepted our Terms & Conditions and Privacy Policy.",
   description: '',
 };
 
@@ -65,8 +64,7 @@ export const LoginSignupForm = ({
   additionalSignupFields?: any;
   errorMessage?: any;
 }) => {
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } =
-    useContext(AuthContext);
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext);
   const [tocChecked, setTocChecked] = useState(false);
   const [marketingEmailsChecked, setMarketingEmailsChecked] = useState(false);
   const [loginFlow, setLoginFlow] = useState(state);
@@ -87,9 +85,7 @@ export const LoginSignupForm = ({
     setTocChecked(event.target.checked);
   };
 
-  const handleMarketingEmailsChange = (
-    event: React.ChangeEvent<HTMLInputElement>
-  ) => {
+  const handleMarketingEmailsChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setMarketingEmailsChecked(event.target.checked);
   };
 
@@ -97,16 +93,10 @@ export const LoginSignupForm = ({
     localStorage.removeItem('hasAcceptedTos');
     localStorage.removeItem('hasSubscribedToMarketingEmails');
     localStorage.setItem('hasAcceptedTos', JSON.stringify(tocChecked));
-    localStorage.setItem(
-      'hasSubscribedToMarketingEmails',
-      JSON.stringify(marketingEmailsChecked)
-    );
+    localStorage.setItem('hasSubscribedToMarketingEmails', JSON.stringify(marketingEmailsChecked));
   };
 
-  const handleClick = (
-    event: React.MouseEvent<HTMLButtonElement>,
-    googleSignInUrl: string
-  ) => {
+  const handleClick = (event: React.MouseEvent<HTMLButtonElement>, googleSignInUrl: string) => {
     event.preventDefault();
     if (loginFlow === State.Login) {
       updateLocalStorage();
@@ -121,8 +111,7 @@ export const LoginSignupForm = ({
     }
   };
 
-  const googleBtnText =
-    loginFlow === State.Login ? 'Sign in with Google' : 'Sign up with Google';
+  const googleBtnText = loginFlow === State.Login ? 'Sign in with Google' : 'Sign up with Google';
 
   return (
     <>
@@ -139,9 +128,7 @@ export const LoginSignupForm = ({
         <SocialAuthButtons gap='large' direction={socialButtonsDirection}>
           <button
             className='gsi-material-button'
-            onClick={(event: React.MouseEvent<HTMLButtonElement>) =>
-              handleClick(event, googleSignInUrl)
-            }
+            onClick={(event: React.MouseEvent<HTMLButtonElement>) => handleClick(event, googleSignInUrl)}
           >
             <div className='gsi-material-button-state'></div>
             <div className='gsi-material-button-content-wrapper'>
@@ -172,9 +159,7 @@ export const LoginSignupForm = ({
                   <path fill='none' d='M0 0h48v48H0z'></path>
                 </svg>
               </div>
-              <span className='gsi-material-button-contents'>
-                {googleBtnText}
-              </span>
+              <span className='gsi-material-button-contents'>{googleBtnText}</span>
               <span style={{ display: 'none' }}>{googleBtnText}</span>
             </div>
           </button>
@@ -182,12 +167,10 @@ export const LoginSignupForm = ({
       </SocialAuth>
       <div className='flex items-center justify-center'>
         <span className='text-sm block'>
-          {loginFlow === State.Login
-            ? "Don't have an account? "
-            : 'Already have an account? '}
+          {loginFlow === State.Login ? "Don't have an account? " : 'Already have an account? '}
           <Link
             to={loginFlow === State.Login ? '/signup' : '/login'}
-            className='no-underline hover:underline cursor-pointer'
+            className='no-underline hover:underline cursor-pointer text-airt-secondary'
           >
             {loginFlow === State.Login ? 'Sign up' : 'Sign in'}
           </Link>
diff --git a/app/src/client/components/AnimatedCharacterLoader.tsx b/app/src/client/components/AnimatedCharacterLoader.tsx
index d8d3659..93c5e7f 100644
--- a/app/src/client/components/AnimatedCharacterLoader.tsx
+++ b/app/src/client/components/AnimatedCharacterLoader.tsx
@@ -33,7 +33,7 @@ const AnimatedCharacterLoader: React.FC<AnimatedCharacterLoaderProps> = ({
     >
       <div
         style={{ maxWidth: '800px', margin: 'auto' }}
-        className={`relative ml-3 block w-full p-4 pl-10 text-sm text-captn-light-cream  border-captn-dark-blue rounded-lg ${bgColor} `}
+        className={`relative ml-3 block w-full p-4 pl-10 text-sm text-airt-font-base  border-captn-dark-blue rounded-lg ${bgColor} `}
       >
         {showLogo && (
           <span
diff --git a/app/src/client/components/MarketingEmailPreferenceSwitcher.tsx b/app/src/client/components/MarketingEmailPreferenceSwitcher.tsx
new file mode 100644
index 0000000..c1286c3
--- /dev/null
+++ b/app/src/client/components/MarketingEmailPreferenceSwitcher.tsx
@@ -0,0 +1,80 @@
+import React, { useState } from 'react';
+
+import { updateCurrentUser } from 'wasp/client/operations';
+import NotificationBox from './NotificationBox';
+
+export function MarketingEmailPreferenceSwitcher({
+  hasSubscribedToMarketingEmails,
+}: {
+  hasSubscribedToMarketingEmails: boolean;
+}) {
+  const [status, setStatus] = useState(hasSubscribedToMarketingEmails);
+  const [hasChanged, setHasChanged] = useState(false);
+  const [notificationType, setNotificationType] = useState<string | null>(null);
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setStatus(e.target.value === 'Yes');
+    setHasChanged(true);
+  };
+
+  const onClick = () => {
+    setNotificationType(null);
+  };
+
+  const handleClick = async (status: boolean) => {
+    try {
+      await updateCurrentUser({ hasSubscribedToMarketingEmails: status });
+      setNotificationType('success');
+    } catch (e) {
+      setNotificationType('error');
+    }
+    setHasChanged(false);
+  };
+
+  const notificationMsg =
+    notificationType === 'success'
+      ? 'Your changes are saved successfully.'
+      : 'Something went wrong. Please try again later.';
+
+  return (
+    <>
+      {notificationType && (
+        <NotificationBox type={notificationType as 'success' | 'error'} onClick={onClick} message={notificationMsg} />
+      )}
+      <div className='mt-1 text-sm text-captn-dark-blue sm:col-span-1 sm:mt-0'>
+        <label className='mr-4'>
+          <input
+            type='radio'
+            value='Yes'
+            checked={status}
+            onChange={handleChange}
+            className='form-radio text-captn-light-blue mr-2 focus:ring-1 outline-none'
+          />
+          Yes
+        </label>
+        <label>
+          <input
+            type='radio'
+            value='No'
+            checked={!status}
+            onChange={handleChange}
+            className='form-radio text-captn-light-blue mr-2 focus:ring-1 outline-none'
+          />
+          No
+        </label>
+      </div>
+
+      <div className='ml-0 md:ml-4 flex-shrink-0 sm:col-span-1 sm:mt-0' style={{ height: '24px' }}>
+        <button
+          onClick={() => handleClick(status)}
+          disabled={!hasChanged}
+          className={`mt-4 md:-mt-10 no-underline rounded-md px-3.5 py-2.5 text-sm text-airt-font-base ring-1 ring-inset ring-gray-200  shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 dark:text-captn-light-cream bg-airt-primary hover:bg-opacity-85 ${
+            !hasChanged ? 'opacity-40 cursor-not-allowed' : ''
+          }`}
+        >
+          Save
+        </button>
+      </div>
+    </>
+  );
+}
diff --git a/app/src/client/components/NotificationBox.tsx b/app/src/client/components/NotificationBox.tsx
new file mode 100644
index 0000000..bcc71b4
--- /dev/null
+++ b/app/src/client/components/NotificationBox.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+
+interface NotificationBoxProps {
+  type: 'success' | 'error';
+  message: string;
+  onClick: () => void;
+}
+
+const NotificationBox: React.FC<NotificationBoxProps> = ({ type, message, onClick }) => {
+  const isSuccess = type === 'success';
+
+  return (
+    <div className='fixed inset-0 flex items-center justify-center z-50 p-16 backdrop-blur-sm bg-airt-font-base/30'>
+      <div className='bg-airt-primary rounded-lg shadow-lg p-8 m-4 max-w-sm mx-auto'>
+        <h2 className='text-xl font-bold mb-4 text-airt-font-base'>{isSuccess ? 'Success' : 'Error'}</h2>
+        <p className='text-airt-font-base'>{message}</p>
+        <div className='mt-4 text-right'>
+          <button
+            onClick={onClick}
+            className={`py-2 px-4 rounded text-airt-font-base focus:outline-none ${
+              isSuccess ? 'bg-airt-secondary' : 'bg-airt-secondary'
+            }`}
+          >
+            OK
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default NotificationBox;
diff --git a/app/src/client/components/TosAndMarketingEmails.tsx b/app/src/client/components/TosAndMarketingEmails.tsx
index 7ade8aa..df549b2 100644
--- a/app/src/client/components/TosAndMarketingEmails.tsx
+++ b/app/src/client/components/TosAndMarketingEmails.tsx
@@ -30,39 +30,23 @@ const TosAndMarketingEmails: React.FC<TosAndMarketingEmailsProps> = ({
   handleMarketingEmailsChange,
   errorMessage,
 }) => (
-  <div className='toc-marketing-checkbox-wrapper text-captn-light-cream'>
+  <div className='toc-marketing-checkbox-wrapper text-airt-font-base'>
     <div className='mt-4'>
       <label className='checkbox-container text-sm mb-2' htmlFor='toc'>
         I agree to the{' '}
-        <Link
-          to='/toc'
-          className='no-underline hover:underline'
-          target='_blank'
-        >
+        <Link to='/toc' className='no-underline hover:underline text-airt-secondary' target='_blank'>
           Terms & Conditions
         </Link>{' '}
         and{' '}
-        <Link
-          to='/privacy'
-          className='no-underline hover:underline'
-          target='_blank'
-        >
+        <Link to='/privacy' className='no-underline hover:underline text-airt-secondary' target='_blank'>
           Privacy Policy
         </Link>
-        <input
-          type='checkbox'
-          id='toc'
-          checked={tocChecked}
-          onChange={handleTocChange}
-        />
+        <input type='checkbox' id='toc' checked={tocChecked} onChange={handleTocChange} />
         <span className='checkmark'></span>
       </label>
     </div>
     <div>
-      <label
-        className='checkbox-container text-sm mb-2'
-        htmlFor='marketingEmails'
-      >
+      <label className='checkbox-container text-sm mb-2' htmlFor='marketingEmails'>
         I agree to receiving marketing emails
         <input
           type='checkbox'
diff --git a/app/src/client/components/TosAndMarketingEmailsModal.tsx b/app/src/client/components/TosAndMarketingEmailsModal.tsx
index 53ad9fd..2de25db 100644
--- a/app/src/client/components/TosAndMarketingEmailsModal.tsx
+++ b/app/src/client/components/TosAndMarketingEmailsModal.tsx
@@ -17,8 +17,7 @@ export const notificationMsg =
 
 const TosAndMarketingEmailsModal = () => {
   const history = useHistory();
-  const { isLoading, setSuccessMessage, setIsLoading } =
-    useContext(AuthContext);
+  const { isLoading, setSuccessMessage, setIsLoading } = useContext(AuthContext);
   const [errorMessage, setErrorMessage] = useState<ErrorMessage | null>(null);
 
   const [tocChecked, setTocChecked] = useState(false);
@@ -34,9 +33,7 @@ const TosAndMarketingEmailsModal = () => {
     setTocChecked(event.target.checked);
   };
 
-  const handleMarketingEmailsChange = (
-    event: React.ChangeEvent<HTMLInputElement>
-  ) => {
+  const handleMarketingEmailsChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setMarketingEmailsChecked(event.target.checked);
   };
 
@@ -66,12 +63,10 @@ const TosAndMarketingEmailsModal = () => {
       {!isAccountPage && <AppNavBar />}
 
       <div className='flex items-center justify-center z-50 p-16 backdrop-blur-sm bg-captn-light-cream/30 mt-16'>
-        <div className='toc-marketing-container bg-captn-dark-blue rounded-lg shadow-lg p-8 m-4 max-w-xl mx-auto'>
+        <div className='toc-marketing-container bg-airt-primary rounded-lg shadow-lg p-8 m-4 max-w-xl mx-auto'>
           <div className='inner-wrapper'>
-            <h2 className='text-xl font-bold mb-4 text-captn-light-cream'>
-              Almost there...
-            </h2>
-            <p className='text-captn-light-cream'>{notificationMsg}</p>
+            <h2 className='text-xl font-bold mb-4 text-airt-font-base'>Almost there...</h2>
+            <p className='text-airt-font-base'>{notificationMsg}</p>
             <TosAndMarketingEmails
               tocChecked={tocChecked}
               handleTocChange={handleTocChange}
@@ -83,7 +78,7 @@ const TosAndMarketingEmailsModal = () => {
             <div className='mt-6 text-right'>
               <button
                 onClick={onClick}
-                className='mt-4 md:-mt-10 no-underline rounded-md px-3.5 py-2.5 text-sm text-captn-light-cream  hover:bg-captn-cta-green-hover shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 dark:text-captn-light-cream bg-captn-cta-green '
+                className='mt-4 md:-mt-10 no-underline rounded-md px-3.5 py-2.5 text-sm  bg-airt-secondary text-airt-font-base hover:bg-opacity-85 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'
               >
                 Save
               </button>