Updating the HTML files

Signed-off-by: Stefan Kügel <skuegel@web.de>

5 files changed, 182 insertions, 191 deletions

diff --git a/template/contact.html.j2 b/template/contact.html.j2
index ba8b8d16..26797acf 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -30,7 +30,7 @@
         <p>
           {% trans %}
             Team members are generally reachable at
-            <tt>LASTNAME@taler.net</tt>. All of us
+            <tt>LASTNAME AT taler.net</tt>. All of us
             support receiving GnuPG encrypted e-mails.
           {% endtrans %}
         </p>
@@ -52,7 +52,7 @@
           {% trans %}
             We track open feature requests and bugs in our
           {% endtrans %}
-          <a href="https://gnunet.org/bugs/">{{ _("Bug tracker") }}</a>,
+          <a href="https://bugs.taler.net/">{{ _("Bug tracker") }}</a>,
           {% trans %}
             which is shared with the GNUnet project.
             You can also report bugs or feature requests to the
diff --git a/template/development.html.j2 b/template/development.html.j2
new file mode 100644
index 00000000..f1f2a157
--- /dev/null
+++ b/template/development.html.j2
@@ -0,0 +1,111 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<main id="maincontent">
+<div class="container">
+  <div class="row">
+    <div class="col">
+    <h1>{{ _("GNU Taler: Development")}}</h1>
+    </div>
+  </div>
+  <div class="row mt-5">
+  </div>
+  <div class="row justify-content-center text-center">
+    <div class="col-8">
+      <h2>{{ _("Community Interaction")}}</h2>
+    </div>
+  </div>
+  <div class="row mt-5">
+  </div>
+  <div class="row">
+    <div class="col-lg-4 mb-4">
+      <a href="https://lists.gnu.org/mailman/listinfo/taler" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-email-list-4339749.svg') }}" height=60>
+        <h3>{{ _("Mailing List")}}</h3>
+      </a>
+      {{ _("The official GNU Taler mailing list.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://web.libera.chat/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-chat-5180308.svg') }}" height=60>
+        <h3>{{ _("IRC")}}</h3>
+      </a>
+      {{ _("Our IRC channel is #taler on Libera.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://bugs.taler.net/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-bug-tracking-2119186.svg') }}" height=60>
+        <h3>{{ _("Bug Tracker")}}</h3>
+      </a>
+      {{ _("Our bug tracker for bugs and feature request.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/developers-manual.html" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-onboarding-2896490.svg') }}" height=60>
+        <h3>{{ _("Onboarding")}}</h3>
+      </a>
+      {% trans %}
+        Description of our taler.net setup and how to contribute.
+      {% endtrans %}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/developers-manual.pdf") }}
+    </div>
+  </div>
+
+  <div class="row mt-5">
+  </div>
+  <div class="row justify-content-center text-center">
+    <div class="col-8">
+      <h2>{{ _("Developer Services")}}</h2>
+    </div>
+  </div>
+
+  <div class="row mt-5">
+  </div>
+  <div class="row">
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-git-2407191.svg') }}" height=60>
+        <h3>{{ _("Git repositories") }}</h3>
+      </a>
+      {{ _("Git repositories for all of GNU Taler.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://lcov.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/icon-lcov.svg') }}" height=60>
+        <h3>{{ _("lcov results") }}</h3>
+      </a>
+      {{ _("Shows results of the code coverage analysis for our test suite.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://buildbot.taler.net" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-continuous-integration-4368507.svg') }}" height=60>
+        <h3>{{ _("Continuous integration") }}</h3>
+      </a>
+      {{ _("Continuous integration and deployment is managed by our Buildbot.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://weblate.taler.net/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-translate-5177522.svg') }}" height=60>
+        <h3>{{ _("Internationalization")}}</h3>
+      </a>
+      {{ _("Using our weblate service, everyone in the community can contribute towards translating the Website and the GNU Taler applications.") }}
+    </div>
+
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/twister.git/" target="_blank" rel="noopener noreferrer">
+        <img src="{{ url('icons/noun-twister-2280690.svg') }}" height=60>
+        <h3>{{ _("Twister") }}</h3>
+      </a>
+      {% trans %}
+        HTTP modifying man-in-the-middle proxy to test error handling.
+      {% endtrans %}
+    </div>
+  </div>
+</div>
+{% endblock body_content %}
diff --git a/template/docs.html.j2 b/template/docs.html.j2
index f8307891..36373bcf 100644
--- a/template/docs.html.j2
+++ b/template/docs.html.j2
@@ -13,15 +13,13 @@
       {% trans %}
         This is an overview of documentation and other resources for GNU Taler.
         The full documentation contents can be found
-        <a href="https://docs.taler.net/">here</a>.
+        <a href="https://docs.taler.net/" target="_blank" rel="noopener noreferrer">here</a>.
       {% endtrans %}
     </div>
   </div>
-
   <div class="row mt-5">
   </div>
 
-
   <div class="row justify-content-center text-center">
     <div class="col-8">
       <h2>{{ _("Core Component Documentation")}}</h2>
@@ -32,41 +30,41 @@
   </div>
 
   <div class="row">
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-manual.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-manual.html" target="_blank" rel="noopener noreferrer">
       <img src="{{ url('icons/icon-backend.svg') }}" height=60>
       <h3>{{ _("Merchant Backend Administration")}}</h3>
       </a>
       {% trans docshost=siteconf['docshost'] %}
         Tutorial and manual for operating a merchant.
-        Also available as <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>.
+        Also available as <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf" target="_blank" rel="noopener noreferrer">PDF</a>.
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-api-tutorial.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-api-tutorial.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-market.svg') }}" height=60>
         <h3>{{ _("Merchant API Tutorial") }}</h3>
       </a>
       {% trans %}
         Tutorial for processing Taler payments using the merchant backend API.
       {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-merchant-api-tutorial.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-merchant-api-tutorial.pdf") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-backoffice-manual.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-backoffice-manual.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-backoffice.svg') }}" height=60>
         <h3>{{ _("Back office") }}</h3>
       </a>
       {% trans %}
         Manual to run the back-office Web application.
       {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-backoffice-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-backoffice-manual.pdf") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-pos-terminal.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-merchant-pos-terminal.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-tablet-4084423.svg') }}" height=60>
         <h3>{{ _("Merchant POS Terminal") }}</h3>
       </a>
@@ -76,42 +74,42 @@
       {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-merchant-pos-terminal.pdf") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-exchange-manual.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-exchange-manual.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-exchange.svg') }}" height=60>
         <h3>{{ _("Exchange")}}</h3>
       </a>
       {% trans %}
-        Operator&#39;s manual for the GNU Taler exchange.
+        Operator&#39;s manual for the GNU Taler Exchange.
       {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-exchange-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-exchange-manual.pdf") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-bank-manual.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-bank-manual.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-bank.svg') }}" height=60>
         <h3>{{ _("Bank Integration") }}</h3>
       </a>
       {% trans %}
         Manual for tightly integrating Taler with banking applications.
       {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-bank-manual.pdf") }}
+      {{ gettext('Also available as <a href="%(link)s" target="_blank" rel="noopener noreferrer">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/taler-bank-manual.pdf") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/taler-wallet.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/taler-wallet.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-digital-wallet-5004389.svg') }}" height=60>
         <h3>{{ _("Wallet") }}</h3>
       </a>
       {% trans %}
-        Manual about the Taler wallets (WebExtensions, Android, CLI).
+        Manual about the Taler wallets (WebExtensions, Android, iOS, CLI).
         You can download pre-packaged binaries from
-        <a href="wallet.html">the Taler wallet Web site</a>.
+        <a href="wallet.html" target="_blank" rel="noopener noreferrer">the Taler wallet Web site</a>.
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="{{ url_localized('cashier.html') }}">
+    <div class="col-lg-4 mb-4">
+      <a href="{{ url_localized('cashier.html') }}" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-cashier.svg') }}" height=60>
         <h3>{{ _("Cashier") }}</h3>
       </a>
@@ -134,8 +132,8 @@
   </div>
 
   <div class="row">
-    <div class="col-lg-4">
-      <a href="https://anastasis.lu/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://anastasis.lu/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-recovery-4887278.svg') }}" height=60>
         <h3>{{ _("GNU Anastasis") }}</h3>
       </a>
@@ -144,8 +142,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/libeufin.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/libeufin.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-bank-5178441.svg') }}" height=60>
         <h3>{{ _("libeufin") }}</h3>
       </a>
@@ -155,8 +153,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/depolymerization.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/depolymerization.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-blockchain-4878073.svg') }}" height=60>
         <h3>{{ _("Depolymerization") }}</h3>
       </a>
@@ -165,8 +163,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/sync.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/sync.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-synchronization-5156797.svg') }}" height=60>
         <h3>{{ _("Sync") }}</h3>
       </a>
@@ -175,8 +173,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/taler-mailbox.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/taler-mailbox.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-mailbox-5176593.svg') }}" height=60>
         <h3>{{ _("Taler Mailbox") }}</h3>
       </a>
@@ -185,8 +183,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/taldir.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/taldir.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-directory-1024875.svg') }}" height=60>
         <h3>{{ _("TalDir") }}</h3>
       </a>
@@ -206,20 +204,19 @@
  </div>
 
   <div class="row">
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/taler-mdb.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/taler-mdb.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-vending-machine-4884056.svg') }}" height=60>
         <h3>{{ _("Taler-MDB") }}</h3>
       </a>
       {% trans %}
-        Integration of GNU Taler with the Multi-Drop-Bus (MDB) protocol
-        commonly used in vending machines.  Deployed at a coffee and a
-        snack machine at <a href="https://bfh.ch/">BFH</a>.
+        Integration of GNU Taler with the Multi-Drop-Bus (MDB) protocol commonly used in vending machines. 
+        Deployed at a coffee-and-snack machine at <a href="https://www.bfh.ch/ti/de/aktuell/medienmitteilungen/2020/die-technik-von-taler-ueberzeugt/" target="_blank" rel="noopener noreferrer">BFH</a>.
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/gnu-taler-payment-for-woocommerce.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/gnu-taler-payment-for-woocommerce.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-e-commerce-218402.svg') }}" height=60>
         <h3>{{ _("WooCommerce Payment Backend") }}</h3>
       </a>
@@ -229,8 +226,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://github.com/pretix/pretix-taler">
+    <div class="col-lg-4 mb-4">
+      <a href="https://github.com/pretix/pretix-taler" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-tickets-5179896.svg') }}" height=60>
         <h3>{{ _("Pretix Payment Backend") }}</h3>
       </a>
@@ -239,8 +236,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="">
+    <div class="col-lg-4 mb-4">
+      <a href="" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-e-commerce-218402.svg') }}" height=60>
         <h3>{{ _("Payage Payment Plugin") }}</h3>
       </a>
@@ -265,8 +262,8 @@
   </div>
 
   <div class="row">
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/core/index.html">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/core/index.html" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/icon-api.svg') }}" height=60>
         <h3>{{ _("HTTP API")}}</h3>
       </a>
@@ -275,24 +272,13 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://{{ siteconf['docshost'] }}/developers-manual.html">
-        <img src="{{ url('icons/noun-onboarding-2896490.svg') }}" height=60>
-        <h3>{{ _("Onboarding")}}</h3>
-      </a>
-      {% trans %}
-        Description of our taler.net setup and how to contribute.
-      {% endtrans %}
-      {{ gettext('Also available as <a href="%(link)s">PDF</a>.', link="https://" + siteconf['docshost'] + "/pdf/developers-manual.pdf") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="{{ siteconf['docshost'] }}/manpages/taler.conf.5.html#exchange-kyc-provider-options">
+    <div class="col-lg-4 mb-4">
+      <a href="https://{{ siteconf['docshost'] }}/manpages/taler.conf.5.html#exchange-kyc-provider-options" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-kyc-2913646.svg') }}" height=60>
         <h3>{{ _("Know-your-customer")}}</h3>
       </a>
       {% trans %}
-        Documentation on how to configure Know-your-customer (KYC) rules for a Taler exchange.
+        Documentation on how to configure Know-your-customer (KYC) rules for a Taler Exchange.
       {% endtrans %}
     </div>
 
@@ -303,102 +289,6 @@
 
   <div class="row justify-content-center text-center">
     <div class="col-8">
-      <h2>{{ _("Community Interaction")}}</h2>
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row">
-    <div class="col-lg-4">
-      <a href="https://lists.gnu.org/mailman/listinfo/taler">
-        <img src="{{ url('icons/noun-email-list-4339749.svg') }}" height=60>
-        <h3>{{ _("Mailing List")}}</h3>
-      </a>
-      {{ _("The official GNU Taler mailing list.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://web.libera.chat/">
-        <img src="{{ url('icons/noun-chat-5180308.svg') }}" height=60>
-        <h3>{{ _("IRC")}}</h3>
-      </a>
-      {{ _("Our IRC channel is #taler on Libera.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://bugs.taler.net/">
-        <img src="{{ url('icons/noun-bug-tracking-2119186.svg') }}" height=60>
-        <h3>{{ _("Bug Tracker")}}</h3>
-      </a>
-      {{ _("Our bug tracker for bugs and feature request.") }}
-    </div>
-
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row justify-content-center text-center">
-    <div class="col-8">
-      <h2>{{ _("Developer Services")}}</h2>
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row">
-
-    <div class="col-lg-4">
-      <a href="https://git.taler.net">
-        <img src="{{ url('icons/noun-git-2407191.svg') }}" height=60>
-        <h3>{{ _("Git repositories") }}</h3>
-      </a>
-      {{ _("Git repositories for all of GNU Taler.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://lcov.taler.net">
-        <img src="{{ url('icons/icon-lcov.svg') }}" height=60>
-        <h3>{{ _("lcov results") }}</h3>
-      </a>
-      {{ _("Shows results of the code coverage analysis for our test suite.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://buildbot.taler.net">
-        <img src="{{ url('icons/noun-continuous-integration-4368507.svg') }}" height=60>
-        <h3>{{ _("Continuous integration") }}</h3>
-      </a>
-      {{ _("Continuous integration and deployment is managed by our Buildbot.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://weblate.taler.net/">
-        <img src="{{ url('icons/noun-translate-5177522.svg') }}" height=60>
-        <h3>{{ _("Internationalization")}}</h3>
-      </a>
-      {{ _("Using our weblate service, everyone in the community can contribute towards translating the Website and the GNU Taler applications.") }}
-    </div>
-
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/twister/">
-        <img src="{{ url('icons/noun-twister-2280690.svg') }}" height=60>
-        <h3>{{ _("Twister") }}</h3>
-      </a>
-      {% trans %}
-        HTTP modifying man-in-the-middle proxy to test error handling.
-      {% endtrans %}
-    </div>
-  </div>
-
-  <div class="row mt-5">
-  </div>
-
-  <div class="row justify-content-center text-center">
-    <div class="col-8">
       <h2>{{ _("Experimental work")}}</h2>
     </div>
   </div>
@@ -407,16 +297,16 @@
   </div>
 
   <div class="row">
-    <div class="col-lg-4">
-      <a href="https://git.gnunet.org/libbrandt.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.gnunet.org/libbrandt.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-auction-5172639.svg') }}" height=60>
         <h3>{{ _("SMC Auctions") }}</h3>
       </a>
-      {{ _("Secure multiparty aution protocol (future Taler exchange extension).") }}
+      {{ _("Secure multiparty auction protocol (future Taler Exchange extension).") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="/papers/esorics2022-age-restriction.pdf">
+    <div class="col-lg-4 mb-4">
+      <a href="/papers/esorics2022-age-restriction.pdf" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-parental-discretion-233685.svg') }}" height=60>
         <h3>{{ _("Age restrictions")}}</h3>
       </a>
@@ -426,8 +316,8 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="https://git.taler.net/mch2022.git/">
+    <div class="col-lg-4 mb-4">
+      <a href="https://git.taler.net/mch2022.git/" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-id-badge-348401.svg') }}" height=60>
         <h3>{{ _("MCH 2022 Badge Integration") }}</h3>
       </a>
@@ -436,26 +326,21 @@
       {% endtrans %}
     </div>
 
-    <div class="col-lg-4">
-      <a href="">
+    <div class="col-lg-4 mb-4">
+      <a href="" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-point-of-sale-3185628.svg') }}" height=60>
         <h3>{{ _("EMVco Integration") }}</h3>
       </a>
-      {{ _("Integeration with EMVco PoS systems (to be started soon).") }}
+      {{ _("Integration with EMVco PoS systems (to be started soon).") }}
     </div>
 
-    <div class="col-lg-4">
-      <a href="">
+    <div class="col-lg-4 mb-4">
+      <a href="" target="_blank" rel="noopener noreferrer">
         <img src="{{ url('icons/noun-vault-1775866.svg') }}" height=60>
         <h3>{{ _("Taler Vault") }}</h3>
       </a>
       {{ _("Hardware security module for GNU Taler (to be started soon).") }}
     </div>
-
-
-  </div>
-  <div class="row mt-5">
   </div>
-
 </div>
 {% endblock body_content %}
diff --git a/template/features.html.j2 b/template/features.html.j2
index 8fb701cc..c0e9cecc 100644
--- a/template/features.html.j2
+++ b/template/features.html.j2
@@ -83,7 +83,7 @@
           {% endtrans %}
         </p>
         <p>
-          <a href="https://demo.taler.net">
+          <a href="https://demo.taler.net" target="_blank" rel="noopener noreferrer">
             {% trans %}
               Try it yourself with the interactive demo!
             {% endtrans %}
@@ -108,7 +108,7 @@
           {% endtrans %}
         </p>
         <p>
-          <a href="https://docs.taler.net/taler-merchant-api-tutorial.html">
+          <a href="https://docs.taler.net/taler-merchant-api-tutorial.html" target="_blank" rel="noopener noreferrer">
             {% trans %}
               See how merchant integration works in our developer documentation!
             {% endtrans %}
@@ -201,7 +201,7 @@
           be it individuals, organizations or whole countries.  Since the
           reference implementation is a
         {% endtrans %}
-        <a href="https://www.gnu.org/">GNU</a>
+        <a href="https://www.gnu.org/" target="_blank" rel="noopener noreferrer">GNU</a>
         {% trans %}
           package, it will always remain free software.
         {% endtrans %}
diff --git a/template/index.html.j2 b/template/index.html.j2
index f0fc13ac..ab6fd2f7 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -4,12 +4,7 @@
   <div class="container">
 
     <div class="row justify-content-center">
-      <div style="width:40vw;" >
-        <img alt="{{ _("Taler logo") }}" style="width:100%; height: auto; display: block" src="{{ url_static('images/logo-2021.svg') }}">
-      </div>
-    </div>
-
-    <div class="row mt-5">
+    <img alt="{{ _("Taler logo") }}" style="width:40vw; display: block; margin-top: 10px; margin-bottom: 25px" src="{{ url_static('images/logo-2021.svg') }}">
     </div>
 
     <div class="row">
@@ -39,7 +34,7 @@
           </li>
           <li>
             <img class="checkmark" height=18 width=18 alt="checkmark" src="{{ url_static('images/checkmark.png') }}">
-            <a href="https://gnu.org/philosophy/free-sw.html">{{ _("Free Software") }}</a>
+            <a href="https://gnu.org/philosophy/free-sw.html" target="_blank" rel="noopener noreferrer">{{ _("Free Software") }}</a>
           </li>
         </ul>
         <form action="{{ "https://demo.taler.net/" + lang + "/" }}" target="_blank" rel="noopener noreferrer" style="display:inline;"><button type="submit" class="btn btn-primary">{{ _("Try Demo!")}}</button></form>