diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 33177b8..ef625c6 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,13 +1,12 @@
-//import { Provider } from "../components/ui/provider"
 import "../styles/globals.css";
 import Navbar from "../components/Navbar";
 import PopNav from "@src/components/PopNav/page";
 import { Roboto } from 'next/font/google'
-
+import constants from "@src/lib/constants";
 
 export const metadata = {
-  title: 'Ballistic Builder',
-  description: 'Freedom On',
+  title: constants.APP_NAME,
+  description: constants.DESCRIPTION,
 }
 
 const roboto = Roboto({
diff --git a/src/app/signin/layout.tsx b/src/app/signin/layout.tsx
index 74476b0..b7963bb 100644
--- a/src/app/signin/layout.tsx
+++ b/src/app/signin/layout.tsx
@@ -1,6 +1,7 @@
+import constants from "@src/lib/constants"
 export const metadata = {
-  title: 'Ballistic Bu8ilder',
-  description: 'Generated by Forward Group, LLC',
+  title: constants.APP_NAME,
+  description: constants.DESCRIPTION,
 }
 
 export default function RootLayout({
diff --git a/src/app/signin/page.tsx b/src/app/signin/page.tsx
index d445b88..e86bdc6 100644
--- a/src/app/signin/page.tsx
+++ b/src/app/signin/page.tsx
@@ -1,6 +1,7 @@
 'use client';
 import React, { useState } from 'react';
 import { useRouter } from 'next/navigation';
+import constants from '@src/lib/constants';
 
 export default function SignupPage() {
   const router = useRouter();
@@ -49,7 +50,7 @@ export default function SignupPage() {
           <div className="mx-auto w-full max-w-sm lg:w-96">
             <div>
               <img
-                alt="Ballistic Builder"
+                alt={constants.APP_NAME}
                 src="https://tailwindui.com/plus/img/logos/mark.svg?color=lime&shade=600"
                 className="h-10 w-auto"
               />
diff --git a/src/components/Brand/BrandsList.tsx b/src/components/Brand/BrandsList.tsx
index 8e30d24..a795623 100644
--- a/src/components/Brand/BrandsList.tsx
+++ b/src/components/Brand/BrandsList.tsx
@@ -5,7 +5,7 @@ import Brand from "./brand";
 import AddBrand from "./addBrand";
 import { addBrand, deleteBrand, editBrand } from "../../actions/brandActions";
 import Footer from "@components/site/Footer";
-
+import constants from "@src/lib/constants";
 interface Props {
   brands: brandType[];
 }
@@ -38,7 +38,7 @@ const BrandsList: FC<Props> = ({ brands }) => {
   // Rendering the brand List component
   return (
     <main className="flex mx-auto max-w-xl w-full min-h-screen flex-col items-center p-16">
-      <div className="text-5xl text-gray-800 font-medium">Ballistic Builder Brand</div>
+      <div className="text-5xl text-gray-800 font-medium">{constants.APP_NAME} Brand</div>
       <div className="w-full flex flex-col mt-8 gap-2">
         {/* Mapping through brand items and rendering brand component for each */}
         {brandItems.map((brand) => (
diff --git a/src/components/ComponentType/ComponentTypeList.tsx b/src/components/ComponentType/ComponentTypeList.tsx
index 085fe7a..bb4bad0 100644
--- a/src/components/ComponentType/ComponentTypeList.tsx
+++ b/src/components/ComponentType/ComponentTypeList.tsx
@@ -4,6 +4,7 @@ import { componentTypeType } from "src/types/componentTypeType";
 import { componentType } from './componentType'
 // import AddBrand from "./addBrand";
 import { getData } from "src/actions/componentTypeActions";
+import constants from "@src/lib/constants";
 
 interface Props {
   componentType: componentType[];
@@ -37,7 +38,7 @@ const ComponentTypeList: FC<Props> = ({ componentType }) => {
   // Rendering the brand List component
   return (
     <main className="flex mx-auto max-w-xl w-full min-h-screen flex-col items-center p-16">
-      <div className="text-5xl text-gray-800 font-medium">Ballistic Builder Brand</div>
+      <div className="text-5xl text-gray-800 font-medium">{constants.APP_NAME} Brand</div>
       <div className="w-full flex flex-col mt-8 gap-2">
         {/* Mapping through brand items and rendering brand component for each */}
         {brandItems.map((brand) => (
diff --git a/src/components/Header/index-no-chakura.tsx b/src/components/Header/index-no-chakura.tsx
index 737b26d..03747e9 100644
--- a/src/components/Header/index-no-chakura.tsx
+++ b/src/components/Header/index-no-chakura.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+import constants from '@lib/constants';
 
 export default function Header() {
   {/* Header Section */ }
@@ -6,7 +7,7 @@ export default function Header() {
     (
       <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">Ballistic Builder</h1>
+          <h1 className="text-2xl font-bold">{constants.APP_NAME}</h1>
           <nav>
             <ul className="flex space-x-4">
               <li><Link href="#features" className="hover:underline">Features</Link></li>
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index e373024..27417fe 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -1,4 +1,5 @@
 import NextLink from 'next/link';
+import constants from '@src/lib/constants';
 
 const Header: React.FC = () => {
   return (
@@ -6,7 +7,7 @@ const Header: React.FC = () => {
       <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', maxWidth: '80rem', margin: '0 auto' }}>
         <h1 style={{ fontSize: '1.5rem', }}>
           <NextLink href="/" passHref style={{ color: '#FFFFFF', textDecoration: 'none' }}>
-            Ballistic Builder
+            {constants.APP_NAME}
           </NextLink>
         </h1>
         <nav style={{ display: 'flex', gap: '24px' }}>
diff --git a/src/components/site/About/index.tsx b/src/components/site/About/index.tsx
index 81de52b..8ed5bc2 100644
--- a/src/components/site/About/index.tsx
+++ b/src/components/site/About/index.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@components/ui/button"
+import constants from "@src/lib/constants";
 
 export default function About() {
 
@@ -9,11 +9,11 @@ export default function About() {
         <div className="container mx-auto px-6 text-center">
           <h3 className="text-3xl text-gray-700 font-bold mb-6 ">About Us</h3>
           <p className="text-gray-700">
-            Ballistic Builder is your go-to platform for customizing, building,
+            {constants.APP_NAME} is your go-to platform for customizing, building,
             and exploring firearm parts. Designed for enthusiasts by
             enthusiasts, we make firearm building easy and accessible.
           </p>
-          <Button className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">Click me test</Button>
+          <button className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">Click me test</button>
           {/* <Button className="bg-gray-950 text-grey-100 hover:translate-y-[-2px] transition duration-300">Click me test</Button> */}
         </div>
       </section>
diff --git a/src/components/site/Footer/index.tsx b/src/components/site/Footer/index.tsx
index c64d7cb..44ff5ea 100644
--- a/src/components/site/Footer/index.tsx
+++ b/src/components/site/Footer/index.tsx
@@ -1,10 +1,12 @@
+import constants from "@src/lib/constants";
+
 export default function Footer() {
 
   return (
     (
       <footer className="bg-gray-950 text-white py-4">
         <div className="container mx-auto px-6 text-center">
-          <p>&copy; {new Date().getFullYear()} Ballistic Builder. All rights reserved.</p>
+          <p>&copy; {new Date().getFullYear()} {constants.APP_NAME}. All rights reserved.</p>
           <p>Built by Forward Group ⚡</p>
 
         </div>
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 3aee3fa..90e9f8a 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,17 +1,13 @@
-export const APP_NAME = "Ballistic Builder";
-export const COMPANY_NAME = "Forward Group, LLC";
-export const COMPANY_URL = "https://goforward.group";
-export const AUTHOR = "Forward Group, LLC";
-export const META_KEYWORDS = "Pew Pew";
-export const META_DESCRIPTION = "Pow Pow";
+
 export default {
   APP_NAME: 'Ballistic Builder',
   SITE_NAME: 'Ballistic Builder',
   COMPANY_NAME: 'Forward Group, LLC',
   COMPANY_URL: 'https://goforward.group',
-  AUTHOR: 'Forward Group,, LLC',
+  AUTHOR: 'Forward Group, LLC',
   META_KEYWORDS: 'Pew Pew',
-  META_DESCRIPTION: 'Pow Pow',
+  META_DESCRIPTION: 'Pow Pow', 
+  DESCRIPTION: 'Generated by Forward Group, LLC',
   PJAM_RAINIER: 'https://api.pepperjamnetwork.com/20120402/publisher/creative/product?apiKey=17c11367569cc10dce51e6a5900d0c7c8b390c9cb2d2cecc25b3ed53a3b8649b&format=json&programIds=8713',
   PJAM_BARRETTA: 'https://api.pepperjamnetwork.com/20120402/publisher/creative/product?apiKey=17c11367569cc10dce51e6a5900d0c7c8b390c9cb2d2cecc25b3ed53a3b8649b&format=json&programIds=8342'
 }
diff --git a/src/pages/page-orig.tsx b/src/pages/page-orig.tsx
index 372e4da..8734678 100644
--- a/src/pages/page-orig.tsx
+++ b/src/pages/page-orig.tsx
@@ -1,12 +1,12 @@
 import Link from "next/link";
-
+import constants from "@src/lib/constants";
 export default function Home() {
   return (
     (<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">Ballistic Builder</h1>
+          <h1 className="text-2xl font-bold">{constants.APP_NAME}</h1>
           <nav>
             <ul className="flex space-x-4">
                 <li><Link href="#features" className="hover:underline">Features</Link></li>
@@ -64,7 +64,7 @@ export default function Home() {
         <div className="container mx-auto px-6 text-center">
           <h3 className="text-3xl font-bold mb-6">About Us</h3>
           <p className="text-gray-700">
-            Ballistic Builderis your go-to platform for customizing, building,
+            {constants.APP_NAME} is your go-to platform for customizing, building,
             and exploring firearm parts. Designed for enthusiasts by
             enthusiasts, we make firearm building easy and accessible.
           </p>
@@ -89,7 +89,7 @@ export default function Home() {
       {/* 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()} Ballistic Builder. All rights reserved.</p>
+          <p>&copy; {new Date().getFullYear()} {constants.APP_NAME}. All rights reserved.</p>
         </div>
       </footer>
     </div>)