diff --git a/swh/web/assets/src/bundles/webapp/webapp.css b/swh/web/assets/src/bundles/webapp/webapp.css
--- a/swh/web/assets/src/bundles/webapp/webapp.css
+++ b/swh/web/assets/src/bundles/webapp/webapp.css
@@ -309,6 +309,10 @@
     right: 0;
 }
 
+.swh-background-gray {
+    background: #efeff2;
+}
+
 .swh-donate-link {
     border: 1px solid #fecd1b;
     background-color: #e20026;
diff --git a/swh/web/templates/homepage.html b/swh/web/templates/homepage.html
--- a/swh/web/templates/homepage.html
+++ b/swh/web/templates/homepage.html
@@ -24,10 +24,20 @@
 
 {% block content %}
 
+<div class="p-3 swh-background-gray">
 <h4>Search</h4>
 
 {% include "includes/origin-search-form.html" %}
+<p class="text-right">
+... or check our
+<a style="color: #e20026;" href="{% url 'api-1-homepage' %}">
+  <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-cogs"></i>Web API
+</a>
+</p>
+</div>
+
 
+<div class="p-3">
 <h4>Overview</h4>
 
 <p>
@@ -39,33 +49,9 @@
   The Software Heritage archive is growing over time as we crawl new source code from software
   projects and development forges.
 </p>
+</div>
 
-<p>
-  <div class="row">
-    <div class="col-md-4 swh-web-app-link" align="center">
-      <a href="{% url 'browse-search' %}">
-        <i style="color: #e20026;" class="nav-icon mdi mdi-48px mdi-bookshelf"></i>
-        <h5>Browse</h5>
-        <p>Explore the archive using a dedicated web interface.</p>
-      </a>
-    </div>
-    <div class="col-md-4 swh-web-app-link" align="center">
-      <a href="{% url 'api-1-homepage' %}">
-        <i style="color: #e20026;" class="nav-icon mdi mdi-48px mdi-cogs"></i>
-        <h5>Web API</h5>
-        <p>Query the archive programmatically using a RESTful API.</p>
-      </a>
-    </div>
-    <div class="col-md-4 swh-web-app-link" align="center">
-      <a href="https://softwareheritage.org/support">
-        <i style="color: #e20026;" class="nav-icon mdi mdi-48px mdi-handshake"></i>
-        <h5>Support</h5>
-        <p>You can help build the Great Library of Source Code!</p>
-      </a>
-    </div>
-  </div>
-</p>
-
+<div class="p-3">
 <h4>Content</h4>
 
 <p>
@@ -73,7 +59,9 @@
   archive. It currently includes:
 </p>
 <iframe class="swh-coverage-list" src="{% url 'swh-coverage' %}"></iframe>
+</div>
 
+<div class="p-3">
 <h4>Size</h4>
 
 <p>
@@ -120,6 +108,7 @@
   </p>
 
 </p>
+</div>
 
 <script>
   swh.webapp.initHomePage();
diff --git a/swh/web/templates/layout.html b/swh/web/templates/layout.html
--- a/swh/web/templates/layout.html
+++ b/swh/web/templates/layout.html
@@ -139,19 +139,6 @@
       <div class="sidebar">
         <nav class="mt-2">
           <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
-            <li class="nav-header">Archive Access</li>
-            <li class="nav-item swh-browse-item" title="Explore the archive using a dedicated web interface">
-              <a href="{% url 'browse-search' %}" class="nav-link swh-browse-link">
-                <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-bookshelf"></i>
-                <p>Browse</p>
-              </a>
-            </li>
-            <li class="nav-item swh-api-1-item" title="Query the archive programmatically using a RESTful API">
-              <a href="{% url 'api-1-homepage' %}" class="nav-link swh-api-1-link">
-                <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-cogs"></i>
-                <p>Web API</p>
-              </a>
-            </li>
             <li class="nav-header">Features</li>
             <li class="nav-item swh-search-item" title="Search archived software">
               <a href="{% url 'browse-search' %}" class="nav-link swh-search-link">
@@ -162,7 +149,7 @@
             <li class="nav-item swh-vault-item" title="Download archived software from the Vault">
               <a href="{% url 'browse-vault' %}" class="nav-link swh-vault-link">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-download"></i>
-                <p>Vault</p>
+                <p>Downloads</p>
               </a>
             </li>
             <li class="nav-item swh-origin-save-item" title="Request the saving of a software origin into the archive">
@@ -171,7 +158,6 @@
                 <p>Save code now</p>
               </a>
             </li>
-            <li class="nav-header">Miscellaneous</li>
             <li class="nav-item swh-help-item" title="How to browse the archive ?">
               <a href="{% url 'browse-help' %}" class="nav-link swh-help-link">
                 <i style="color: #e20026;" class="nav-icon mdi mdi-24px mdi-help-circle"></i>