diff --git a/src/components/layout.js b/src/components/layout.js
index 7060f82..60eb9b1 100644
--- a/src/components/layout.js
+++ b/src/components/layout.js
@@ -37,10 +37,12 @@ const Layout = ({ children, title }) => {
         socialNames={data.site.siteMetadata.social.names}
         socialLinks={data.site.siteMetadata.social.links}
         email={data.site.siteMetadata.email} />
-      <div className={styles.content}>
-        <main>{children}</main>
+      <div className={styles.flexWrapper}>
+        <div className={styles.content}>
+          <main>{children}</main>
+        </div>
+        <Footer authorName={data.site.siteMetadata.author}/>
       </div>
-      <Footer authorName={data.site.siteMetadata.author}/>
     </>
   )
 }
diff --git a/src/styles/footer.module.scss b/src/styles/footer.module.scss
index 9b6ef3f..c19f037 100644
--- a/src/styles/footer.module.scss
+++ b/src/styles/footer.module.scss
@@ -3,6 +3,7 @@
 .footer {
   padding: 10px;
   text-align: center;
+  border-top: 1px solid $blue;
 }
 
 .link {
diff --git a/src/styles/header.module.scss b/src/styles/header.module.scss
index 23a5b9f..e3c47e9 100644
--- a/src/styles/header.module.scss
+++ b/src/styles/header.module.scss
@@ -2,6 +2,9 @@
 
 .header {
   overflow: auto;
+  border-bottom: 1px solid $blue;
+  height: 70px;
+  box-sizing: border-box;
 }
 
 .links {
diff --git a/src/styles/layout.module.scss b/src/styles/layout.module.scss
index 36e413b..f06b050 100644
--- a/src/styles/layout.module.scss
+++ b/src/styles/layout.module.scss
@@ -8,4 +8,11 @@
     width: 80%;
     display: flex;
   }
+}
+
+.flexWrapper {
+  display: flex;
+  min-height: calc(100vh - 70px);
+  flex-direction: column;
+  justify-content: space-between;
 }
\ No newline at end of file