diff --git a/src/components/CardContainers/CardContainers.tsx b/src/components/CardContainers/CardContainers.tsx
new file mode 100644
index 0000000..1f15c91
--- /dev/null
+++ b/src/components/CardContainers/CardContainers.tsx
@@ -0,0 +1,9 @@
+import style from "./style.module.css";
+
+export function CardRow({ children }) {
+    return <div className={style.cardRow}>{children}</div>;
+}
+
+export function CardColumn({ children }) {
+    return <div className={style.cardColumn}>{children}</div>;
+}
diff --git a/src/components/CardContainers/style.module.css b/src/components/CardContainers/style.module.css
new file mode 100644
index 0000000..361a9bb
--- /dev/null
+++ b/src/components/CardContainers/style.module.css
@@ -0,0 +1,17 @@
+.cardColumn {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+    gap: 30px;
+    margin: 30px;
+}
+
+.cardRow {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: stretch;
+    gap: 30px;
+}
diff --git a/src/components/Dashboard/Dashboard.tsx b/src/components/Dashboard/Dashboard.tsx
index b2a1e52..9aa5392 100644
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -1,6 +1,10 @@
 import { useEffect, useState } from "react";
 
 import Card from "@/components/Card/Card";
+import {
+    CardColumn,
+    CardRow,
+} from "@/components/CardContainers/CardContainers";
 import CardHeader from "@/components/CardHeader/CardHeader";
 import Datetime from "@/components/Datetime/Datetime";
 import Flatastic from "@/components/Flatastic/Flatastic";
@@ -38,23 +42,24 @@ export default function Dashboard() {
 
     return (
         <div className={`${style.dashboard} ${scheme}`}>
-            <div className={style.cardWrapper}>
+            <CardColumn>
                 <Card>
                     <CardHeader icon="🚊" content="Timetable" />
                     <Timetable />
                 </Card>
-                <div className={style.clockAndWeather}>
-                    <div className={style.small}>
-                        <Card>
-                            <CardHeader icon="🕐" content="Clock" />
-                            <Datetime />
-                        </Card>
-                    </div>
+
+                <CardRow>
                     <Card>
-                        <CardHeader icon="🌤️" content="Weather" />
+                        <CardHeader icon="🕐" content="Clock" />
+                        <Datetime />
+                    </Card>
+
+                    <Card>
+                        <CardHeader icon="🌤" content="Weather" />
                         <Weather />
                     </Card>
-                </div>
+                </CardRow>
+
                 <Card>
                     <CardHeader icon="🔔" content="Terminal" active={true} />
                     <Terminal />
@@ -64,10 +69,9 @@ export default function Dashboard() {
                     <CardHeader icon="🧹" content="Flatastic" />
                     <Flatastic />
                 </Card>
-            </div>
-            <div className={style.footer}>
-                <Footer />
-            </div>
+            </CardColumn>
+
+            <Footer />
         </div>
     );
 }
diff --git a/src/components/Dashboard/style.module.css b/src/components/Dashboard/style.module.css
index b773a63..43794c2 100644
--- a/src/components/Dashboard/style.module.css
+++ b/src/components/Dashboard/style.module.css
@@ -19,29 +19,3 @@
 .night {
     background-color: #2a3f55;
 }
-
-.clockAndWeather {
-    display: flex;
-    align-items: center;
-}
-
-.cardWrapper {
-    margin: 30px;
-    height: 100%;
-    gap: 30px;
-    flex-direction: column;
-    display: flex;
-    justify-content: flex-start;
-}
-
-.small {
-    width: 45%;
-}
-
-.terminal {
-    margin: 2px;
-}
-
-.footer {
-    background-color: #c0c0c0;
-}
diff --git a/src/components/Footer/style.module.css b/src/components/Footer/style.module.css
index eacfb09..24fac2c 100644
--- a/src/components/Footer/style.module.css
+++ b/src/components/Footer/style.module.css
@@ -1,11 +1,12 @@
 .container {
+    background-color: #c0c0c0;
     height: 30px;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
     gap: 10px;
-    margin: 2px;
+    padding: 2px;
 }
 
 .taskbar {