diff --git a/src/Footer/Component.tsx b/src/Footer/Component.tsx
index a675c29..f8e75da 100644
--- a/src/Footer/Component.tsx
+++ b/src/Footer/Component.tsx
@@ -1,33 +1,33 @@
 import { getCachedGlobal } from '@/utilities/getGlobals'
-import Link from 'next/link'
 import React from 'react'
-
 import { CMSLink } from '@/components/Link'
+import { Container } from '@/components/ui/Container' // Standardize with your global grid
 
 export async function Footer() {
   const footerData = await getCachedGlobal('footer', 1)()
-
   const navItems = footerData?.navItems || []
 
   return (
     <footer className="mt-auto border-t border-foreground/10 relative z-10">
-      <div className="container py-8 flex flex-col items-center gap-4">
-        <nav className="flex flex-wrap justify-center gap-6">
+      <Container className="py-8 flex flex-col items-center gap-4">
+        <nav className="flex flex-wrap justify-center gap-2">
           {navItems.map(({ link }, i) => {
             return (
               <CMSLink
-                className="text-foreground/60 hover:text-foreground transition-colors text-sm"
                 key={i}
                 {...link}
+                appearance="link"
+                // Standardized classes: added rounded-xl, background hover, and no-underline
+                className="px-4 py-2 rounded-xl text-sm text-foreground/60 hover:text-foreground hover:bg-foreground/10 no-underline transition-all"
               />
             )
           })}
         </nav>
 
         <p className="text-foreground/40 text-sm text-center">
-          &copy; {new Date().getFullYear()} ByMackie. All rights reserved.
+          &copy; {new Date().getFullYear()} ByMackie. All rights reserved. To infinity and beyond
         </p>
-      </div>
+      </Container>
     </footer>
   )
 }
diff --git a/src/Header/Nav/index.tsx b/src/Header/Nav/index.tsx
index 30310ad..fbb80ef 100644
--- a/src/Header/Nav/index.tsx
+++ b/src/Header/Nav/index.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import React from 'react'
-import { Container } from '@/components/ui/Container' // Adjust path as needed
+import { Container } from '@/components/ui/Container'
 import type { Header as HeaderType } from '@/payload-types'
 import { CMSLink } from '@/components/Link'
 
@@ -9,21 +9,19 @@ export const HeaderNav: React.FC<{ data: HeaderType }> = ({ data }) => {
   const navItems = data?.navItems || []
 
   return (
-    <div className="border-b border-foreground/8">
-      <Container>
-        <nav className="flex gap-1 items-center py-2">
-          {navItems.map(({ link }, i) => {
-            return (
-              <CMSLink
-                key={i}
-                {...link}
-                appearance="link"
-                className="px-4 py-2 rounded-xl text-sm text-foreground/60 hover:text-foreground hover:bg-foreground/10 transition-all"
-              />
-            )
-          })}
-        </nav>
-      </Container>
-    </div>
+    // Removed the outer border-b wrapper as it is handled by the parent HeaderClient
+    <nav className="flex gap-1 items-center">
+      {navItems.map(({ link }, i) => {
+        return (
+          <CMSLink
+            key={i}
+            {...link}
+            appearance="link"
+            // Added 'no-underline' to explicitly disable hover underlines
+            className="px-4 py-2 rounded-xl text-sm text-foreground/60 hover:text-foreground hover:bg-foreground/10 no-underline transition-all"
+          />
+        )
+      })}
+    </nav>
   )
 }