diff --git a/app/Fragments/Armory/index.tsx b/app/Fragments/Armory/index.tsx
index aab471b..c333b76 100644
--- a/app/Fragments/Armory/index.tsx
+++ b/app/Fragments/Armory/index.tsx
@@ -11,19 +11,19 @@ let linksArray = [
 ];
 export const Armory = (props) => {
     return (
-        <div>
+        (<div>
             {armoryLinks.length}
             <h4>{props.titleText}</h4>
             <ul>
                 {linksArray.map((link, index) => (
                     <li key={index}>
                         <Link href={link.URL}>
-                            <a>{link.TEXT}</a>   
+                            {link.TEXT}   
                         </Link>
                     </li>
                 ))}
             </ul>
-        </div>
-    )
+        </div>)
+    );
 }
 export default Armory;
\ No newline at end of file
diff --git a/app/Fragments/GroundZero/index.tsx b/app/Fragments/GroundZero/index.tsx
index c371a9d..61a14b8 100644
--- a/app/Fragments/GroundZero/index.tsx
+++ b/app/Fragments/GroundZero/index.tsx
@@ -10,19 +10,18 @@ let linksArray = [
 
 export const GroundZero = (props) => {
     return (
-        <div>
+        (<div>
             <h4>{props.titleText}</h4>
             <ul>
                 {linksArray.map((link, index) => (
                     <li key={index}>
                         <Link href={link.URL}>
-                            <a>{link.TEXT}</a>
+                            {link.TEXT}
                         </Link>
                     </li>
                 ))}
             </ul>
-        </div>
-
-    )
+        </div>)
+    );
 }
 export default GroundZero;
\ No newline at end of file
diff --git a/app/Fragments/Information/index.tsx b/app/Fragments/Information/index.tsx
index 4d631f0..84c3623 100644
--- a/app/Fragments/Information/index.tsx
+++ b/app/Fragments/Information/index.tsx
@@ -10,18 +10,18 @@ let linksArray = [
 ];
 export const Information = (props) => {
     return (
-        <div>
+        (<div>
             <h4>{props.titleText}</h4>
             <ul>
                 {linksArray.map((link, index) => (
                     <li key={index}>
                         <Link href={link.URL}>
-                            <a>{link.TEXT}</a>
+                            {link.TEXT}
                         </Link>
                     </li>
                 ))}
             </ul>
-        </div>
-    )
+        </div>)
+    );
 }
 export default Information;
