diff --git a/assets/sass/user_styles.scss b/assets/sass/user_styles.scss
index 2e327f3..5c3e30d 100644
--- a/assets/sass/user_styles.scss
+++ b/assets/sass/user_styles.scss
@@ -1,4 +1,3 @@
-/* Create this file in your assets folder to introduce style overrides */
 @font-face {
   font-family: "univers";
   src: url("/fonts/univers/UniversforUniS55Rm-Regular.ttf") format("truetype");
@@ -9,3 +8,33 @@
 body {
   font-family: "univers";
 }
+
+// For some reason, Bootstrap 5 does not have this..
+.fixed-md-bottom {
+  @include media-breakpoint-up(md) {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: $zindex-fixed;
+  }
+}
+
+.content-button {
+  display: button;
+  background-color: #004191;
+  border-radius: 0.25rem;
+  padding: 0.75rem;
+  margin: 0.5rem auto;
+  text-align: center;
+  color: #ffffff;
+  text-decoration: none;
+}
+
+.fsfw-doc-button {
+  @extend .content-button;
+}
+
+.fsfw-doc-button {
+  @extend .content-button;
+}
diff --git a/content/projects/fsfw/description.md b/content/projects/fsfw/description.md
new file mode 100644
index 0000000..13cafe6
--- /dev/null
+++ b/content/projects/fsfw/description.md
@@ -0,0 +1,5 @@
+The Flight Software Framework is a C++ Object Oriented Framework for
+unmanned, automated systems like Satellites. It has flight heritage
+through the 2 missions
+[FLP](https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/flying-laptop/) and
+[EIVE](https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/EIVE/).
diff --git a/content/projects/fsfw/index.html b/content/projects/fsfw/index.html
index b88cfb7..b4ecf51 100644
--- a/content/projects/fsfw/index.html
+++ b/content/projects/fsfw/index.html
@@ -5,77 +5,52 @@ draft = false
 +++
 
 <div class="container text-center">
-  <img src="FSFW_Logo_V3_bw.png" class="img-fluid mx-auto my-3" />
+  <img src="FSFW_Logo_V3_bw.png" class="img-fluid mx-auto my-4" />
   <div class="d-flex justify-content-center mx-auto w-75">
     <p class="text-justify">
-      The Flight Software Framework is a C++ Object Oriented Framework for
-      unmanned, automated systems like Satellites. It has flight heritage
-      through the 2 missions
-      <a
-        href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/flying-laptop/"
-        target="_blank"
-        >FLP</a
-      >
-      and
-      <a
-        href="https://www.irs.uni-stuttgart.de/en/research/satellitetechnology-and-instruments/smallsatelliteprogram/EIVE/"
-        target="_blank"
-        >EIVE</a
-      >.
+      {{% content "description.md" %}}
     </p>
   </div>
 
-  <h1>Documentation and Coverage</h1>
-  <div class="row">
+  <h2><i class="bi bi-file-text"></i> Documentation and Coverage</h2>
+  <div class="row row-cols-2 w-25 mx-auto pb-3">
     <div class="col">
-      <span
-        class="text-bg-primary rounded d-flex flex-column flex-wrap justify-content-center p-3 my-2 w-75 mx-auto"
+      <button
+        type="button"
+        class="fsfw-doc-button"
+        href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/development/"
       >
-        <a
-          href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/development/"
-          class="text-decoration-none text-light"
-          target="_blank"
-          >DEVELOP</a
-        >
-      </span>
+        DEVELOP
+      </button>
     </div>
     <div class="col">
-      <span
-        class="text-bg-primary rounded d-flex flex-column flex-wrap justify-content-center p-3 my-2 w-75 mx-auto"
+      <button
+        type="button"
+        class="fsfw-doc-button"
+        href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/master/"
       >
-        <a
-          href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/master/"
-          class="text-decoration-none text-light"
-          target="_blank"
-          >MASTER</a
-        >
-      </span>
+        MASTER 
+      </button>
     </div>
   </div>
-  <div class="row pb-2">
+  <h2>Repository</h2>
+  <h2>Test Coverage</h2>
+  <div class="row row-cols-2 w-25 mx-auto pb-3">
     <div class="col">
-      <span
-        class="text-bg-primary rounded d-flex flex-column flex-wrap justify-content-center p-3 my-2 w-75 mx-auto"
+      <a
+        href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/coverage/development/"
+        class="fsfw-doc-button"
+        target="_blank"
+        >DEVELOP</a
       >
-        <a
-          href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/coverage/development/"
-          class="text-decoration-none text-light"
-          target="_blank"
-          >&#8594; COVERAGE</a
-        >
-      </span>
     </div>
     <div class="col">
-      <span
-        class="text-bg-primary rounded d-flex flex-column flex-wrap justify-content-center p-3 my-2 w-75 mx-auto"
+      <a
+        href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/coverage/master/"
+        class="fsfw-doc-button"
+        target="_blank"
+        >MASTER</a
       >
-        <a
-          href="https://documentation.irs.uni-stuttgart.de/projects/fsfw/coverage/master/"
-          class="text-decoration-none text-light"
-          target="_blank"
-          >&#8594; COVERAGE</a
-        >
-      </span>
     </div>
   </div>
 </div>
diff --git a/hugo.toml b/hugo.toml
index 6effed7..1026689 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -8,12 +8,10 @@ theme = "minimal-theme"
 name = 'Home'
 pageRef = '/'
 weight = 10
-
 [[menu.main]]
 name = 'Contact'
 pageRef = 'contact'
 weight = 20
-
 [[menu.main]]
 name = 'IRS Website'
 url = 'https://www.irs.uni-stuttgart.de/'
@@ -23,12 +21,17 @@ blankTarget = true
 
 [module]
 [[module.mounts]]
-  source = "assets"
-  target = "assets"
+source = "assets"
+target = "assets"
 [[module.mounts]]
-  source = "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
-  target = "assets/js/bootstrap.bundle.min.js"
+source = "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
+target = "assets/js/bootstrap.bundle.min.js"
+[[module.mounts]]
+source = "static"
+target = "static"
+[[module.mounts]]
+source = "node_modules/bootstrap-icons/font/fonts"
+target = "static/css/fonts"
 
 [markup]
   defaultMarkdownHandler = 'goldmark'
-
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 45dc737..34cff84 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,6 @@
 <div class="container">
   <footer
-    class="footer d-flex flex-wrap justify-content-between align-items-center py-3 my-auto mx-3 border-top"
+    class="footer fixed-md-bottom d-flex flex-wrap justify-content-between align-items-center py-3 my-auto mx-3 border-top"
   >
     <p class="col-md-4 mb-0 text-body-secondary justify-content-start">
       &copy; {{ now.Year }} University of Stuttgart
diff --git a/package-lock.json b/package-lock.json
index 4aacd93..9b73f37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,8 @@
       "name": "sat-sw-website-hugo",
       "version": "1.0.0",
       "dependencies": {
-        "bootstrap": "^5"
+        "bootstrap": "^5",
+        "bootstrap-icons": "^1"
       }
     },
     "node_modules/@popperjs/core": {
@@ -38,6 +39,21 @@
       "peerDependencies": {
         "@popperjs/core": "^2.11.8"
       }
+    },
+    "node_modules/bootstrap-icons": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.2.tgz",
+      "integrity": "sha512-TgdiPv+IM9tgDb+dsxrnGIyocsk85d2M7T0qIgkvPedZeoZfyeG/j+yiAE4uHCEayKef2RP05ahQ0/e9Sv75Wg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ]
     }
   }
 }
