New download page

- new structure of Downloads page
- add screenshots of GUI (and make them localizable)
- add pics for hw wallets
- change structure of downloads.yml

_data/downloads.yml

@@ -1,95 +1,84 @@
-- platform: Windows, 64-bit
+gui:
-  id: windows
+- version: "0.15.0.1 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit (Installer)
+     hash: 55b4ac0b5131337ea7a7a66a7c6d4a277354a150c303bf70148ac284f6da5b9c
+     link: https://downloads.getmonero.org/gui/win64install
      icon: icon-windows
-  cli_url: win64
+     vers: 
-  cli_hash: a1d2a4a0a9f2cdb17808c0b7a2a872a70c9f3e6487494b29cc1627b5490f25e9
+   - platform: Windows 64-bit (Zip)
-  gui_url: win64
+     hash: a09cc7bf06834e49ec267e89daf1dc6ecc3b2c34ac50e8f0548f8997aef37b06
-  gui_hash: a09cc7bf06834e49ec267e89daf1dc6ecc3b2c34ac50e8f0548f8997aef37b06
+     link: https://downloads.getmonero.org/gui/win64
-  gui_installer_url: win64install
-  gui_installer_hash: 55b4ac0b5131337ea7a7a66a7c6d4a277354a150c303bf70148ac284f6da5b9c
-  cli_version: 0.15.0.1
-  gui_version: 0.15.0.1
-  gui_installer_version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: win
-
-- platform: Windows, 32-bit
      icon: icon-windows
-  cli_url: win32
+     vers: 
-  cli_hash: a3dc6d57c52383fcb83337799909c2c85cc8fe88b127d9408e3ea92880beb38d
+   - platform: Mac OS X 64-bit
-  version: 0.15.0.1
+     hash: c8994781510e234985e24f465761355e4ae7bd58ef686bd8b0ce4401c2314d51
-  tag: Carbon Chamaeleon
+     link: https://downloads.getmonero.org/gui/mac64
-  blockchain: win
-
-- platform: Mac OS X, 64-bit
-  id: mac
      icon: icon-apple
-  cli_url: mac64
+     vers: 
-  cli_hash: f3648a94fc9252a2e5b6e56978e756ff272403ec385f8be42338cae3f4f4e8a5
+   - platform: Linux 64-bit
-  gui_url: mac64
+     hash: 85a6885849d578691a09834c66ed55af4783ea8347b7784de9ea46e90995a57c
-  gui_hash: c8994781510e234985e24f465761355e4ae7bd58ef686bd8b0ce4401c2314d51
+     link: https://downloads.getmonero.org/gui/linux64
-  cli_version: 0.15.0.1
-  gui_version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: mac
-
-- platform: Linux, 64-bit
-  id: linux
      icon: icon-linux
-  cli_url: linux64
+     vers: 
-  cli_hash: 8d61f992a7e2dbc3d753470b4928b5bb9134ea14cf6f2973ba11d1600c0ce9ad
+   - platform: Source Code
-  gui_url: linux64
+     link: https://github.com/monero-project/monero-gui
-  gui_hash: 85a6885849d578691a09834c66ed55af4783ea8347b7784de9ea46e90995a57c
-  cli_version: 0.15.0.1
-  gui_version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: linux
-
-- platform: Linux, 32-bit
-  icon: icon-linux
-  cli_url: linux32
-  cli_hash: f157d8130978772bfe3ec4ebaca21f561dc0deffe49904af49f4a11d96c0cda6
-  cli_version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: linux
-
-- platform: FreeBSD, 64-bit
-  id: bsd
-  icon: icon-freebsd
-  cli_url: freebsd64
-  cli_hash: 810dbac09546a14fe6e2c276f41eebc5489bc43f91c0a85a080528ccd9ce12a8
-  version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: freebsd
-
-- platform: ARMv8
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm8
-  cli_hash: 67b890a10332cd91c69472e345b9ab624532540601a1d99f6fabb9c5c1b62455
-  version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: arm
-
-- platform: ARMv7
-  id: arm
-  icon: icon-arm
-  cli_url: linuxarm7
-  cli_hash: 19c34bf8d79b6ae809efe30a4c02695cd2d8212709a5bff43a5aec49517c41ee
-  version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: arm
-
-- platform: Source Code & Blockchain
-  id: source
      icon: icon-github
-  cli_url: https://github.com/monero-project/monero
-  mirror1: https://git.xmr.pm/monero-project/monero
-  cli_hash: source
-  version: Bleeding edge (possibly unstable)
      
-- platform: Mobile & Light Wallets
-  id: mobilelight
 
