diff --git a/assets/sass/user_styles.scss b/assets/sass/user_styles.scss
index dd488c8..f610b9e 100644
--- a/assets/sass/user_styles.scss
+++ b/assets/sass/user_styles.scss
@@ -20,6 +20,7 @@ body {
   }
 }
 
+// Not used anymore, not flexible enough..
 .content-button {
   display: button;
   background-color: #004191;
@@ -45,3 +46,15 @@ body {
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
 }
+
+.fsfw-img {
+  max-width: 50%;
+  height: auto;
+  margin-bottom: 1.0rem;
+}
+
+.satrs-img {
+  max-width: 20%;
+  height: auto;
+  margin-bottom: 1.0rem;
+}
diff --git a/content/projects/fsfw/index.html b/content/projects/fsfw/index.html
index 150f9e5..ff72921 100644
--- a/content/projects/fsfw/index.html
+++ b/content/projects/fsfw/index.html
@@ -2,6 +2,11 @@
 title = 'FSFW'
 date = 2023-01-01T08:00:00-07:00
 draft = false
+tags = ["fsfw", "framework", "on-board-software", "cpp"]
+homeSummary = """The Flight Software Framework, a C/C++ framework to develop On-Board Software for
+remote systems like satellites and rovers."""
+homeLogo = "FSFW_Logo_V3_bw.png"
+homeLogoCss = "fsfw-img"
 +++
 
 <div class="container text-center">
diff --git a/content/projects/sat-rs/index.html b/content/projects/sat-rs/index.html
index 62471de..5c4950e 100644
--- a/content/projects/sat-rs/index.html
+++ b/content/projects/sat-rs/index.html
@@ -2,6 +2,11 @@
 title = 'sat-rs'
 date = 2023-01-01T08:00:00-07:00
 draft = false
+tags = ["framework", "on-board-software", "rust", "sat-rs"]
+homeSummary = """A Rust framework to develop On-Board Software for remote systems
+like satellites and rovers."""
+homeLogo = "sat-rs_logo.png"
+homeLogoCss = "satrs-img"
 +++
 
 <div class="container text-center">
diff --git a/content/projects/spacepackets/index.html b/content/projects/spacepackets/index.html
index 419ce23..5f44d37 100644
--- a/content/projects/spacepackets/index.html
+++ b/content/projects/spacepackets/index.html
@@ -1,6 +1,9 @@
 +++
 title = 'spacepackets'
 date = 2023-01-01T08:00:00-07:00
+tags = ["spacepackets", "ccsds", "ecss", "python"]
+homeSummary = "A collection of CCSDS and ECSS packet standard implementations."
+homeSummaryHeader = "<h2>spacepackets</h2>"
 draft = false
 +++
 
diff --git a/layouts/index.html b/layouts/index.html
index 78d5ae9..c55b4f8 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -13,13 +13,24 @@
           href="projects/fsfw"
           class="col d-flex flex-column justify-content-center text-decoration-none"
         >
-          <span
-            class="bg-body-tertiary rounded d-flex flex-column flex-wrap justify-content-center my-2 px-2 py-3 border"
+          <div
+            class="bg-body-tertiary rounded d-flex flex-column flex-wrap justify-content-center my-2 px-2 py-3 h-100 border"
           >
-            <h2 class="display-6">FSFW</h2>
-            A C/C++ framework to develop On-Board Software for remote systems
-            like satellites and rovers.
-          </span>
+            <span>
+              {{ with site.GetPage "projects/fsfw" }}
+                {{ with .Params }}
+                  {{ if (and .homeLogo .homeLogoCss) }} 
+                    <img
+                      src="/projects/fsfw/{{ .homeLogo }}"
+                      class={{ .homeLogoCss }}
+                    />
+                    <br />
+                 {{ end }}
+                {{ end }}
+                {{ .Params.homeSummary }}
+              {{ end }}
+            </span>
+          </div>
         </a>
 
         <a
@@ -29,9 +40,23 @@
           <div
             class="bg-body-tertiary rounded d-flex flex-column flex-wrap justify-content-center my-2 py-3 px-2 h-100 border"
           >
-            <h2 class="display-6">sat-rs</h2>
-            A Rust framework to develop On-Board Software for remote systems
-            like satellites and rovers.
+            <span>
+              {{ with site.GetPage "projects/sat-rs" }}
+                {{ with .Params }}
+                  {{ if (and .homeLogo .homeLogoCss) }} 
+                    <img
+                      src="/projects/sat-rs/{{ .homeLogo }}"
+                      class={{ .homeLogoCss }}
+                    />
+                    <br />
+                 {{ end }}
+                {{ end }}
+              {{ end }}
+              <br />  
+              {{ with site.GetPage "projects/sat-rs" }}
+                {{ .Params.homeSummary }}
+              {{ end }}
+            </span>
           </div>
         </a>
 
@@ -41,9 +66,23 @@
         >
           <div
             class="bg-body-tertiary rounded d-flex flex-column flex-wrap justify-content-center my-2 py-3 px-2 h-100 border"
-          >
-            <h2 class="display-6">spacepackets</h2>
-            A collection of CCSDS and ECSS packet standard implementations.
+          > 
+            {{ with site.GetPage "projects/spacepackets" }}
+              {{ with .Params }}
+                {{ if (and .homeLogo .homeLogoCss) }} 
+                  <img
+                    src="/projects/sat-rs/{{ .homeLogo }}"
+                    class={{ .homeLogoCss }}
+                  />
+                  <br />
+                {{ else if .homeSummaryHeader }}
+                  {{ .homeSummaryHeader | safeHTML }}
+               {{ end }}
+              {{ end }}
+            {{ end }}
+            {{ with site.GetPage "projects/spacepackets" }}
+              {{ .Params.homeSummary }}
+            {{ end }}
           </div>
         </a>
       </div>