diff --git a/package.json b/package.json
index b91907d..e7fa808 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "main": "index.html",
   "author": "Robin Mueller",
   "dependencies": {
-    "bootstrap": "^5"
+    "bootstrap": "^5",
+    "bootstrap-icons": "^1"
   }
 }
diff --git a/themes/minimal-theme/assets/sass/main.scss b/themes/minimal-theme/assets/sass/main.scss
index f66845d..ddc7b52 100644
--- a/themes/minimal-theme/assets/sass/main.scss
+++ b/themes/minimal-theme/assets/sass/main.scss
@@ -1,3 +1,4 @@
 @import "node_modules/bootstrap/scss/bootstrap.scss";
+@import "node_modules/bootstrap-icons/font/bootstrap-icons.scss";
 @import "theme_styles.scss";
 @import "user_styles.scss";
diff --git a/themes/minimal-theme/layouts/shortcodes/content.html b/themes/minimal-theme/layouts/shortcodes/content.html
new file mode 100644
index 0000000..9f7ab6b
--- /dev/null
+++ b/themes/minimal-theme/layouts/shortcodes/content.html
@@ -0,0 +1,7 @@
+{{ $file := .Get 0 }}
+{{ $full_path := delimit (slice .Page.RelPermalink $file) "" }}
+{{ if strings.HasSuffix $file ".md" }}
+  {{ $full_path | readFile | markdownify }}
+{{ else if strings.HasSuffix $file ".html" }}
+  {{ $full_path | readFile | safeHTML }}
+{{ end }}