diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index fbc2af9..2d0f7d1 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -33,12 +33,12 @@ export default function RootLayout({
       <head />
       <body
         className={clsx(
-          "min-h-screen bg-background font-sans antialiased",
+          "min-h-[calc(100vh-64px)] bg-background font-sans antialiased",
           fontSans.variable
         )}
       >
         <Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
-          <div className="relative flex flex-col h-screen light:bg-gray-50 dark:bg-gray-900">
+          <div className="relative flex flex-col min-h-screen light:bg-gray-50 dark:bg-gray-950">
             <Navbar />
             <main>{children}</main>
             {/* <footer className="w-full flex items-center justify-center py-3">
diff --git a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/steps-editor.tsx b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/steps-editor.tsx
index 076d0f8..4b5de55 100644
--- a/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/steps-editor.tsx
+++ b/frontend/app/projects/[projectId]/folders/[folderId]/cases/[caseId]/steps-editor.tsx
@@ -26,7 +26,7 @@ export default function StepsEditor({
     <>
       {sortedSteps.map((step, index) => (
         <div key={index} className="flex">
-          <div className="bg-gray-50 rounded-full flex items-center justify-center min-w-unit-8 w-unit-8 h-unit-8 mt-3 me-2">
+          <div className="bg-gray-50 dark:bg-gray-900 rounded-full flex items-center justify-center min-w-unit-8 w-unit-8 h-unit-8 mt-3 me-2">
             <div>{step.caseSteps.stepNo}</div>
           </div>
           <Textarea
diff --git a/frontend/app/projects/[projectId]/folders/layout.tsx b/frontend/app/projects/[projectId]/folders/layout.tsx
index 3ddd4ca..70d9950 100644
--- a/frontend/app/projects/[projectId]/folders/layout.tsx
+++ b/frontend/app/projects/[projectId]/folders/layout.tsx
@@ -231,7 +231,7 @@ export default function FoldersLayout({
 
   return (
     <div className="flex w-full">
-      <div className="w-64 min-h-screen border-r-1 dark:border-neutral-700">
+      <div className="w-64 min-h-[calc(100vh-64px)] border-r-1 dark:border-neutral-700">
         <Button
           startContent={<Plus size={16} />}
           size="sm"
diff --git a/frontend/app/projects/[projectId]/layout.tsx b/frontend/app/projects/[projectId]/layout.tsx
index e3616d4..bbf61b7 100644
--- a/frontend/app/projects/[projectId]/layout.tsx
+++ b/frontend/app/projects/[projectId]/layout.tsx
@@ -7,7 +7,7 @@ export default function SidebarLayout({
 }) {
   return (
     <>
-      <div className="flex border-t-1 dark:border-neutral-700 min-h-screen">
+      <div className="flex border-t-1 dark:border-neutral-700 min-h-[calc(100vh-64px)]">
         <Sidebar />
         <div className="flex w-full">
           <div className="flex-grow">{children}</div>
