Fix download page issues
diff --git a/html/doc/download.html b/html/doc/download.html
index 9b45bf2..e1f1ddf 100644
--- a/html/doc/download.html
+++ b/html/doc/download.html
@@ -30,53 +30,55 @@
 
 
   <div id=content>
-    <h1>Installing From Packages</h1>
+    <h1>Apache PageSpeed (Incubating) releases</h1>
     <div id="pre-apache-downloads">
       <dl>
-        <dt>Apache PageSpeed (Incubating) releases</dt>
         <p class="note">
           Please read the <a
             href=" https://github.com/apache/incubator-pagespeed-mod/blob/36/DISCLAIMER-WIP">WIP-DISCLAIMER</a> before
           using the releases below.
         </p>
         <dd>
-          <div class=download><a
-              href="https://dist.apache.org/repos/dist/release/incubator/pagespeed/1.14.36.1/x64/">1.14.36.1 .deb
-              package
-              (Debian/Ubuntu)</a>
+          <div class=download>
+            <div class="paragraph">
+              <p><strong><a href="https://downloads.apache.org/incubator/pagespeed/KEYS">Signing Keys</a></strong></p>
+              </div>
+              <div class="paragraph">
+              <p>It is essential that you verify the integrity of release downloads. See <a href="https://www.apache.org/dyn/closer.cgi#verify">instructions here</a></p>
+              </div>
+              <div class="sect3">
+              <h4 id="1_mod_pagespeed_apache_incubating_beta_1_14_36_1_r0_tar_bz2">mod-pagespeed-apache-incubating-beta-1.14.36.1-r0.tar.bz2</h4>
+              <div class="paragraph">
+              <p><strong><a href="https://www.apache.org/dyn/closer.lua/incubator/pagespeed/1.14.36.1/mod-pagespeed-apache-incubating-beta-1.14.36.1-r0.tar.bz2">Download</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/mod-pagespeed-apache-incubating-beta-1.14.36.1-r0.tar.bz2.asc">Signature</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/mod-pagespeed-apache-incubating-beta-1.14.36.1-r0.tar.bz2.sha512">Hash</a></strong> | mod-pagespeed-apache-incubating-beta-1.14.36.1-r0.tar.bz2&#8201;&#8212;&#8201;Filesize: 43.49 MB&#8201;&#8212;&#8201;Released: 06/22/2020 by oschaaf in r40130</p>
+              </div>
+              </div>
+              <div class="sect3">
+              <h4 id="2_mod_pagespeed_apache_incubating_beta_1_14_36_1_r0_amd64_deb">mod-pagespeed-apache-incubating-beta_1.14.36.1-r0_amd64.deb</h4>
+              <div class="paragraph">
+              <p><strong><a href="https://www.apache.org/dyn/closer.lua/incubator/pagespeed/1.14.36.1/x64/mod-pagespeed-apache-incubating-beta_1.14.36.1-r0_amd64.deb">Download</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/x64/mod-pagespeed-apache-incubating-beta_1.14.36.1-r0_amd64.deb.asc">Signature</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/x64/mod-pagespeed-apache-incubating-beta_1.14.36.1-r0_amd64.deb.sha512">Hash</a></strong> | mod-pagespeed-apache-incubating-beta_1.14.36.1-r0_amd64.deb&#8201;&#8212;&#8201;Filesize: 8.37 MB&#8201;&#8212;&#8201;Released: 06/22/2020 by oschaaf in r40130</p>
+              </div>
+              </div>
+              <div class="sect3">
+              <h4 id="3_psol_1_14_36_1_apache_incubating_x64_tar_gz">psol-1.14.36.1-apache-incubating-x64.tar.gz</h4>
+              <div class="paragraph">
+              <p><strong><a href="https://www.apache.org/dyn/closer.lua/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-x64.tar.gz">Download</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-x64.tar.gz.asc">Signature</a></strong> | <strong><a href="https://downloads.apache.org/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-x64.tar.gz.sha512">Hash</a></strong> | psol-1.14.36.1-apache-incubating-x64.tar.gz&#8201;&#8212;&#8201;Filesize: 18.93 MB&#8201;&#8212;&#8201;Released: 06/22/2020 by oschaaf in r40130</p>
+              </div>
+          </div>
         </dd>
-        <dd>
-          <a href="https://dist.apache.org/repos/dist/release/incubator/pagespeed/1.14.36.1/">1.14.36.1 source code</a>
     </div>
-    </dd>
-    </dl>
   </div>
   <p class="note">
     If you're using Nginx you need
     to <a href="build_ngx_pagespeed_from_source">build from source</a>. These
     packages are Apache-only.
   </p>
-  <p class="note">
+  <hr/>
+  <p class="warning">
     Any releases offered below are pre-apache releases.
   </p>
   <div id="pre-apache-downloads">
     <dl>
-      <dt>Latest Beta Version</dt>
-      <dd>
-        <div class=download><a
-            href="https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_i386.deb">mod_pagespeed 32-bit
-            .deb (Debian/Ubuntu)</a></div>
-        <div class=download><a
-            href="https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_amd64.deb">mod_pagespeed 64-bit
-            .deb (Debian/Ubuntu)</a></div>
-        <div class=download><a
-            href="https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_i386.rpm">mod_pagespeed 32-bit
-            .rpm (CentOS/Fedora)</a></div>
-        <div class=download><a
-            href="https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-beta_current_x86_64.rpm">mod_pagespeed
-            64-bit .rpm (CentOS/Fedora)</a></div>
-      </dd>
-      <dt>Latest Stable Version</dt>
+      <dt>Latest pre-apache stable version</dt>
       <dd>
         <div class=download><a
             href="https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.deb">mod_pagespeed
@@ -175,4 +177,4 @@
   <!--#include virtual="_footer.html" -->
 </body>
 
-</html>
\ No newline at end of file
+</html>