\ No newline at end of file
diff --git a/app/components/Footer/FooterLinks/index copy.js b/app/components/Footer/FooterLinks/index copy.js
index 0b3be57..674c18d 100644
--- a/app/components/Footer/FooterLinks/index copy.js	
+++ b/app/components/Footer/FooterLinks/index copy.js	
@@ -25,50 +25,50 @@ export default function FooterLinks()  {
     
         const classes = useStyles();
         return (
-            <div className={classes.root}>
-                        <TypoGraphy variant="subtitle1" color="inherit"            >
-              <List component="nav" >
-               
-                  <ListItemText inset >
-                    <TypoGraphy color="inherit" variant="subtitle2">
-                      <Link href="/info/faq"><a className={styles.navLinks}>FAQ</a></Link>
-                    </TypoGraphy>
-                  </ListItemText>
+          (<div className={classes.root}>
+            <TypoGraphy variant="subtitle1" color="inherit"            >
+  <List component="nav" >
+   
+      <ListItemText inset >
+        <TypoGraphy color="inherit" variant="subtitle2">
+          <Link href="/info/faq" className={styles.navLinks}>FAQ</Link>
+        </TypoGraphy>
+      </ListItemText>
 
-                    <ListItemText inset >
-                      <TypoGraphy color="inherit" variant="subtitle2">
-                        <Link href="/info/tos"><a className={styles.navLinks}>Terms Of Service</a></Link>
-                      </TypoGraphy>
-                    </ListItemText>
+        <ListItemText inset >
+          <TypoGraphy color="inherit" variant="subtitle2">
+            <Link href="/info/tos" className={styles.navLinks}>Terms Of Service</Link>
+          </TypoGraphy>
+        </ListItemText>
 
-                    <ListItemText inset>
-                      <TypoGraphy color="inherit" variant="subtitle2">
-                        <Link href="/info/contactus"><a className={styles.navLinks}>Contact Us</a></Link>
-                      </TypoGraphy>
-                    </ListItemText>
+        <ListItemText inset>
+          <TypoGraphy color="inherit" variant="subtitle2">
+            <Link href="/info/contactus" className={styles.navLinks}>Contact Us</Link>
+          </TypoGraphy>
+        </ListItemText>
 
-                    <ListItemText inset>
-                      <TypoGraphy color="inherit" variant="subtitle2">
-                        <Link href="/info/privacypolicy"><a className={styles.navLinks}>Privacy Policy</a></Link>
-                      </TypoGraphy>
-                    </ListItemText>
+        <ListItemText inset>
+          <TypoGraphy color="inherit" variant="subtitle2">
+            <Link href="/info/privacypolicy" className={styles.navLinks}>Privacy Policy</Link>
+          </TypoGraphy>
+        </ListItemText>
 
-                    <ListItemText inset>
-                      <TypoGraphy color="inherit" variant="subtitle2">
-                        <Link href="/info/pip"><a className={styles.navLinks}>Personal Information Policy</a></Link>
-                      </TypoGraphy>
-                    </ListItemText>
+        <ListItemText inset>
+          <TypoGraphy color="inherit" variant="subtitle2">
+            <Link href="/info/pip" className={styles.navLinks}>Personal Information Policy</Link>
+          </TypoGraphy>
+        </ListItemText>
 
-                  <ListItemText inset>
-                      <TypoGraphy color="inherit" variant="subtitle2">
-                        <Link href="/info/disclosure"><a className={styles.navLinks}>Disclosure</a></Link>
-                      </TypoGraphy>
-                  </ListItemText>
-         
-                  
-                </List>
-              </TypoGraphy>
-            </div>
-        )
+      <ListItemText inset>
+          <TypoGraphy color="inherit" variant="subtitle2">
+            <Link href="/info/disclosure" className={styles.navLinks}>Disclosure</Link>
+          </TypoGraphy>
+      </ListItemText>
+
+      
+    </List>
+  </TypoGraphy>
+          </div>)
+        );
     }
 
diff --git a/app/components/Footer/index.tsx b/app/components/Footer/index.tsx
index 79a2dfb..69c67f6 100644
--- a/app/components/Footer/index.tsx
+++ b/app/components/Footer/index.tsx
@@ -16,7 +16,7 @@ export const Footer = () => {
     //   <FooterLinks></FooterLinks>
     //   <Copyright></Copyright>
     // </div>
-    <>
+    (<>
       <footer className={styles.footer}>
         <nav className={styles.linksContainer}>
           <div className={styles.brand}>
@@ -33,7 +33,7 @@ export const Footer = () => {
         </nav>
       </footer>
       <Copyright></Copyright>
-    </>
+    </>)
   );
 }
 
