diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
index 132ccaa..2924e22 100644
--- a/src/components/Card/Card.tsx
+++ b/src/components/Card/Card.tsx
@@ -17,9 +17,9 @@ export default function Card({
 }) {
     return (
         <div className={style.card}>
-            {header && (
-                <CardHeader icon={icon} content={name} isActive={active} />
-            )}
+            {header ? (
+                <CardHeader icon={icon} content={name} active={active} />
+            ) : null}
             <div className={style.cardContent}>{children}</div>
         </div>
     );
diff --git a/src/components/CardContainers/style.module.css b/src/components/CardContainers/style.module.css
index 361a9bb..3013dea 100644
--- a/src/components/CardContainers/style.module.css
+++ b/src/components/CardContainers/style.module.css
@@ -5,7 +5,6 @@
     justify-content: flex-start;
     align-items: stretch;
     gap: 30px;
-    margin: 30px;
 }
 
 .cardRow {
diff --git a/src/components/CardHeader/CardHeader.tsx b/src/components/CardHeader/CardHeader.tsx
index b954024..8221b4c 100644
--- a/src/components/CardHeader/CardHeader.tsx
+++ b/src/components/CardHeader/CardHeader.tsx
@@ -1,17 +1,14 @@
-import classNames from "classnames/bind";
+import classNames from "classnames";
 
 import style from "./style.module.css";
 
-const styles = {
-    container: style.container,
-    active: style.active,
-};
-
-const cx = classNames.bind(styles);
-
-export default function CardHeader({ icon, content, isActive = false }) {
+export default function CardHeader({ icon, content, active = false }) {
     return (
-        <div className={cx("container", { active: isActive })}>
+        <div
+            className={classNames(style.container, {
+                [`${style.active}`]: active,
+            })}
+        >
             <div className={style.title}>
                 <div className={style.icon}>{icon}</div>
                 <div className={style.content}>{content}</div>
diff --git a/src/components/Dashboard/Dashboard.tsx b/src/components/Dashboard/Dashboard.tsx
index 992b093..11494f7 100644
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -42,29 +42,31 @@ export default function Dashboard() {
 
     return (
         <div className={`${style.dashboard} ${scheme}`}>
-            <CardColumn>
-                <Card icon="🚊" name="Timetable">
-                    <Timetable />
-                </Card>
-
-                <CardRow>
-                    <Card icon="🕐" name="Clock">
-                        <Datetime />
+            <div className={style.body}>
+                <CardColumn>
+                    <Card icon="🚊" name="Timetable">
+                        <Timetable />
                     </Card>
 
-                    <Card icon="🌤" name="Weather">
-                        <Weather />
+                    <CardRow>
+                        <Card icon="🕐" name="Clock">
+                            <Datetime />
+                        </Card>
+
+                        <Card icon="🌤" name="Weather">
+                            <Weather />
+                        </Card>
+                    </CardRow>
+
+                    <Card icon="🔔" name="Terminal" active={true}>
+                        <Terminal />
                     </Card>
-                </CardRow>
 
-                <Card icon="🔔" name="Terminal" active={true}>
-                    <Terminal />
-                </Card>
-
-                <Card icon="🧹" name="Flatastic">
-                    <Flatastic />
-                </Card>
-            </CardColumn>
+                    <Card icon="🧹" name="Flatastic">
+                        <Flatastic />
+                    </Card>
+                </CardColumn>
+            </div>
 
             <Footer />
         </div>
diff --git a/src/components/Dashboard/style.module.css b/src/components/Dashboard/style.module.css
index 43794c2..6b111a1 100644
--- a/src/components/Dashboard/style.module.css
+++ b/src/components/Dashboard/style.module.css
@@ -5,6 +5,12 @@
     transition: 0.5s;
 }
 
+.body {
+    height: 100%;
+    margin: 30px;
+    overflow: scroll;
+}
+
 /* 7 to 16  */
 .day {
     background-color: #007c7d;