diff --git a/src/_includes/chaffle.njk b/src/_includes/chaffle.njk
new file mode 100644
index 0000000..0282a79
--- /dev/null
+++ b/src/_includes/chaffle.njk
@@ -0,0 +1,25 @@
+<script>
+  var elm_mouseover = document.querySelectorAll('[data-chaffle]');
+  var elm_onload = document.querySelectorAll('[data-chaffle-onLoad]');
+
+  Array
+    .prototype
+    .forEach
+    .call(elm_mouseover, function (el) {
+      var chaffle = new Chaffle(el)
+      el.addEventListener('mouseover', function () {
+        chaffle.init();
+      });
+    });
+
+  Array
+    .prototype
+    .forEach
+    .call(elm_onload, function (el) {
+      var chaffle = new Chaffle(el)
+      chaffle.init();
+      setInterval(function () {
+        chaffle.init();
+      }, 10000)
+    });
+</script>
diff --git a/src/_includes/footer.njk b/src/_includes/footer.njk
new file mode 100644
index 0000000..bb4b140
--- /dev/null
+++ b/src/_includes/footer.njk
@@ -0,0 +1,4 @@
+<footer role="contentinfo">
+      &copy; {% year %}
+  {{ username }}
+</footer>
diff --git a/src/_includes/head.njk b/src/_includes/head.njk
new file mode 100644
index 0000000..1fdd8f1
--- /dev/null
+++ b/src/_includes/head.njk
@@ -0,0 +1,7 @@
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>{{ username }}</title>
+<link rel="stylesheet" href="{{ '/css/style.css' | url }}">
+<link rel="stylesheet" href="{{ '/css/anim.css' | url }}">
+<link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.png' | url }}">
+<script src="{{ '/javascript/chaffle.min.js' | url }}"></script>
diff --git a/src/_includes/header.njk b/src/_includes/header.njk
new file mode 100644
index 0000000..8a8681f
--- /dev/null
+++ b/src/_includes/header.njk
@@ -0,0 +1,4 @@
+<header role="banner">
+  <span data-chaffle-onload="" data-chaffle="en">{{ username }}</span>
+  <i class="blink">_</i>
+</header>
diff --git a/src/_includes/layout.njk b/src/_includes/layout.njk
index 587754a..88a40cf 100755
--- a/src/_includes/layout.njk
+++ b/src/_includes/layout.njk
@@ -13,50 +13,19 @@ username: Laureηt
     <link rel="stylesheet" href="{{ '/css/anim.css' | url }}">
     <link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.png' | url }}">
     <script src="{{ '/javascript/chaffle.min.js' | url }}"></script>
+    {% block head %}{% endblock head %}
   </head>
 
   <body>
-
-    <header role="banner">
-      <span data-chaffle-onload="" data-chaffle="en">{{ username }}</span>
-      <i class="blink">_</i>
-    </header>
-
+    {% include "header.njk" %}
+    {% block precontent %}{% endblock precontent %}
     <main role="main">
       {{ content | safe }}
     </main>
-
-    <footer role="contentinfo">
-      &copy; {% year %}
-      {{ username }}
-    </footer>
-
-    <script>
-      var elm_mouseover = document.querySelectorAll('[data-chaffle]');
-      var elm_onload = document.querySelectorAll('[data-chaffle-onLoad]');
-
-      Array
-        .prototype
-        .forEach
-        .call(elm_mouseover, function (el) {
-          var chaffle = new Chaffle(el)
-          el.addEventListener('mouseover', function () {
-            chaffle.init();
-          });
-        });
-
-      Array
-        .prototype
-        .forEach
-        .call(elm_onload, function (el) {
-          var chaffle = new Chaffle(el)
-          chaffle.init();
-          setInterval(function () {
-            chaffle.init();
-          }, 10000)
-        });
-    </script>
-
+    {% block postcontent %}{% endblock postcontent %}
+    {% include "footer.njk" %}
+    {% include "chaffle.njk" %}
+    {% block foot %}{% endblock foot %}
   </body>
 
 </html>
