diff --git a/components/Footer.tsx b/components/Footer.tsx
index 348e037..a4c199e 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -1,13 +1,15 @@
 import NextLink from "next/link";
 
 export const FooterSections = (props: { children: React.ReactNode }) => (
-  <div className="flex justify-between flex-wrap gap-y-10 gap-x-2">
+  <div className="flex justify-between flex-wrap gap-x-10 gap-y-2">
     {props.children}
   </div>
 );
 
 export const FooterSection = (props: { children: React.ReactNode }) => (
-  <div className="flex flex-col gap-2 flex-grow basis-36">{props.children}</div>
+  <div className="flex flex-col flex-grow  flex-1 whitespace-nowrap basis-36 my-2 gap-2">
+    {props.children}
+  </div>
 );
 
 export const FooterSectionTitle = (props: { children: React.ReactNode }) => (
diff --git a/containers/AppFooter.tsx b/containers/AppFooter.tsx
index c477392..685b288 100644
--- a/containers/AppFooter.tsx
+++ b/containers/AppFooter.tsx
@@ -12,22 +12,31 @@ export const AppFooter: React.FC = () => (
     <Container>
       <FooterSections>
         <FooterSection>
-          <FooterSectionTitle>Getting Started</FooterSectionTitle>
-          <FooterLink href="/docs/installation">Installation</FooterLink>
-          <FooterLink href="/docs/capture-screenshots">
-            Capture screenshots
+          <FooterSectionTitle>Product</FooterSectionTitle>
+          <FooterLink href="/docs/introduction">What is Argos?</FooterLink>
+          <FooterLink href="/docs/review-changes">Review changes</FooterLink>
+          <FooterLink href="/pricing">Pricing</FooterLink>
+          <FooterLink href="https://github.com/orgs/argos-ci/projects/1">
+            Roadmap
           </FooterLink>
-          <FooterLink href="/docs/configure-ci">Configure CI</FooterLink>
-          <FooterLink href="https://github.com/marketplace/argos-ci">
-            View on GitHub Marketplace
+        </FooterSection>
+
+        <FooterSection>
+          <FooterSectionTitle>Developers</FooterSectionTitle>
+          <FooterLink href="/docs/installation">Installation</FooterLink>
+          <FooterLink href="/docs/introduction">Documentation</FooterLink>
+          <FooterLink href="/docs/upload-screenshots">Configure CI</FooterLink>
+          <FooterLink href="https://github.com/argos-ci/argos/tree/main/examples">
+            Examples
           </FooterLink>
         </FooterSection>
 
         <FooterSection>
-          <FooterSectionTitle>Legal</FooterSectionTitle>
-          <FooterLink href="/terms">Terms</FooterLink>
-          <FooterLink href="/privacy">Privacy</FooterLink>
+          <FooterSectionTitle>Company</FooterSectionTitle>
+          <FooterLink href="/docs/about-us">About us</FooterLink>
           <FooterLink href="/security">Security</FooterLink>
+          <FooterLink href="/privacy">Privacy</FooterLink>
+          <FooterLink href="/terms">Terms</FooterLink>
         </FooterSection>
 
         <FooterSection>
@@ -37,6 +46,7 @@ export const AppFooter: React.FC = () => (
           </FooterLink>
           <FooterLink href="https://discord.gg/pK79sv85Vg">Discord</FooterLink>
           <FooterLink href="https://twitter.com/argos_ci">Twitter</FooterLink>
+          <FooterLink href="mailto:contact@argos-ci.com">Contact us</FooterLink>
         </FooterSection>
       </FooterSections>