diff --git a/app/components/Header/index.tsx b/app/components/Header/index.tsx
index 312c75e..2dc7f12 100644
--- a/app/components/Header/index.tsx
+++ b/app/components/Header/index.tsx
@@ -21,41 +21,39 @@ export default class Header extends Component {
 
   render() {
     return (
-         <div>
-          <div className="topheader">
-            <Link href="/"><a className="logo">Gun Builder</a>
-            </Link>
-          </div>
+      (<div>
+        <div className="topheader">
+          <Link href="/" legacyBehavior><a className="logo">Gun Builder</a>
+          </Link>
+        </div>
+        <AppBar position="static">
+        <Toolbar>
+            <List component="nav">
+              <ListItem component="div" className="nav-item">
+                <ListItemText inset>
+                    <Link href={sectionLinks.UPPERS.URL} legacyBehavior><a className={styles.navLinks}>{sectionLinks.UPPERS.TEXT}</a></Link>
+                </ListItemText>
 
-          <AppBar position="static">
-          <Toolbar>
-              <List component="nav">
-                <ListItem component="div" className="nav-item">
                   <ListItemText inset>
-                      <Link href={sectionLinks.UPPERS.URL}><a className={styles.navLinks}>{sectionLinks.UPPERS.TEXT}</a></Link>
+                      <Link href={sectionLinks.PARTSLIST.URL} legacyBehavior><a className={styles.navLinks}>{sectionLinks.PARTSLIST.TEXT}</a></Link>
                   </ListItemText>
 
-                    <ListItemText inset>
-                        <Link href={sectionLinks.PARTSLIST.URL}><a className={styles.navLinks}>{sectionLinks.PARTSLIST.TEXT}</a></Link>
-                    </ListItemText>
+                  <ListItemText inset>
+                      <Link href={sectionLinks.BUILDS.URL} legacyBehavior><a className={styles.navLinks}>{sectionLinks.BUILDS.TEXT}</a></Link>
+                  </ListItemText>
 
-                    <ListItemText inset>
-                        <Link href={sectionLinks.BUILDS.URL}><a className={styles.navLinks}>{sectionLinks.BUILDS.TEXT}</a></Link>
-                    </ListItemText>
-
-                    <ListItemText inset>
-                        <Link href={sectionLinks.BLOG.URL}><a className={styles.navLinks}>{sectionLinks.BLOG.TEXT}</a></Link>
-                    </ListItemText>
-
-                 {/*    <ListItemText inset>
-                        <Link href="/admin"><a className={styles.navLinks}>Admin</a></Link>
-                    </ListItemText> */}
-                  </ListItem>
-                  
-                </List>
-            </Toolbar>
-          </AppBar>
+                  <ListItemText inset>
+                      <Link href={sectionLinks.BLOG.URL} legacyBehavior><a className={styles.navLinks}>{sectionLinks.BLOG.TEXT}</a></Link>
+                  </ListItemText>
 
+               {/*    <ListItemText inset>
+                      <Link href="/admin"><a className={styles.navLinks}>Admin</a></Link>
+                  </ListItemText> */}
+                </ListItem>
+                
+              </List>
+          </Toolbar>
+        </AppBar>
         <style jsx>{`
                   header {
                     background:#101010;
@@ -97,8 +95,8 @@ export default class Header extends Component {
                     letter-spacing:2px;
                   }
                 `}</style>
-      </div>
-    )
+      </div>)
+    );
   }
 }
 
diff --git a/app/components/Info/Copyright/index.tsx b/app/components/Info/Copyright/index.tsx
index 5ae1961..8bb59ea 100644
--- a/app/components/Info/Copyright/index.tsx
+++ b/app/components/Info/Copyright/index.tsx
@@ -10,16 +10,15 @@ import styled from '@emotion/styled'
 export default class Copyright extends Component {
   render() {
     return (
-      <CopyStyled>
+      (<CopyStyled>
         <div className="copyright">&copy;&nbsp; {new Date().getFullYear()} {' '}
           <Link href={COMPANY_URL}>
-            <a>{COMPANY_NAME}</a>
+            {COMPANY_NAME}
           </Link>{' '}
           <span>All Rights Reserved.</span>
         </div>
-      </CopyStyled>
-
-    )
+      </CopyStyled>)
+    );
   }
 }
 
