diff --git a/_includes/layout/base/wallets-list.html b/_includes/layout/base/wallets-list.html
index d48430c1..350b2689 100644
--- a/_includes/layout/base/wallets-list.html
+++ b/_includes/layout/base/wallets-list.html
@@ -8,8 +8,8 @@ http://opensource.org/licenses/MIT.
   {% assign platform = page.platform['name'] %}
   {% assign os = page.os['name'] %}
   {% if wallet.compat contains platform and wallet.compat contains os %}
-    <div>
-      <a href="/en/wallets/{{ platform }}/{{ os }}/{{ wallet.id }}/">
+    <div data-walletlevel="{{ wallet.level }}">
+      <a href="/{{ page.lang}}/wallets/{{ platform }}/{{ os }}/{{ wallet.id }}/">
         <img src="/img/wallet/{{ wallet.id }}.png" alt="{{ wallet.title }}" />
         {{ wallet.titleshort }}
       </a>
@@ -17,3 +17,7 @@ http://opensource.org/licenses/MIT.
   {% endif %}
 {% endfor %}
 </div>
+
+<script type="text/javascript" charset="utf-8">
+  walletRotate();
+</script>
diff --git a/_includes/layout/base/wallets-menu.html b/_includes/layout/base/wallets-menu.html
index 89603f4f..57f1745f 100644
--- a/_includes/layout/base/wallets-menu.html
+++ b/_includes/layout/base/wallets-menu.html
@@ -26,7 +26,12 @@ http://opensource.org/licenses/MIT.
       {% assign platformClass = platformClass | append: " active" %}
     {% endif %}
     <li class="{{ platformClass }}">
-      <a href="#">{% translate walletcat{{platformName}} choose-your-wallet %}</a>
+      {% if platformName == 'hardware' or platformName == 'web' %}
+      {% assign platformHref = "/" | append: page.lang | append: "/wallets/" | append: platformName | append: "/" | append: platformName | append: "/" %}
+      {% else %}
+      {% assign platformHref = "#" %}
+      {% endif %}
+      <a href="{{ platformHref }}">{% translate walletcat{{platformName}} choose-your-wallet %}</a>
       {% if platform.items.size > 1 %}
         <ul>
         {% for item in platform.items %}
@@ -35,7 +40,7 @@ http://opensource.org/licenses/MIT.
             {% assign osClass = osClass | append: " active" %}
           {% endif %}
           <li class="{{ osClass }}">
-            <a href="/en/wallets/{{ platformName }}/{{ item.os.name }}">
+            <a href="/{{ page.lang }}/wallets/{{ platformName }}/{{ item.os.name }}">
               {% translate platform{{item.os.name}} choose-your-wallet %}
             </a>
           </li>
diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html
index 4ec055dd..84c90e83 100644
--- a/_layouts/wallet-container.html
+++ b/_layouts/wallet-container.html
@@ -33,6 +33,7 @@ max_wallet_text_length: 418  ## Unicode characters
                alt="{% translate platform{{os.name}} choose-your-wallet %}"
                title="{% translate platform{{os.name}} choose-your-wallet %}" />
           <span>{% translate platform{{os.name}} choose-your-wallet %}</span>
+          <span>{% translate walletcat{{os.name}} choose-your-wallet %}</span>
         </a>
         {% endfor %}
       {% endfor %}
@@ -47,6 +48,7 @@ max_wallet_text_length: 418  ## Unicode characters
                  alt="{% translate platform{{os.name}} choose-your-wallet %}"
                  title="{% translate platform{{os.name}} choose-your-wallet %}" />
             <h3>{% translate platform{{os.name}} choose-your-wallet %}</h3>
+            <h3>{% translate walletcat{{os.name}} choose-your-wallet %}</h3>
           </div>
           <div class="wallet-os-download-buttons">
             {% if os.link == 'bitcoincore' %}
diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss
index 48b6dadc..b45a8309 100644
--- a/_sass/_wallets.scss
+++ b/_sass/_wallets.scss
@@ -387,6 +387,7 @@ $scores:
 
                     .hover {
                         .wallet-os-check-details {
+                            z-index: 100;
                             display: block;
                             border: 2px solid;
                             border-radius: 4px;