diff --git a/client/src/components/NavigationBar.tsx b/client/src/components/NavigationBar.tsx
index bc2f15c..0330764 100644
--- a/client/src/components/NavigationBar.tsx
+++ b/client/src/components/NavigationBar.tsx
@@ -54,8 +54,8 @@ export default function NavigationBar() {
     <div
       className={
         isScrolled
-          ? "transition-all fixed w-full p-2"
-          : "transition-all fixed w-full p-2 mt-8"
+          ? "transition-all fixed w-full p-2 z-50"
+          : "transition-all fixed w-full p-2 z-50 mt-8"
       }
     >
       <div className="relative bg-primary-50 dark:bg-primary-800 border-2 border-primary-100 dark:border-primary-950 shadow-lg w-full h-full rounded-xl flex flex-col justify-center p-1">
diff --git a/client/src/layouts/default.tsx b/client/src/layouts/default.tsx
index 4087eb4..cc7c2e9 100644
--- a/client/src/layouts/default.tsx
+++ b/client/src/layouts/default.tsx
@@ -6,8 +6,8 @@ import SiteFooter from "../components/SiteFooter";
 
 export default function DefaultLayout() {
   return (
-    <div className="relative flex flex-col justify-between h-screen">
-      <div className="flex flex-col h-screen">
+    <div className="relative flex flex-col justify-between">
+      <div className="flex flex-col min-h-screen">
         <SingaporeAgencyStrip />
         <main className="pt-16 flex-grow">
           <Outlet />