diff --git a/_data/navigation.yml b/_data/navigation.yml
index 7f82cdbb5fc8e4dc42669d74cf6575ad35732585..509c8e7028e0456d5477ee1fb18c188a2934ffd0 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -21,7 +21,7 @@ header:
       - title: "Identity and Access Management (AAI)"
         url: "https://aai.helmholtz.de/"
         external: True
-      - title: "Software Engineering"
+      - title: "Software Services"
         url: "services/software-overview"
       - title: "Software Engineering Consulting"
         url: "consulting"
diff --git a/_includes/frontpage/title-content.html b/_includes/frontpage/title-content.html
index 419a2e783294451ea5a521f1d9583464a139d6aa..cf0d3198572d6c42f6e4325d385fa4ede1c972b2 100644
--- a/_includes/frontpage/title-content.html
+++ b/_includes/frontpage/title-content.html
@@ -6,17 +6,20 @@
     
     <div class="services-box">
         <div class="services-title-buttons">
-            <a href="https://helmholtz.cloud/services" class="btn btn-light btn-lg text-dark">
+            <a href="https://helmholtz.cloud/services" class="btn btn-light text-dark">
             Cloud Services
             </a>
-            <a href="https://events.hifis.net/category/4/" class="btn btn-light btn-lg text-dark">
-                HIFIS Courses
+            <a href="{% link services/software-overview.md %}" class="btn btn-light text-dark">
+                Software Services
             </a>
-            <a href="{% link services/software/consulting.html %}" class="btn btn-light btn-lg text-dark">
-                Software Engineering Consulting
+            <a href="https://events.hifis.net/category/4/" class="btn btn-light text-dark">
+                Courses
             </a>
-            <a href="https://aai.helmholtz.de" class="btn btn-light btn-lg text-dark">
-                Identity &amp; Access Management (AAI)
+            <a href="https://aai.helmholtz.de" class="btn btn-light text-dark">
+                User Access
+            </a>
+            <a href="{% link usecases.md %}" class="btn btn-light text-dark">
+                Use Cases
             </a>
         </div>
     </div>
diff --git a/assets/css/title/service-title-buttons.scss b/assets/css/title/service-title-buttons.scss
index 37c0dfea4cd1cd6edae7c0a00e3158a579eab061..3e634785b2d8fd16a663f404027db3c1d0563a61 100644
--- a/assets/css/title/service-title-buttons.scss
+++ b/assets/css/title/service-title-buttons.scss
@@ -14,15 +14,16 @@
 
 .services-title-buttons {
     display:                grid;
-    grid-template-columns:  1fr 1fr;
+    grid-template-columns:  1fr 1fr 1fr;
     grid-auto-rows:         1fr;
 
     @include medium-is-desktop-plus {
-        max-width: 600px;
+        max-width: 800px;
     }
 
     @include medium-is-tablet {
-        grid-template-columns: 1fr 1fr 1fr 1fr;
+        grid-template-columns: 1fr 1fr 1fr;
+        grid-auto-rows: 1fr;
     }
 
     @include medium-is-phone {
@@ -39,9 +40,9 @@
     }
 
     .btn {
-        margin:     0.5rem;
+        margin:     0.25rem;
         display:    flex;
         flex-flow:  column nowrap;
-        min-height: 3.3rem;
+        min-height: 2.5rem;
     }
 }
diff --git a/services/software-overview.md b/services/software-overview.md
index f70dfe7a523b1c48581b95ccc6c585945a6fb5df..82977867efc7c559821fb2a690b92c3e48038a40 100644
--- a/services/software-overview.md
+++ b/services/software-overview.md
@@ -1,5 +1,5 @@
 ---
-title: Software Engineering
+title: Software Services
 title_image: default
 layout: default
 author: none
diff --git a/services/software/helmholtzgitlab.html b/services/software/helmholtzgitlab.html
index d75f7c09dc57d31cb263d984fc117de1330cb024..5521e793c3b133168f9d6a7845959540386f367c 100644
--- a/services/software/helmholtzgitlab.html
+++ b/services/software/helmholtzgitlab.html
@@ -1,5 +1,5 @@
 ---
-title: Helmholtz GitLab / Technology
+title: Software Development Infrastructure
 title_image: adi-goldstein-mDinBvq1Sfg-unsplash_shrinked.jpg
 layout: services/default
 author: none
diff --git a/services/software/rsd.html b/services/software/rsd.html
new file mode 100644
index 0000000000000000000000000000000000000000..bce0365b13d5c49f1ca00cca4886e93c957f7ef3
--- /dev/null
+++ b/services/software/rsd.html
@@ -0,0 +1,10 @@
+---
+title: Research Software Directory (Preview) <i class="fas fa-external-link-alt"></i>
+title_image: pexels-cottonbro-5483071.jpg
+layout: services/default
+author: none
+excerpt: >-
+    A central software directory tailored to Research Software Engineers and Researchers
+    that want to promote or discover research software.
+redirect_to: "https://helmholtz.software"
+---
diff --git a/services/software/spotlights.html b/services/software/spotlights.html
new file mode 100644
index 0000000000000000000000000000000000000000..33767c56b2faf00494f8505e967758dc7cb96e2d
--- /dev/null
+++ b/services/software/spotlights.html
@@ -0,0 +1,9 @@
+---
+title: "Software Spotlights"
+title_image: blue_curtains.jpg
+layout: services/default
+author: none
+excerpt: >-
+    The Helmholtz Software Spotlights represent top success stories of Reseach Software Engineering in Helmholtz.
+redirect_to: spotlights
+---