diff --git a/_includes/frontpage/title-content.html b/_includes/frontpage/title-content.html
index 20aede303f8f67a03e355c8111b2f2b6651fb408..3b039d512686724aa0e83b0a4b78c8a97036cdf4 100644
--- a/_includes/frontpage/title-content.html
+++ b/_includes/frontpage/title-content.html
@@ -10,15 +10,11 @@
         <a href="https://aai.helmholtz.de" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-network-wired"></i>Helmholtz AAI
         </a>
-        <a href="{{ '/services/consulting' | relative_url }}" class="btn btn-light btn-lg text-dark">
+        <a href="{{ '/services/software/consulting' | relative_url }}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-chart-line"></i> Consulting
         </a>
-        
-        <a href="{{ '/services/training' | relative_url }}" class="btn btn-light btn-lg text-dark">
+        <a href="{{ '/services/software/training' | relative_url }}" class="btn btn-light btn-lg text-dark">
             <i class="fas fa-university"></i> Education & Training
-        </a>        
-        <a href="{{ '/services/#community' | relative_url }}" class="btn btn-light btn-lg text-dark">
-            <i class="fas fa-users"></i> Communities
         </a>
     </div>
 </div>
diff --git a/_layouts/services/index.html b/_layouts/services/index.html
index 65745bbd567d5c13b5994411bda8a4a3ab6f2151..cfa1583a85b9252cf7fb762a7db693338ad93319 100644
--- a/_layouts/services/index.html
+++ b/_layouts/services/index.html
@@ -25,7 +25,7 @@
                                 In Education &amp; Training we will offer courses, materials or workshops
                                 to help you in getting started or in boosting your software
                                 engineering practice.
-                                <a href="{{ 'services/training' | relative_url }}"><strong>More...</strong></a>
+                                <a href="{{ 'services/software/training' | relative_url }}"><strong>More...</strong></a>
                             </p>
                             <h4>Need something specific? Talk to us</h4>
                             {% include contact_us/mini.html %}
diff --git a/assets/css/title/service-title-buttons.scss b/assets/css/title/service-title-buttons.scss
index 86164f8186ca95b228c35fe913b717c73a02f056..92daf2a5c222da5deeb78774096e7dd9f1b5524d 100644
--- a/assets/css/title/service-title-buttons.scss
+++ b/assets/css/title/service-title-buttons.scss
@@ -11,10 +11,10 @@
 
 .services-title-buttons {
     display:                grid;
-    grid-template-columns:  1fr 1fr 1fr;
+    grid-template-columns:  1fr 1fr;
 
     @include medium-is-tablet {
-        grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+        grid-template-columns: 1fr 1fr 1fr 1fr;
     }
 
     @include medium-is-phone {