diff --git a/app/page.tsx b/app/page.tsx
index 8c443e7..3f88a2e 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,22 +2,21 @@ import Link from "next/link";
 
 export default function Home() {
   return (
-    <div className="bg-gray-100 min-h-screen flex flex-col">
+    (<div className="bg-gray-100 min-h-screen flex flex-col">
       {/* Header Section */}
       <header className="bg-gray-800 text-white py-4 shadow-md">
         <div className="container mx-auto px-6 flex justify-between items-center">
           <h1 className="text-2xl font-bold">Firearm Builder</h1>
           <nav>
             <ul className="flex space-x-4">
-                <li><Link href="#features"><a className="hover:underline">Features</a></Link></li>
-                <li><Link href="/builder"><a className="hover:underline">Builder</a></Link></li>
-                <li><Link href="/products"><a className="hover:underline">Products</a></Link></li>
-                <li><Link href="#contact"><a className="hover:underline">Contact</a></Link></li>
+                <li><Link href="#features" className="hover:underline">Features</Link></li>
+                <li><Link href="/builder" className="hover:underline">Builder</Link></li>
+                <li><Link href="/products" className="hover:underline">Products</Link></li>
+                <li><Link href="#contact" className="hover:underline">Contact</Link></li>
             </ul>
         </nav>
         </div>
       </header>
-
       {/* Hero Section */}
       <section className="bg-gray-700 text-white py-20 text-center">
         <div className="container mx-auto px-6">
@@ -25,14 +24,15 @@ export default function Home() {
           <p className="text-lg mb-6">
             Customize every component of your firearm with ease and precision.
           </p>
-          <Link href="/builder">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="/builder"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Get Started
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Features Section */}
       <section id="features" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -59,7 +59,6 @@ export default function Home() {
           </div>
         </div>
       </section>
-
       {/* About Section */}
       <section id="about" className="bg-gray-200 py-20">
         <div className="container mx-auto px-6 text-center">
@@ -71,7 +70,6 @@ export default function Home() {
           </p>
         </div>
       </section>
-
       {/* Contact Section */}
       <section id="contact" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -79,20 +77,21 @@ export default function Home() {
           <p className="text-gray-700 mb-6">
             Have questions or feedback? We’d love to hear from you!
           </p>
-          <Link href="mailto:support@firearmbuilder.com">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="mailto:support@firearmbuilder.com"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Email Us
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Footer Section */}
       <footer className="bg-gray-800 text-white py-4">
         <div className="container mx-auto px-6 text-center">
           <p>&copy; {new Date().getFullYear()} Firearm Builder. All rights reserved.</p>
         </div>
       </footer>
-    </div>
+    </div>)
   );
 }
\ No newline at end of file
diff --git a/pages/oldindex.js b/pages/oldindex.js
index 8c443e7..3f88a2e 100644
--- a/pages/oldindex.js
+++ b/pages/oldindex.js
@@ -2,22 +2,21 @@ import Link from "next/link";
 
 export default function Home() {
   return (
-    <div className="bg-gray-100 min-h-screen flex flex-col">
+    (<div className="bg-gray-100 min-h-screen flex flex-col">
       {/* Header Section */}
       <header className="bg-gray-800 text-white py-4 shadow-md">
         <div className="container mx-auto px-6 flex justify-between items-center">
           <h1 className="text-2xl font-bold">Firearm Builder</h1>
           <nav>
             <ul className="flex space-x-4">
-                <li><Link href="#features"><a className="hover:underline">Features</a></Link></li>
-                <li><Link href="/builder"><a className="hover:underline">Builder</a></Link></li>
-                <li><Link href="/products"><a className="hover:underline">Products</a></Link></li>
-                <li><Link href="#contact"><a className="hover:underline">Contact</a></Link></li>
+                <li><Link href="#features" className="hover:underline">Features</Link></li>
+                <li><Link href="/builder" className="hover:underline">Builder</Link></li>
+                <li><Link href="/products" className="hover:underline">Products</Link></li>
+                <li><Link href="#contact" className="hover:underline">Contact</Link></li>
             </ul>
         </nav>
         </div>
       </header>
-
       {/* Hero Section */}
       <section className="bg-gray-700 text-white py-20 text-center">
         <div className="container mx-auto px-6">
@@ -25,14 +24,15 @@ export default function Home() {
           <p className="text-lg mb-6">
             Customize every component of your firearm with ease and precision.
           </p>
-          <Link href="/builder">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="/builder"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Get Started
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Features Section */}
       <section id="features" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -59,7 +59,6 @@ export default function Home() {
           </div>
         </div>
       </section>
-
       {/* About Section */}
       <section id="about" className="bg-gray-200 py-20">
         <div className="container mx-auto px-6 text-center">
@@ -71,7 +70,6 @@ export default function Home() {
           </p>
         </div>
       </section>
-
       {/* Contact Section */}
       <section id="contact" className="py-20">
         <div className="container mx-auto px-6 text-center">
@@ -79,20 +77,21 @@ export default function Home() {
           <p className="text-gray-700 mb-6">
             Have questions or feedback? We’d love to hear from you!
           </p>
-          <Link href="mailto:support@firearmbuilder.com">
-            <a className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+          <Link
+            href="mailto:support@firearmbuilder.com"
+            className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">
+            
               Email Us
-            </a>
+            
           </Link>
         </div>
       </section>
-
       {/* Footer Section */}
       <footer className="bg-gray-800 text-white py-4">
         <div className="container mx-auto px-6 text-center">
           <p>&copy; {new Date().getFullYear()} Firearm Builder. All rights reserved.</p>
         </div>
       </footer>
-    </div>
+    </div>)
   );
 }
\ No newline at end of file