diff --git a/homepage/modules/ROOT/pages/index.adoc b/homepage/modules/ROOT/pages/index.adoc
index 8f94439..ddeba33 100644
--- a/homepage/modules/ROOT/pages/index.adoc
+++ b/homepage/modules/ROOT/pages/index.adoc
@@ -5,39 +5,66 @@
 <div class="homepage-page">
     <div class="homepage-section homepage-section-user-docs">
         <h2>User Documentation</h2>
-            <div class="homepage-section-container">
-            <a href="../fedora/f36/" class="homepage-link homepage-link-primary">
-                <h3>Fedora&nbsp;Linux&nbsp;36</h3>
-                <p>Documentation covering the most recent release, Fedora Linux 36.</p>
-            </a>
-            <a href="../fedora/f35/" class="homepage-link homepage-link-primary">
-                <h3>Fedora&nbsp;Linux&nbsp;35</h3>
-                <p>Documentation covering the Fedora Linux 35 release.</p>
-            </a>
-            <a href="../quick-docs/" class="homepage-link homepage-link-primary">
-                <h3>Quick Docs</h3>
-                <p>How tos and tutorials for using and configuring Fedora Linux.</p>
+
+        <div class="homepage-section-container">
+            <a href="/fedora/fedora-linux/index.html"  class="homepage-link homepage-link-primary">  
+                <h3>Fedora&nbsp;Linux</h3>
+                <p>New users, start here. Experienced users, get the latest information.</p>
             </a>
         </div>
+        
         <div class="homepage-section-container">
             <a href="../fedora-server/" class="homepage-link homepage-link-primary">
                 <h3>Fedora&nbsp;Server</h3>
-                <p>Are you using Fedora Linux on a server? This section is for you.</p>
+                <p>Deploy the services you need, modern or conventional, under your own control, and customized to your own requirements.</p>
+            </a>
+            <a href="../fedora-coreos/" class="homepage-link homepage-link-primary">
+                <h3>Fedora&nbsp;CoreOS</h3>
+                <p>Fedora CoreOS is a minimal, container-focused operating system, designed for clusters but also operable standalone.</p>
             </a>
             <a href="../iot/" class="homepage-link homepage-link-primary">
                 <h3>Fedora&nbsp;IoT</h3>
                 <p>Strong foundation for IoT projects at home, industrial gateways, smart cities or analytics with AI/ML.</p>
             </a>
-            <a href="../fedora-silverblue/" class="homepage-link homepage-link-primary">
-                <h3>Fedora&nbsp;Silverblue</h3>
-                <p>Immutable desktop variant of Fedora Workstation and an excellent platform for container-focused workflows.</p>
+        </div>
+
+        
+        <div class="homepage-section-container">
+            <a href="/fedora/fedora-workstation/index.html" class="homepage-link homepage-link-primary" >
+                <h3>Fedora&nbsp;Workstation Edition & spins</h3>
+                <p>A collection of polished, easy to use operating systems for laptop and desktop computers,</p>
+            </a>
+            <a href="#" class="homepage-link homepage-link-primary">
+                <h3>Fedora&nbsp;Workstation variants</h3>
+                <p><i>Silverblue</i>, a Gnome, and <i>Kinoite</i>, a KDE Plasma, desktop featuring immutable system and container-focused workflows.</p>
+            </a>
+            <a href="#" class="homepage-link homepage-link-primary">
+                <!-- <h3>Fedora&nbsp;Spins and Solutions</h3>  -->
+                <h3>Fedora&nbsp;Lab special use cases</h3>
+                <p>Alternative spins of Fedora Workstation and Fedora Silverblue as well as various special usage solutions.</p>
             </a>
         </div>
+
         <div class="homepage-section-container">
-            <a href="../fedora-coreos/" class="homepage-link homepage-link-primary">
-                <h3>Fedora&nbsp;CoreOS</h3>
-                <p>Fedora CoreOS is a minimal, container-focused operating system, designed for clusters but also operable standalone.</p>
+            <a href="../quick-docs/" class="homepage-link homepage-link-secondary">
+                <h3>Quick Docs</h3>
+                <p>How tos and tutorials for using and configuring Fedora Linux.</p>
             </a>
+            <a href="/fedora/fedora-tools/index.html" class="homepage-link homepage-link-secondary" >
+                <h3>Fedora Administration Tools</h3>
+                <p>Documentation of generic Fedora installation and administration tools.</p>
+            </a>
+            <a href="#" class="homepage-link homepage-link-secondary">
+                <h3>EPEL</h3>
+                <p>Documentation for the Extra Packages for Enterprise Linux (EPEL) project.</p>
+            </a>
+            <a href="https://docs.fedoraproject.org/en-US/quick-docs/raspberry-pi/" class="homepage-link homepage-link-secondary">
+                <h3>Fedora on ARM Single Board Computers</h3>
+                <p>Use Fedora on the Raspberry Pi and its powerful alternatives.</p>
+            </a>
+        </div>
+        <!--
+        <div class="homepage-section-container">
             <a href="../epel/" class="homepage-link homepage-link-primary">
                 <h3>EPEL</h3>
                 <p>Documentation for the Extra Packages for Enterprise Linux (EPEL) project.</p>
@@ -47,7 +74,7 @@
                 <p>Immutable desktop variant of Fedora featuring the KDE Plasma desktop and container-focused workflows.</p>
             </a>
         </div>
-        <div class="homepage-section-container">
+
             <a href="../fedora/rawhide/" class="homepage-link homepage-link-secondary">
                 <h3>Fedora&nbsp;Linux&nbsp;Rawhide</h3>
                 <p>Draft documentation targeting future Fedora Linux releases.</p>
@@ -56,7 +83,12 @@
                 <h3>Older releases</h3>
                 <p>Older Fedora Linux user documentation.</p>
             </a>
-        </div>
+            <a href="../fedora-silverblue/" class="homepage-link homepage-link-primary">
+                <h3>Fedora&nbsp;Silverblue</h3>
+                <p>Immutable desktop variant of Fedora Workstation and an excellent platform for container-focused workflows.</p>
+            </a>
+        -->
+
     </div>
 
     <div class="homepage-section homepage-section-project-docs">