-- platform: Hardware Wallets
+cli:
-  id: hardware
+- version: "0.15.0.1 - Carbon Chamaeleon"
+  downloads:
+   - platform: Windows 64-bit
+     hash: a1d2a4a0a9f2cdb17808c0b7a2a872a70c9f3e6487494b29cc1627b5490f25e9
+     link: https://downloads.getmonero.org/gui/win64
+     icon: icon-windows
+     vers: 
+   - platform: Windows 32-bit
+     hash: a3dc6d57c52383fcb83337799909c2c85cc8fe88b127d9408e3ea92880beb38d
+     link: https://downloads.getmonero.org/cli/win32
+     icon: icon-windows
+     vers:
+   - platform: Mac OS X 64-bit
+     hash: f3648a94fc9252a2e5b6e56978e756ff272403ec385f8be42338cae3f4f4e8a5
+     link: https://downloads.getmonero.org/cli/mac64
+     icon: icon-apple
+     vers:
+   - platform: Linux 64-bit
+     hash: 8d61f992a7e2dbc3d753470b4928b5bb9134ea14cf6f2973ba11d1600c0ce9ad
+     link: https://downloads.getmonero.org/cli/linux64
+     icon: icon-linux
+     vers: 
+   - platform: Linux 32-bit
+     hash: f157d8130978772bfe3ec4ebaca21f561dc0deffe49904af49f4a11d96c0cda6
+     link: https://downloads.getmonero.org/cli/linux6432
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv8
+     hash: 67b890a10332cd91c69472e345b9ab624532540601a1d99f6fabb9c5c1b62455
+     link: https://downloads.getmonero.org/cli/linuxarm8
+     icon: icon-linux
+     vers:
+   - platform: Linux ARMv7
+     hash: 19c34bf8d79b6ae809efe30a4c02695cd2d8212709a5bff43a5aec49517c41ee
+     link: https://downloads.getmonero.org/cli/linuxarm7
+     icon: icon-linux
+     vers:
+   - platform: Android ARMv8
+     hash: f9cbf531049068f9c07b92a89371ff8aab6b69062077c3dfe4fa27a9956f8759
+     link: https://downloads.getmonero.org/cli/monero-android-armv8-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: Android ARMv7
+     hash: ea5eac2eed4d10cb35af50182ad11edeeffc4200d2b2b8e47f0283ae06fc4185
+     link: https://downloads.getmonero.org/cli/monero-android-armv7-v0.15.0.0.tar.bz2
+     icon: icon-android
+     vers:
+   - platform: FreeBSD 64-bit
+     hash: 810dbac09546a14fe6e2c276f41eebc5489bc43f91c0a85a080528ccd9ce12a8
+     link: https://downloads.getmonero.org/cli/freebsd64
+     icon: icon-freebsd
+     vers:
+   - platform: Source Code
+     link: https://github.com/monero-project/monero
+     icon: icon-github

_i18n/en.yml

@@ -169,30 +169,68 @@ team:
 
 downloads:
   translated: "yes"
+  intro: On this page you can find and download the latest version available of the Monero software, as well as hardware, light and mobile wallets.
   choose: Choose your OS
-  sourceblockchain: Source & Blockchain
+  gui: GUI Wallet
-  mobilelight: Mobile & Light
+  cli: CLI Wallet
-  hardware: Hardware
+  blockchain: Blockchain Bootstrap
-  intro1: If you need help choosing the correct application, please click
+  blockchain1: If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can use the most current bootstrap. It is typically much faster to sync from scratch, however, and it also takes a lot less RAM.
-  intro2: here
+  blockchainbutton: Download Blockchain
-  intro3: for a quick answer, then select the appropriate release for your operating system below.
+  mobilelight: Mobile & Light Wallets
-  note1: "Note: the SHA256 hashes are listed by the downloads for convenience, but a GPG-signed list of the hashes is at"
+  hardware: Hardware Wallets
-  note2: and should be treated as canonical, with the signature checked against the appropriate GPG key in the source code (in /utils/gpg_keys).
+  gui_intro: The GUI wallet provides a nice user interface, adaptable to all kinds of users, but it is especially recommended for less technical people who want to quickly send and receive XMR.
+  simplemode: Simple mode
+  simplemode1: Created for less technical users who only want to use Monero in the easiest and quickest way possible. Open the wallet, automatically connect to a remote node, send/receive XMR, done!
+  advancedmode: Advanced mode
+  advancedmode1: With all the advanced features you could need. Ideal for seasoned Monero users who prefer to have full control of their wallet and node
+  merchantpage: Merchant page
+  merchantpage1: Receive XMR for your business, easily
+  hwcompatible: Compatible with hardware wallets
+  hwcompatible1: such Trezor and Ledger
+  fiatconv: in-app fiat conversion
+  fiatconv1: No longer a need to check the value of your XMR online
+  pruning: Blockchain pruning
+  pruning1: Not enough disk space? Just use pruning to download only 1/3 of the blockchain
+  langs: "<b>30+ languages</b> available"
+  cli_intro: The CLI wallet gives you the total control over your Monero node and funds. Highly customizable and includes various analysis tools, as well as an HTTP RPC and 0MQ interface.
   currentversion: Current Version
   sourcecode: Source Code
