diff --git a/src/main/jbake/assets/css/cardio.css b/src/main/jbake/assets/css/cardio.css
index 10de1b4..afaae7f 100755
--- a/src/main/jbake/assets/css/cardio.css
+++ b/src/main/jbake/assets/css/cardio.css
@@ -1618,7 +1618,7 @@
   padding: 25px 0;
 }
 
-.committers-info-section .info-count { 
+.committers-info-section .info-count {
   display: block;
   font-weight: bold;
   font-size: 60px;
@@ -1759,4 +1759,8 @@
 
 .navbar-brand img {
   margin: -5px 0;
-}
\ No newline at end of file
+}
+
+h2 > a, h3 > a, h4 > a {
+  padding-top: 155px;
+}
diff --git a/src/main/jbake/content/download.adoc b/src/main/jbake/content/download.adoc
index b144253..dca6a2e 100755
--- a/src/main/jbake/content/download.adoc
+++ b/src/main/jbake/content/download.adoc
@@ -8,7 +8,8 @@
 
 You **must** link:https://www.apache.org/info/verification.html[verify] the integrity of the downloaded files. We provide OpenPGP signatures  (*.asc files) for every release file. This signature should be matched against link:https://downloads.apache.org/tomee/KEYS[KEYS] file which contains the OpenPGP keys of TomEE's Release Managers. We also provide SHA-512 checksums for every release file. After you download the file, you should calculate a checksum for your download, and make sure it is the same as ours.
 
-== Apache TomEE 9.0
+
+== [[tomee-9.0]]Apache TomEE 9.0
 
 - Jakarta EE 9.1
 - MicroProfile 2.0
@@ -32,7 +33,8 @@
 IMPORTANT: Note: TomEE 9.0.0-M7 is a milestone release, which targets the `jakarta` namespace. Applications using `javax` will not work on this release of TomEE 9. You may encounter issues - feedback on this release is encouraged
 and appreciated.
 
-== Apache TomEE 8.0
+
+== [[tomee-8.0]]Apache TomEE 8.0
 
 - Jakarta EE 8 / Java EE 8
 - MicroProfile 2.0
@@ -58,7 +60,8 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war[icon:download[] TomEE Webapp WAR] |8.0.6|25 Jan. 2021|34 MB |https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-8.0.6/tomee-webapp-8.0.6.war.sha512[icon:download[] SHA512]
 |===
 
-== Apache TomEE 7.1
+
+== [[tomee-7.1]]Apache TomEE 7.1
 
 - Java EE 7
 - MicroProfile 2.0
@@ -84,7 +87,8 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war[icon:download[] TomEE Webapp WAR] |7.1.4|25 Sep. 2020|29 MB |https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.1.4/tomee-webapp-7.1.4.war.sha512[icon:download[] SHA512]
 |===
 
-== Apache TomEE 7.0
+
+== [[tomee-7.0]]Apache TomEE 7.0
 
 - Java EE 7
 - Java 7 or Java 8
@@ -106,7 +110,8 @@
 |https://www.apache.org/dyn/closer.cgi/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war[icon:download[] TomEE Webapp WAR] |7.0.9|25 Sep. 2020|27 MB |https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.asc[icon:download[] PGP] https://downloads.apache.org/tomee/tomee-7.0.9/tomee-webapp-7.0.9.war.sha512[icon:download[] SHA512]
 |===
 
-== Apache TomEE 1.7
+
+== [[tomee-1.7]]Apache TomEE 1.7
 
 - Java EE 6
 - Java 6, Java 7 or Java 8
diff --git a/src/main/jbake/templates/index.gsp b/src/main/jbake/templates/index.gsp
index 4922051..6623db7 100755
--- a/src/main/jbake/templates/index.gsp
+++ b/src/main/jbake/templates/index.gsp
@@ -69,7 +69,7 @@
                         <h4 class="muted">apache-tomee-8.0.6</h4>
                         <p>Stable and ready for production, Apache TomEE 8.0 implements Java EE 8 / Jakarta EE 8 and supports the javax namespace.  Runs on Java 8 or higher.</p>
                     </div>
-                    <a class="btn btn-accent btn-primary square"  href="download.html"><i class="icon_plus"></i>Download</a>
+                    <a class="btn btn-accent btn-primary square"  href="download.html#tomee-8.0"><i class="icon_plus"></i>Download</a>
 				</div>
                 <div class="col-md-6 d-flex f-column-end accented-block accent-red f-space-between">
                     <div class="block-content">
@@ -81,7 +81,7 @@
                             <div class="compatible-badge">Jakarte EE Compatible</div>
                         </p>
                     </div>
-                    <a class="btn btn-accent btn-primary square"  href="download.html"><i class="icon_plus"></i>Download</a>
+                    <a class="btn btn-accent btn-primary square"  href="download.html#tomee-9.0"><i class="icon_plus"></i>Download</a>
 				</div>
 			</div>
             <div class="row animated fadeInUp d-flex section" style="opacity: 0;">  
diff --git a/src/main/jbake/templates/menu.gsp b/src/main/jbake/templates/menu.gsp
index 38204eb..fd432c0 100755
--- a/src/main/jbake/templates/menu.gsp
+++ b/src/main/jbake/templates/menu.gsp
@@ -37,7 +37,7 @@
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>docs.html">Documentation</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>community/index.html">Community</a></li>
 					<li><a href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>security/security.html">Security</a></li>
-					<li><a class="btn btn-accent accent-orange no-shadow" href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download-ng.html">Downloads</a></li>
+					<li><a class="btn btn-accent accent-orange no-shadow" href="<%if (content.rootpath) {%>${content.rootpath}<% } else { %><% }%>download.html">Downloads</a></li>
 				</ul>
 			</div>
 			<!-- /.navbar-collapse -->