diff --git a/src/_includes/layout_eportfolio.njk b/src/_includes/layout_eportfolio.njk
index fc4011d..204b943 100755
--- a/src/_includes/layout_eportfolio.njk
+++ b/src/_includes/layout_eportfolio.njk
@@ -1,77 +1,27 @@
 ---
-username: Laureηt
+layout: layout.njk
 ---
 
-<!DOCTYPE html>
-<html lang="en">
+{% block head %}
+  <link rel="stylesheet" href="{{ '/css/eportfolio.css' | url }}">
+{% endblock head %}
 
-  <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ username }}</title>
-    <link rel="stylesheet" href="{{ '/css/style.css' | url }}">
-    <link rel="stylesheet" href="{{ '/css/eportfolio.css' | url }}">
-    <link rel="stylesheet" href="{{ '/css/anim.css' | url }}">
-    <link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.png' | url }}">
-    <script src="{{ '/javascript/chaffle.min.js' | url }}"></script>
-  </head>
+{% block precontent %}
+  <nav class="11ty-nav" role="navigation">
+    <div>
+      {% for entry in collections.all | eleventyNavigation %}
+        <a href="{{ entry.url | url }}">{{ entry.title }}</a>
+      {% endfor %}
+    </div>
+    <hr>
+  </nav>
+{% endblock precontent %}
 
-  <body>
+{{ content | safe }}
 
-    <header role="banner">
-      <span data-chaffle-onload="" data-chaffle="en">{{ username }}</span>
-      <i class="blink" style="display:inline;">_</i>
-    </header>
-
-    <nav role="navigation">
-      <div class="11ty-nav">
-        {% for entry in collections.all | eleventyNavigation %}
-          <a href="{{ entry.url | url }}">{{ entry.title }}</a>
-        {% endfor %}
-      </div>
-      <hr>
-    </nav>
-
-    <main role="main">
-      {{ content | safe }}
-    </main>
-
-    <nav id="btn-back" role="navigation">
-      <i>&laquo;</i>
-      <a href="{{ '/' | url }}">Go back</a>
-    </nav>
-
-    <footer role="contentinfo">
-      &copy; {% year %}
-      {{ username }}
-    </footer>
-
-    <script>
-      var elm_mouseover = document.querySelectorAll('[data-chaffle]');
-      var elm_onload = document.querySelectorAll('[data-chaffle-onLoad]');
-
-      Array
-        .prototype
-        .forEach
-        .call(elm_mouseover, function (el) {
-          var chaffle = new Chaffle(el)
-          el.addEventListener('mouseover', function () {
-            chaffle.init();
-          });
-        });
-
-      Array
-        .prototype
-        .forEach
-        .call(elm_onload, function (el) {
-          var chaffle = new Chaffle(el)
-          chaffle.init();
-          setInterval(function () {
-            chaffle.init();
-          }, 10000)
-        });
-    </script>
-
-  </body>
-
-</html>
+{% block postcontent %}
+  <nav id="btn-back" role="navigation">
+    <i>&laquo;</i>
+    <a href="{{ '/' | url }}">Go back</a>
+  </nav>
+{% endblock postcontent %}
diff --git a/src/scss/resume.scss b/src/scss/resume.scss
index 0c1d2d6..eb238ce 100755
--- a/src/scss/resume.scss
+++ b/src/scss/resume.scss
@@ -1,6 +1,11 @@
 body {
   font-size: 20px;
-  max-width: 60em;
+  width: 80rem;
+}
+
+h1,
+h2 {
+  height: auto;
 }
 
 .row {
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 6a5aaf5..2c0556c 100755
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -28,6 +28,7 @@ body {
 a {
   color: $foreground-text;
   text-decoration: underline;
+  text-decoration-thickness: 2px;
   text-decoration-color: #283593;
 
   &:hover {