-  mirror: Mirror
+  showissues: Show known issues for this release
-  blockchain1: If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can
+  noissues: This release has no known major issues
-  blockchain2: use this link for the most current bootstrap.
+  yesissues: >
-  blockchain3: It is typically much faster to sync from scratch, however, and it also takes a lot less RAM (import is very greedy).
+    This release has the following known issues:<br>
+    - Initial sync of the blockchain very slow. Will be fixed with a point release
+  helpsupport: Help and Support
+  helpsupport1: "A guide with an explanation of every section of the wallet is available:"
+  helpsupport2: "See latest release"
+  gui_helpsupport: "If you are experiencing issues or you need more info, feel free to reach out to the community. You can find the GUI team at #monero-gui, or else check out the Hangouts page for a more complete list of contacts and chatrooms"
+  cli_helpsupport: "If you are experiencing issues or you need more info, feel free to reach out to the community. You can find the CLI team at #monero or #monero-dev, or else check out the Hangouts page for a more complete list of contacts and chatrooms"
+  localremote: Local or remote node
+  localremote1: Use your own copy of the blockchain or a publicly available one
+  transacttor: Transactions over Tor/I2P
+  transacttor1: For an additional layer of privacy
+  bootstrapnode: Bootstrap node
+  bootstrapnode1: Use a remote node while downloading the blockchain locally, this will allow you to use Monero immediately and switch to your local node once it's completely synced
+  rpc: RPC Wallet and Daemon
+  rpc1: included in the archive
+  payforrpc: Pay-for-RPC
+  payforrpc1: A new feature that allows node operators to get rewarded when their node is used
+  verify: Verify
+  verify1: You are strongly advised to verify the hashes of the archive you downloaded. This will confirm that the files you downloaded perfectly match the files uploaded by the Monero development workgroup. Please don't underestimate this step, a corrupted archive could result in lost funds.
+  verify2: Always verify your downloads!
+  showhash: Show hashes to verify your download
+  showhash1: These SHA256 hashes are listed for convenience, but a GPG-signed list of the hashes is at 
+  showhash2: and should be treated as canonical, with the signature checked against the appropriate GPG key
+  showhash3: in the source code
+  showhash4: "Two guides are available to guide you through the verification process:"
   hardware1: The Monero community has funded a
-  hardware2: Dedicated Hardware Wallet
+  hardware2: Dedicated Hardware Wallet (Kastelo)
   hardware3: which is now in progress. Moreover, since CLI 0.12.1 and GUI 0.12.3 Ledger has
   hardware4: integrated Monero into their hardware wallets.
   hardware5: Trezor model T supports Monero since version 0.14.1.
-  mobilelight1: The following are mobile or light wallets that are deemed safe by trusted members of the community. If there is a wallet that is not on here, you can request the community check it out. Go to our
+  mobilelight1: The following are mobile or light wallets that are deemed safe by respected members of the community. If there is a wallet that is not on here, you can request the community check it out. Go to our
   mobilelight2: Hangouts
   mobilelight3:  page to see where we are.
-  clionly: Command-Line Tools Only
   installer: Installer
 
 monero-project:

css/custom.css

