diff --git a/app/src/client/App.tsx b/app/src/client/App.tsx
index ee57ddd..8262653 100644
--- a/app/src/client/App.tsx
+++ b/app/src/client/App.tsx
@@ -5,6 +5,7 @@ import AppNavBar from './components/AppNavBar';
 import ServerNotRechableComponent from './components/ServerNotRechableComponent';
 import LoadingComponent from './components/LoadingComponent';
 import TosAndMarketingEmailsModal from './components/TosAndMarketingEmailsModal';
+import Footer from './components/Footer';
 import { useMemo, useEffect, ReactNode, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 
@@ -32,9 +33,10 @@ export default function App({ children }: { children: ReactNode }) {
 
   const shouldDisplayAppNavBar = useMemo(() => {
     return (
-      location.pathname !== '/' &&
-      location.pathname !== '/login' &&
-      location.pathname !== '/signup'
+      location.pathname !== '/'
+      // &&
+      // location.pathname !== '/login' &&
+      // location.pathname !== '/signup'
     );
   }, [location]);
 
@@ -114,9 +116,9 @@ export default function App({ children }: { children: ReactNode }) {
             )}
           </>
         ) : (
-          <>
+          <div className='relative flex flex-col min-h-screen justify-between'>
             {shouldDisplayAppNavBar && <AppNavBar />}
-            <div className='mx-auto max-w-7xl sm:px-6 lg:px-8'>
+            <div className='mx-auto max-w-7xl sm:px-6 lg:px-8 w-full'>
               {isError ? (
                 children
               ) : isLoading ? (
@@ -133,7 +135,15 @@ export default function App({ children }: { children: ReactNode }) {
                 ))
               )}
             </div>
-          </>
+            <div>
+              <Footer />
+              <div className='flex items-center h-20 '>
+                <p className='text-center w-full text-sm text-captn-dark-blue opacity-50'>
+                  © 2024 airt. All rights reserved.
+                </p>
+              </div>
+            </div>
+          </div>
         )}
       </div>
     </>
diff --git a/app/src/client/components/Footer.tsx b/app/src/client/components/Footer.tsx
new file mode 100644
index 0000000..d4e9152
--- /dev/null
+++ b/app/src/client/components/Footer.tsx
@@ -0,0 +1,35 @@
+import { footerNavigation } from '../landing-page/contentSections';
+
+const Footer = () => {
+  return (
+    <div>
+      <footer
+        aria-labelledby='footer-heading'
+        className='relative mt-5 border-t border-gray-900/10'
+      >
+        <div className='flex items-start justify-end mt-10 gap-20 mx-auto max-w-7xl sm:px-6 lg:px-8'>
+          <div>
+            <h3 className='text-sm font-semibold leading-6 text-captn-dark-blue dark:text-captn-light-cream'>
+              Company
+            </h3>
+            <ul role='list' className='mt-6 space-y-4'>
+              {footerNavigation.company.map((item) => (
+                <li key={item.name}>
+                  <a
+                    href={item.href}
+                    className='text-sm leading-6 text-captn-dark-blue hover:text-captn-light-blue dark:text-captn-light-cream'
+                    target={`${item.name === 'airt' ? '_blank' : '_self'}`}
+                  >
+                    {item.name}
+                  </a>
+                </li>
+              ))}
+            </ul>
+          </div>
+        </div>
+      </footer>
+    </div>
+  );
+};
+
+export default Footer;
diff --git a/app/src/client/landing-page/LandingPage.tsx b/app/src/client/landing-page/LandingPage.tsx
index d5dd79d..81e5812 100644
--- a/app/src/client/landing-page/LandingPage.tsx
+++ b/app/src/client/landing-page/LandingPage.tsx
@@ -17,7 +17,7 @@ import {
 } from './contentSections';
 import DropdownUser from '../components/DropdownUser';
 import { UserMenuItems } from '../components/UserMenuItems';
-import FreeTrialButton from '../components/FreeTrialButton';
+import Footer from '../components/Footer';
 import UserActionButton from '../components/UserActionButton';
 
 export default function LandingPage() {
@@ -389,7 +389,7 @@ export default function LandingPage() {
       </main>
 
       {/* Footer */}
-      <div className='mx-auto mt-6 max-w-7xl px-6 lg:px-8 dark:bg-boxdark-2'>
+      {/* <div className='mx-auto mt-6 max-w-7xl px-6 lg:px-8 dark:bg-boxdark-2'>
         <footer
           aria-labelledby='footer-heading'
           className='relative border-t border-gray-900/10 dark:border-gray-200/10 py-5 sm:mt-5'
@@ -398,44 +398,9 @@ export default function LandingPage() {
             Footer
           </h2>
           <div className='flex items-start justify-end mt-10 gap-20'>
-            {/* <div>
-              <h3 className='text-sm font-semibold leading-6 text-captn-dark-blue dark:text-captn-light-cream'>
-                App
-              </h3>
-              <ul role='list' className='mt-6 space-y-4'>
-                {footerNavigation.app.map((item) => (
-                  <li key={item.name}>
-                    <a
-                      href={item.href}
-                      className='text-sm leading-6 text-captn-dark-blue hover:text-captn-dark-blue dark:text-captn-light-cream'
-                    >
-                      {item.name}
-                    </a>
-                  </li>
-                ))}
-              </ul>
-            </div> */}
-            <div>
-              <h3 className='text-sm font-semibold leading-6 text-captn-dark-blue dark:text-captn-light-cream'>
-                Company
-              </h3>
-              <ul role='list' className='mt-6 space-y-4'>
-                {footerNavigation.company.map((item) => (
-                  <li key={item.name}>
-                    <a
-                      href={item.href}
-                      className='text-sm leading-6 text-captn-dark-blue hover:text-captn-light-blue dark:text-captn-light-cream'
-                      target={`${item.name === 'About' ? '_blank' : '_self'}`}
-                    >
-                      {item.name}
-                    </a>
-                  </li>
-                ))}
-              </ul>
-            </div>
           </div>
         </footer>
-      </div>
+      </div> */}
     </div>
   );
 }
diff --git a/app/src/client/landing-page/contentSections.ts b/app/src/client/landing-page/contentSections.ts
index 6564ba2..084e2da 100644
--- a/app/src/client/landing-page/contentSections.ts
+++ b/app/src/client/landing-page/contentSections.ts
@@ -113,8 +113,8 @@ export const footerNavigation = {
     { name: 'Blog', href: BLOG_URL },
   ],
   company: [
-    { name: 'About', href: 'https://airt.ai/' },
-    { name: 'Privacy', href: 'https://captn.ai/privacy' },
-    { name: 'Terms of Service', href: 'https://captn.ai/toc' },
+    { name: 'airt', href: 'https://airt.ai/' },
+    { name: 'Privacy', href: '/privacy' },
+    { name: 'Terms of Service', href: '/toc' },
   ],
 };