diff --git a/src/components/alert/Alert.tsx b/src/components/alert/Alert.tsx
index 5123bd5..1e01382 100644
--- a/src/components/alert/Alert.tsx
+++ b/src/components/alert/Alert.tsx
@@ -1,4 +1,4 @@
-import { AlertProps, MessageType } from "../../types/alertProps";
+import { AlertProps, MessageType } from "../../types/props";
 
 const Alert = ({ children, type = "info", message }: AlertProps) => {
   const types: Record<
diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx
index 4b7d807..e0693fb 100644
--- a/src/components/button/index.tsx
+++ b/src/components/button/index.tsx
@@ -1,4 +1,4 @@
-import { ButtonProps } from "../../types/buttonProps";
+import { ButtonProps } from "../../types/props";
 
 function Button({ children, onClick, extra }: ButtonProps) {
   return (
diff --git a/src/components/header/components/navbar/MobileMenu.tsx b/src/components/header/components/navbar/MobileMenu.tsx
index d7ddba9..a7efced 100644
--- a/src/components/header/components/navbar/MobileMenu.tsx
+++ b/src/components/header/components/navbar/MobileMenu.tsx
@@ -1,5 +1,5 @@
 // src/components/Header/Navbar/MobileMenu.tsx
-import { MobileMenuProps } from "../../../../types/mobileMenu";
+import { MobileMenuProps } from "../../../../types/props";
 import NavbarLink from "./NavbarLink";
 const MobileMenu = ({ isOpen, toggleMenu, routes }: MobileMenuProps) => {
   return (
diff --git a/src/components/header/components/navbar/MobileMenuButton.tsx b/src/components/header/components/navbar/MobileMenuButton.tsx
index f6f8a9f..3bcb7eb 100644
--- a/src/components/header/components/navbar/MobileMenuButton.tsx
+++ b/src/components/header/components/navbar/MobileMenuButton.tsx
@@ -1,4 +1,4 @@
-import { MobileMenuButtonProps } from "../../../../types/mobileMenuButton";
+import { MobileMenuButtonProps } from "../../../../types/props";
 
 const MobileMenuButton = ({ isOpen, onClick }: MobileMenuButtonProps) => {
   return (
diff --git a/src/components/header/components/navbar/Navbar.tsx b/src/components/header/components/navbar/Navbar.tsx
index 410b2b6..09f02d2 100644
--- a/src/components/header/components/navbar/Navbar.tsx
+++ b/src/components/header/components/navbar/Navbar.tsx
@@ -6,7 +6,7 @@ import NavbarLink from "./NavbarLink";
 import router from "../../../../routes/routes";
 import Button from "../../../button";
 import { Link } from "react-router-dom";
-import { Route } from "../../../../types/routes";
+import { Route } from "../../../../types/props";
 
 const Navbar = () => {
   const [isOpen, setIsOpen] = useState<boolean>(false);
diff --git a/src/components/header/components/navbar/NavbarLink.tsx b/src/components/header/components/navbar/NavbarLink.tsx
index 4e686c7..a631fee 100644
--- a/src/components/header/components/navbar/NavbarLink.tsx
+++ b/src/components/header/components/navbar/NavbarLink.tsx
@@ -1,5 +1,5 @@
 import { NavLink } from "react-router-dom";
-import { NavbarLinkProps, NavData } from "../../../../types/navbarLink";
+import { NavbarLinkProps, NavData } from "../../../../types/props";
 
 const NavbarLink = ({ to, children, onClick }: NavbarLinkProps) => {
   return (
diff --git a/src/layout/index.tsx b/src/layout/index.tsx
index 6b787be..403e136 100644
--- a/src/layout/index.tsx
+++ b/src/layout/index.tsx
@@ -4,11 +4,15 @@ import Footer from "../components/footer";
 
 const Layout = () => {
   return (
-    <div className={`relative bg-noisy w-full h-full`}>
-      <Header />
-      <main className="h-[100vh] p-5">
-        <Outlet />
-      </main>
+    <div
+      className={`relative bg-noisy w-full flex flex-col justify-between min-h-screen`}
+    >
+      <div className="relative w-full h-full">
+        <Header />
+        <main className="w-full h-full px-5 py-0">
+          <Outlet />
+        </main>
+      </div>
       <Footer />
     </div>
   );