@@ -2982,6 +2982,37 @@ footer {
 
 /******************************DOWNLOADS STYLING***********************/
 
+.downloads h2.center {
+  text-align: center;
+}
+
+.downloads img.screen {
+    margin: 1rem auto;
+}
+
+.downloads .align-blocks {
+  padding: auto 0;
+  border: 3px solid transparent;
+  text-align: center;
+}
+
+.downloads summary:hover {
+    font-weight:bold;
+}
+
+.downloads ul {
+  list-style-type: none;
+  text-align: left;
+}
+
+.downloads li.downloads {
+  padding: 0.3rem;
+}
+
+.downloads ul.logo {
+  list-style-image: url('/img/logo-list.png');
+}
+
 .download-nav.info-block {
     display: -ms-flexbox;
     display: -webkit-box;
@@ -3043,9 +3074,8 @@ footer {
     word-break: break-all;
 }
 
-.downloads p.hash {
+.downloads dd.hash {
     padding-top: 0;
-    background-color: #fff1e8;
     color: #2f6f9f;
     white-space: pre-wrap;
     padding: 0.7rem;
@@ -3053,14 +3083,14 @@ footer {
     text-indent: -8px;
     line-height: 1.1rem;
     font-family: monospace;
-    margin-top: 0.5rem;
+    margin: 0.5rem 0;
 }
 
 .download-platforms .col-md-6 {
     padding: 0 2rem 0 0;
 }
 
-.download-platforms h2 span {
+.download-platforms span {
     height: 2rem;
     width: 2rem;
     display: inline-block;
@@ -3068,41 +3098,46 @@ footer {
     vertical-align: middle;
 }
 
-.download-platforms h2 span.icon-windows {
+.download-platforms span.icon-windows {
     background-image: url(../img/monero-spritesheet.png);
     background-position: -96px 0;
 }
 
-.download-platforms h2 span.icon-apple {
+.download-platforms span.icon-apple {
     background-image: url(../img/monero-spritesheet.png);
     background-position: -96px -96px;
 }
 
-.download-platforms h2 span.icon-linux{
+.download-platforms span.icon-linux{
     background-image: url(../img/monero-spritesheet.png);
     background-position: -96px -48px;
 }
 
-.download-platforms h2 span.icon-arm {
+.download-platforms span.icon-arm {
     background-image: url(../img/monero-spritesheet.png);
     background-position: 0 -176px;
 }
 
-.download-platforms h2 span.icon-freebsd {
+.download-platforms span.icon-freebsd {
     background-image: url(../img/monero-spritesheet.png);
     background-position: 0 -208px;
 }
 
-.download-platforms h2 span.icon-dragonflybsd {
+.download-platforms span.icon-dragonflybsd {
     background-image: url(../img/monero-spritesheet.png);
     background-position: 0 -287px;
 }
 
-.download-platforms h2 span.icon-github {
+.download-platforms span.icon-github {
     background-image: url(../img/monero-spritesheet.png);
     background-position: 0 -240px;
 }
 
+.download-platforms span.icon-android {
+  background-image: url(../img/monero-spritesheet.png);
+  background-position: 0 -321px;
+}
+
 .downloads a.arrow-up {
     border: 1px solid #d26e2b;
     border-radius: 50%;
@@ -3139,8 +3174,20 @@ footer {
     border-color: #ffffff;
 }
 
+.mobile-only {
+  display:none;
+}
+
 @media only screen and (max-width: 75rem) {
 
+.desktop-only {
+    display:none;
+}
+
+.mobile-only {
+  display:block;
+}
+
 .downloads .download-nav a {
     font-size: 0.92rem;
 }

downloads/index.md

@@ -7,17 +7,15 @@ permalink: /downloads/index.html
 {% t global.lang_tag %}
 <div class="downloads">
     <div class="container description">
-    <p>{% t downloads.intro1 %} <a href="https://www.reddit.com/r/Monero/comments/64b5lf/what_is_the_best_monero_wallet/">{% t downloads.intro2 %}</a> {% t downloads.intro3 %} {% t downloads.note1 %} <a href="https://getmonero.org/downloads/hashes.txt ">getmonero.org/downloads/hashes.txt</a> {% t downloads.note2 %}</p>
+    <p>{% t downloads.intro %}</p>
     </div>
     <div class="container full downdropdown">
         <div class="info-block download-nav row middle-xs between-xs" id="selections">
-            <div class="col"><a href="#windows">Windows</a></div>
+            <div class="col"><a href="#gui">{% t downloads.gui %}</a></div>
-            <div class="col"><a href="#mac">Mac</a></div>
+            <div class="col"><a href="#cli">{% t downloads.cli %}</a></div>
-            <div class="col"><a href="#linux">Linux</a></div>
+            <div class="col"><a href="#blockchain">{% t downloads.blockchain %}</a></div>
-            <div class="col"><a href="#arm">Arm (v7 & 8)</a></div>
-            <div class="col"><a href="#source">{% t downloads.sourceblockchain %}</a></div>
-            <div class="col"><a href="#mobilelight">{% t downloads.mobilelight %}</a></div>
             <div class="col"><a href="#hardware">{% t downloads.hardware %}</a></div>
+            <div class="col"><a href="#mobilelight">{% t downloads.mobilelight %}</a></div>
         </div>
     </div>
     <div class="container full">
@@ -26,49 +24,233 @@ permalink: /downloads/index.html
             <input id="check01" type="checkbox" name="menu"/>
             <label for="check01">{% t downloads.choose %}</label>
             <ul id="menu">
-              <li><a href="#windows">Windows</a></li>
+              <li><<a href="#gui">{% t downloads.gui %}</a></li>
-              <li><a href="#mac">Mac</a></li>
+              <li><a href="#cli">{% t downloads.cli %}</a></li>
-              <li><a href="#linux">Linux</a></li>
+              <li><a href="#blockchain">{% t downloads.blockchain %}</a></li>
-              <li><a href="#arm">Arm (v7 & 8)</a></li>
-              <li><a href="#source">{% t downloads.sourceblockchain %}</a></li>
-              <li><a href="#mobilelight">{% t downloads.mobilelight %}</a></li>
               <li><a href="#hardware">{% t downloads.hardware %}</a></li>
+              <li><a href="#mobilelight">{% t downloads.mobilelight %}</a></li>
             </ul>
           </div>
       </div>
     </div>
     <div class="download-platforms">
-        {% for data_downloads in site.data.downloads %}
+      <section class="container full">
-            <section class="container full" id="{{ data_downloads.id}}">
         <div class="info-block">
-                    <h2>
+        {% for item in site.data.downloads.gui %}
-                        {% if data_downloads.icon != null %}
+          <div class="row start-md">
-                            <span class="{{data_downloads.icon}}"></span>
+            <div class="col-md-12 col-sm-12 col-xs-12">
+              <h2 id="gui">{% t downloads.gui %}</h2>
+                <i>{% t downloads.gui_intro %}</i>
+            </div>
+            <div class="col-md-7 col-sm-12 align-blocks">
+                <img class="screen" src={% if site.lang == "en" %}"/img/downloads/gui.png"{% else %}"/img/downloads/{{site.lang}}/gui.png"{% endif %}>
+            </div>
+            <div class="col-md-5 col-sm-12 align-blocks">
+              <ul class="logo">
+                <li><b>{% t downloads.simplemode %}.</b> {% t downloads.simplemode1 %}</li>
+                <li><b>{% t downloads.advancedmode %}.</b> {% t downloads.advancedmode1 %}</li>
+                <li><b>{% t downloads.merchantpage %}.</b> {% t downloads.merchantpage1 %}</li>
+                <li><b>{% t downloads.hwcompatible %}</b> {% t downloads.hwcompatible1 %}</li>
+                <li><b>{% t downloads.fiatconv %}.</b> {% t downloads.fiatconv1 %}</li>
+                <li><b>{% t downloads.pruning %}.</b> {% t downloads.pruning1 %}</li>
+                <li>{% t downloads.langs %}</li>
+              </ul>
+            </div>
+            <div class="col-md-12 col-sm-12 col-xs-12">
+              <h3>{% t titles.downloads %}</h3>
+                <p><i>{% t downloads.currentversion %}:</i> {{ item.version }}</p>
+                <div class="row">
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-windows"></span><a class="orange" href="https://downloads.getmonero.org/gui/win64install">Windows 64-bit (Installer)</a></li>
+                     <li class="downloads"><span class="icon-windows"></span><a class="orange" href="https://downloads.getmonero.org/gui/win64">Windows 64-bit (zip)</a></li>
+                    </ul>
+                  </div>
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-linux"></span><a class="orange" href="https://downloads.getmonero.org/gui/linux64">Linux 64-bit</a></li>
+                      <li class="downloads"><span class="icon-apple"></span><a class="orange" href="https://downloads.getmonero.org/gui/mac64">Mac OS X 64-bit</a></li>
+                    </ul>
+                  </div>
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-github"></span><a class="orange" href="https://github.com/monero-project/monero-gui">{% t downloads.sourcecode %}</a></li>
+                    </ul>
+                  </div>
+                  <div class="mobile-only">
+                    <ul class="nopadding">
+                    {% for entry in item.downloads %}
+                      {% unless entry.vers != nil %}
+                      <li class="downloads"><span class="{{ entry.icon }}"></span><a class="orange" href="{{ entry.link }}">{{ entry.platform }}</a></li>
+                      {% endunless %}
+                    {% endfor %}
+                    </ul>
+                  </div>
+                  <div class="col-md-12 col-sm-12 col-xs-12">
+                  <p><details>
+                       <summary>{% t downloads.showissues %}</summary>
+                       <p><i>{% t downloads.noissues %}.</i></p>
+                     </details></p>
+                  {% for entry in item.downloads %}
+                    {% if entry.vers != nil %}
+                    <div class="col-md-12 col-sm-12 col-xs-12">
+                      <p><i>{% t downloads.currentversion %}:</i> {{ entry.vers }}</p>
+                      <ul>
+                        <li class="downloads"><span class="{{ entry.icon }}"></span><a class="orange" href="{{ entry.link }}">{{ entry.platform }}</a></li>
+                      </ul>
+                    </div>
                     {% endif %}
-                        {{data_downloads.platform}}
+                  {% endfor %}
-                    </h2>
+                  <h3>{% t downloads.verify %}</h3>
-                    {% if data_downloads.cli_hash == "source" %}
+                    <p>{% t downloads.verify1 %} <i>{% t downloads.verify2 %}</i></p><br>
+                    <details>
+                    <summary>{% t downloads.showhash %}</summary>
+                     <p>{% t downloads.showhash1 %} <a href="https://getmonero.org/downloads/hashes.txt">getmonero.org/downloads/hashes.txt</a> {% t downloads.showhash2 %} <a href="https://github.com/monero-project/monero/blob/master/utils/gpg_keys/fluffypony.asc">{% t downloads.showhash3 %}</a>.</p>
+                     <p>{% t downloads.showhash4 %} <a href="{{site.baseurl}}/resources/user-guides/verification-windows-beginner.html">{% t user-guides.verify-windows %}</a> - <a href="{{site.baseurl}}/resources/user-guides/verification-allos-advanced.html">{% t user-guides.verify-allos %}</a>.</p>
+                     <dl>
+                    {% for entry in item.downloads %}
+                      {% unless entry.hash == nil %}
+                    <dt><span class="{{ entry.icon }}"></span>{{ entry.platform }}</dt><dd class="hash">{{ entry.hash }}</dd>
+                      {% endunless %}
+                    {% endfor %}
+                     </dl>
+                  </details>
+                  <h3>{% t downloads.helpsupport %}</h3>
+                  <p>{% t downloads.helpsupport1 %} <a href="https://github.com/monero-ecosystem/monero-GUI-guide/releases">{% t downloads.helpsupport2 %}</a>.</p>
+                  <p>{% t downloads.gui_helpsupport %}.</p>
+                  </div>
+                </div>    
+            </div>
+          </div>
+        {% endfor %}  
+        </div>
+        <div class="info-block">
+        {% for item in site.data.downloads.cli %}
+          <div class="row start-md">
+            <div class="col-md-12 col-sm-12 col-xs-12">
+              <h2 id="cli">{% t downloads.cli %}</h2>
+                <i>{% t downloads.cli_intro %}</i>
+            </div>
+            <div class="col-md-7 col-sm-12 align-blocks">
+                <img class="screen" src={% if site.lang == "en" %}"/img/downloads/cli.png"{% else %}"/img/downloads/{{site.lang}}/cli.png"{% endif %}>
+            </div>
+            <div class="col-md-5 col-sm-12 align-blocks">
+              <ul class="logo">
+                <li><b>{% t downloads.localremote %}.</b> {% t downloads.localremote1 %}</li>
+                <li><b>{% t downloads.transacttor %}.</b> {% t downloads.transacttor1 %}</li>
+                <li><b>{% t downloads.bootstrapnode %}</b>. {% t downloads.bootstrapnode1 %}</li>
+                <li><b>{% t downloads.hwcompatible %}</b> {% t downloads.hwcompatible1 %}</li>
+                <li><b>{% t downloads.rpc %}</b> {% t downloads.rpc1 %}</li>
+                <li><b>{% t downloads.pruning %}.</b> {% t downloads.pruning1 %}</li>
+                <li><b>{% t downloads.payforrpc %}</b> {% t downloads.payforrpc1 %}</li>
+              </ul>
+            </div>
+            <div class="col-md-12 col-sm-12 col-xs-12">
+              <h3>{% t titles.downloads %}</h3>
+                <p><i>{% t downloads.currentversion %}:</i> {{ item.version }}</p>
+                <div class="row">
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-windows"></span><a class="orange" href="https://downloads.getmonero.org/cli/win64">Windows 64-bit</a> | <a class="orange" href="https://downloads.getmonero.org/cli/win32">32-bit</a></li>
+                      <li class="downloads"><span class="icon-apple"></span><a class="orange" href="https://downloads.getmonero.org/cli/mac64">Mac OS X 64-bit</a></li>
+                      <li class="downloads"><span class="icon-android"></span><a class="orange" href="https://downloads.getmonero.org/cli/monero-android-armv8-v0.15.0.1.tar.bz2">Android ARMv8</a> | <a class="orange" href="https://downloads.getmonero.org/cli/monero-android-armv7-v0.15.0.1.tar.bz2">ARMv7</a></li> <!-- These will be changed to general android-armv7 link -->
+                    </ul>
+                  </div>
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-linux"></span><a class="orange" href="https://downloads.getmonero.org/cli/linux64">Linux 64-bit</a> | <a class="orange" href="https://downloads.getmonero.org/cli/linux32">32-bit</a></li>
+                      <li class="downloads"><span class="icon-linux"></span><a class="orange" href="https://downloads.getmonero.org/cli/linuxarm8">Linux ARMv8</a> | <a class="orange" href="https://downloads.getmonero.org/cli/linuxarm7">Linux ARMv7</a></li>
+                    </ul>
+                  </div>
+                  <div class="col-md-4 col-sm-4 col-xs-4 desktop-only">
+                    <ul>
+                      <li class="downloads"><span class="icon-freebsd"></span><a class="orange" href="https://downloads.getmonero.org/cli/freebsd64">FreeBSD 64-bit</a></li>
+                      <li class="downloads"><span class="icon-github"></span><a class="orange" href="https://github.com/monero-project/monero">{% t downloads.sourcecode %}</a></li>
+                    </ul>
+                  </div>
+                  <div class="mobile-only">
+                    <ul class="nopadding">
+                      {% for entry in item.downloads %}
+                        {% unless entry.vers != nil %}
+                          <li class="downloads"><span class="{{ entry.icon }}"></span><a class="orange" href="{{ entry.link }}">{{ entry.platform }}</a></li>
+                        {% endunless %}
+                      {% endfor %}
+                    </ul>
+                </div>
+                <div class="col-md-12 col-sm-12 col-xs-12">
+                <p><details>
+                     <summary>{% t downloads.showissues %}</summary>
+                       <p><i>{% t downloads.noissues %}.</i></p>
+                     </details></p>
+                </div>
+                </div>
+                {% for entry in item.downloads %}
+                    {% if entry.vers != nil %}
+                    <div class="col-md-12 col-sm-12 col-xs-12">
+                      <p><i>{% t downloads.currentversion %}:</i> {{ entry.vers }}</p>
+                      <ul>
+                        <li class="downloads"><span class="{{ entry.icon }}"></span><a class="orange" href="{{ entry.link }}">{{ entry.platform }}</a></li>
+                      </ul>
+                    </div>
+                    {% endif %}
+                  {% endfor %}
+                <div class="col-md-12 col-sm-12 col-xs-12">
+                <h3>{% t downloads.verify %}</h3>
+                <p>{% t downloads.verify1 %} <i>{% t downloads.verify2 %}</i></p><br>
+                  <details>
+                    <summary>{% t downloads.showhash %}</summary>
+                     <p>{% t downloads.showhash1 %} <a href="https://getmonero.org/downloads/hashes.txt">getmonero.org/downloads/hashes.txt</a> {% t downloads.showhash2 %} <a href="https://github.com/monero-project/monero/blob/master/utils/gpg_keys/fluffypony.asc">{% t downloads.showhash3 %}</a>.</p>
+                     <p>{% t downloads.showhash4 %} <a href="{{site.baseurl}}/resources/user-guides/verification-windows-beginner.html">{% t user-guides.verify-windows %}</a> - <a href="{{site.baseurl}}/resources/user-guides/verification-allos-advanced.html">{% t user-guides.verify-allos %}</a>.</p>
+                      <dl>
+                     {% for entry in item.downloads %}
+                       {% unless entry.hash == nil %}
+                         <dt><span class="{{ entry.icon }}"></span>{{ entry.platform }}</dt><dd class="hash">{{ entry.hash }}</dd>
+                       {% endunless %}
+                    {% endfor %}
+                      </dl>
+                  </details>
+                <h3>{% t downloads.helpsupport %}</h3>
+                  <p>{% t downloads.cli_helpsupport %}.</p>
+                </div>
+            </div>
+          </div>
+        {% endfor %}  
+        </div>
+      </section>
+            <section class="container full">
+                <div class="info-block">
+                    <h2 id="blockchain">{% t downloads.blockchain %}</h2>
                         <div class="row">
                             <div class="col-md-12 col-sm-12 col-xs-12">
-                                <h3 id="{{ data_downloads.platform | slugify }}">
-                                    <a href="{{ data_downloads.cli_url }}">{% t downloads.sourcecode %}</a>
-                                </h3>
-                                <h3>
-                                    <a href="{{ data_downloads.mirror1 }}">{% t downloads.mirror %}</a>
-                                </h3>
                             </div>
                             <div class="col-md-12 col-sm-12 col-xs-12">
-                                <p>{% t downloads.blockchain1 %} <a href="https://downloads.getmonero.org/blockchain.raw">{% t downloads.blockchain2 %}</a> {% t downloads.blockchain3 %}</p>
+                                <p>{% t downloads.blockchain1 %}</p><br><!-- Add link to user guide with instractions about how to use the bootstrap node-->
+                                <div class="center-xs"><a class="btn-link btn-auto btn-primary" href="https://downloads.getmonero.org/blockchain.raw">{% t downloads.blockchainbutton %}</a></div>
                             </div>
                         </div>
-                    {% elsif data_downloads.id == "hardware" %}
+                </div>
+            </section>
+            <section class="container full">
+                <div class="info-block">
+                  <h2 id="hardware">{% t downloads.hardware %}</h2>
                         <div class="row">
                             <div class="col-md-12 col-sm-12 col-xs-12">
                                 <p>{% t downloads.hardware1 %} <a href="https://forum.getmonero.org/9/work-in-progress/88149/dedicated-monero-hardware-wallet" target="_blank" rel="noreferrer, noopener">{% t downloads.hardware2 %}</a> {% t downloads.hardware3 %} <a href="https://github.com/LedgerHQ/blue-app-monero" target="_blank" rel="noreferrer, noopener">{% t downloads.hardware4 %}</a></p>
                                 <p>{% t downloads.hardware5 %}</p>
                             </div>
                         </div>
-                    {% elsif data_downloads.id == "mobilelight" %}
+                        <div class="row mob-wallets center-xs">
+                          <a href="https://kastelo.org"><img src="/img/kastelo.png"></a>
+                        </div>
+                        <div class="row mob-wallets center-xs">
+                          <a href="https://www.ledger.com/monero-wallet/"><img src="/img/ledger.png"></a>
+                          <a href="https://wiki.trezor.io/Monero_(XMR)"><img src="/img/trezor.png"></a>
+                        </div>                    
+                </div>
+            </section>
+            <section class="container full">
+                <div class="info-block">
+                  <h2 id="mobilelight">{% t downloads.mobilelight %}</h2>
                         <div class="row">
                             <div class="col-md-12 col-sm-12 col-xs-12">
                                 <p>{% t downloads.mobilelight1 %} <a href="/community/hangouts/"> {% t downloads.mobilelight2 %}</a> {% t downloads.mobilelight3 %}</p>
@@ -80,68 +262,8 @@ permalink: /downloads/index.html
                                 <a href="https://mymonero.com"><img src="/img/mymonero.png" alt="MyMonero Logo"></a>
                                 <a href="https://edge.app/"><img style="height: 115px;" src="/img/edge-wallet.png" alt="Edge Logo"></a>
                         </div>
-                    {% elsif data_downloads.gui_hash == nil and data_downloads.cli_hash != nil %}
-                        <div class="row">
-                            <div class="col-md-12 col-sm-12 col-xs-12">
-                                <h3 id="{{ data_downloads.platform | slugify }}">
-                                     <a href="//downloads.getmonero.org/cli/{{ data_downloads.cli_url }}"> {{ data_downloads.platform }} {% t downloads.clionly %}</a>
-                                </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.tag }}</p>
-                            </div>
-                         </div>
-                        <div class="row">
-                            <div class="col-md-12 col-sm-12 col-xs-12">
-                                <p class="prehash">SHA256 Hash:</p>
-                                <p class="hash"> {{ data_downloads.cli_hash }}</p>
-                            </div>
-                        </div>
-                    {% elsif data_downloads.gui_hash != nil and data_downloads.cli_hash == nil %}
-                        <div class="row">
-                            <h3 id="{{ data_downloads.platform | slugify }}">
-                                <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_url }}">{{ data_downloads.platform }}</a>
-                            </h3>
-                            <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.tag }}</p>
-                        </div>
-                        <div class="row">
-                            <p class="prehash">SHA256 Hash:</p>
-                            <p class="hash"> {{ data_downloads.gui_hash }}</p>
-                        </div>
-                    {% elsif data_downloads.gui_hash != nil and data_downloads.cli_hash != nil %}
-                        <div class="row start-md">
-                            <div class="col-md-6 col-sm-12" >
-                                <h3 id="{{ data_downloads.platform | slugify }}">
-                                    <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_url }}">{{ data_downloads.platform }}</a>
-                                </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_version }} {{ data_downloads.tag }}</p>
-                                <p class="prehash">SHA256 Hash (GUI):</p>
-                                <p class="hash"> {{ data_downloads.gui_hash }}</p>
-                            </div>
-                            <div class="col-md-6 col-sm-12">
-                                <h3>
-                                    <a href="//downloads.getmonero.org/cli/{{ data_downloads.cli_url }}">{{ data_downloads.platform }} {% t downloads.clionly %}</a>
-                                </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.cli_version }} {{ data_downloads.tag }}</p>
-                                <p class="prehash">SHA256 Hash (CLI):</p>
-                                <p class="hash"> {{ data_downloads.cli_hash }}</p>
-                            </div>
-                        </div>
-                        <br/>
-                        {% if data_downloads.gui_installer_hash != nil %}
-                        <div class="row">
-                            <div class="col-md-6 col-sm-12" >
-                                <h3 id="{{ data_downloads.platform | slugify }}">
-                                    <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_installer_url }}">{{ data_downloads.platform }} {% t downloads.installer %}</a>
-                                </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_installer_version }} {{ data_downloads.tag }}</p>
-                                <p class="prehash">SHA256 Hash (GUI Installer):</p>
-                                <p class="hash"> {{ data_downloads.gui_installer_hash }}</p>
-                            </div>
-                        </div>
-                        {% endif %}
-                    {% endif %}
                 </div>
             </section>
-        {% endfor %}
     </div>
     <a href="#" class="arrow-up"><i></i></a>
 </div>