diff --git a/static/css/style.css b/static/css/style.css
index 2faed59..e18fd6c 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -87,7 +87,7 @@ div#captcha > div {
 
 header{
     color: #1c619a;
-    padding: 1em 6em;
+    padding: 2em 8em;
 }
 header .inner {
     display: flex;
@@ -206,7 +206,7 @@ header .site-menu a{
 
 @media screen and (max-width: 64em) {
     header {
-        padding: 0.6em 1em;
+        padding: 1em 2em;
     }
     header nav {
         margin-left: 3em;
@@ -292,9 +292,6 @@ header .site-menu a{
 }
 
 .content h2 {
-    font-size: 1.5em;
-    font-weight: normal;
-
     font-weight: 400;
     text-align: center;
     font-family: 'Arvo', serif;
@@ -310,6 +307,7 @@ header .site-menu a{
 .flex-page {
     display: flex;
     margin: 0 auto 0 auto;
+    align-items: flex-start;
 }
 .flex-page .left-menu {
     display: block;
@@ -624,9 +622,9 @@ ul.errorlist {
 .homepage h2 {
     text-align: center;
     font-family: 'Open Sans', sans-serif;
-    font-size: 2.3em;
+    font-size: 2.5em;
     font-weight: bold;
-    margin: 3em 0.5em;
+    margin: 2.75em 0.5em;
 
     -webkit-text-fill-color: #D99C7E;
     -webkit-text-stroke-width: 1px;
@@ -660,7 +658,7 @@ ul.errorlist {
 .homepage h3 {
     font-family: 'Arvo', serif;
     font-weight: normal;
-    font-size: 1.2em;
+    font-size: 1.3em;
 }
 .homepage ul {
     list-style-type: circle;
@@ -702,6 +700,9 @@ ul.errorlist {
 }
 
 @media screen and (max-width: 48em) {
+    .homepage h2 {
+        font-size: 2.3em;
+    }
     .homepage .title h3, .homepage .inner {
         width: 90%;
     }
@@ -760,7 +761,6 @@ a.home-signup-button {
 }
 .account-status table td {
     padding: 0.5em 1em;
-    width: 50%;
 }
 .account-status table td:first-child {
     border-right: 1px solid #ddd;
@@ -904,13 +904,13 @@ a.home-signup-button {
 /***************************************************/
 /********************* Gateways                    */
 
-#gateways table {
+table.flat-table {
     width: 100%;
 }
-#gateways td {
+.flat-table td {
     padding: 10px;
 }
-#gateways table thead td {
+.flat-table thead td {
     text-align: center;
     font-size: 1.1em;
     border: 1px solid #bbb;
@@ -918,37 +918,37 @@ a.home-signup-button {
     color: #1c619a;
     background: #ddd;
 }
-#gateways table thead tr td:first-child {
+.flat-table thead tr td:first-child {
     border-left: 0;
 }
-#gateways table thead tr td:last-child {
+.flat-table thead tr td:last-child {
     border-right: 0;
 }
-#gateways table tbody tr td:first-child {
+.flat-table tbody tr td:first-child {
     border-left: 0;
 }
-#gateways table tbody tr td {
+.flat-table tbody tr td {
     border: 1px solid #bbb;
 }
-#gateways table tbody tr td:first-child {
+.flat-table tbody tr td:first-child {
     border-left: 0;
 }
-#gateways table tbody tr td:last-child {
+.flat-table tbody tr td:last-child {
     border-right: 0;
 }
-#gateways table tbody tr:last-child td {
+.flat-table tbody tr:last-child td {
     border-bottom: 0;
 }
-#gateways table tbody tr:nth-child(even) {
+.flat-table tbody tr:nth-child(even) {
     background: #eee;
 }
-#gateways .host_name {
+.flat-table .host_name {
     font-family: monospace;
 }
-#gateways td {
+.flat-table td {
     white-space: nowrap;
 }
-#gateways .right {
+.flat-table .right {
     text-align: right;
 }
 
diff --git a/templates/account_layout.html b/templates/account_layout.html
index f4a057f..b6870af 100644
--- a/templates/account_layout.html
+++ b/templates/account_layout.html
@@ -21,12 +21,10 @@
                     <i class="fa fa-download fa-fw" aria-hidden="true"></i>&nbsp;
                     {% trans 'OpenVPN' %}
                 </a></li>
-                {% if config.WIREGUARD %}
                 <li><a href="/account/wireguard">
                     <i class="icon icon-wireguard fa-fw" aria-hidden="true"></i>&nbsp;
                     {% trans 'WireGuard' %}
                 </a></li>
-                {% endif %}
                 <li><a href="/payments">
                     <i class="fa fa-credit-card fa-fw" aria-hidden="true"></i>&nbsp;
                     {% trans 'Payments' %}
@@ -39,8 +37,10 @@
         </div>
     </div>
     {% block account_content_outer %}
-    <div class="content-box">
+    <div class="flex-page-content">
+        <div class="content-box">
         {% block account_content %}{% endblock %}
+        </div>
     </div>
     {% endblock %}
 </div>
diff --git a/templates/ccvpn/index.html b/templates/ccvpn/index.html
index fd80972..4124a81 100644
--- a/templates/ccvpn/index.html
+++ b/templates/ccvpn/index.html
@@ -15,10 +15,15 @@
             <h3>{% trans 'Hide your IP Address' %}</h3>
         </div>
         <div class="inner">
-            <p>
+            <p>‣ 
                 {% blocktrans trimmed %}
-                From corporations and attackers tracking you for advertising, marketing, geo-blocking, extortion, ...
-                and irresponsibly storing personal data that can leak to malicious parties and be used against you.
+                From sites and corporations tracking you for advertising, marketing, geo-blocking, ...
+                and sometimes leaking the data or ignoring regulations.
+                {% endblocktrans %}
+            </p>
+            <p>‣ 
+                {% blocktrans trimmed %}
+                From attackers collecting leaked data or harvesting IP addresses on P2P networks to stalk or extort you.
                 {% endblocktrans %}
             </p>
         </div>
diff --git a/templates/lambdainst/config.html b/templates/lambdainst/config.html
index 8803b12..b2796c7 100644
--- a/templates/lambdainst/config.html
+++ b/templates/lambdainst/config.html
@@ -4,65 +4,60 @@
 
 {% block pagetitle %}{% trans 'OpenVPN Configuration' %}{% endblock %}
 {% block account_content %}
-<div>
-    <form action="/account/config_dl" method="get" class="pure-form pure-form-aligned">
-        <fieldset>
-            <div class="pure-control-group">
-                <label for="p_os">{% trans 'OS' %}</label>
-                <select name="platform" id="p_os" class="pure-input-1-2">
-                    {% for k, v in config_os %}
-                        <option value="{{k}}">{{v}}</option>
-                    {% endfor %}
-                </select>
-            </div>
-
-            <div class="pure-control-group">
-                <label for="p_gw">{% trans 'Gateway' %}</label>
-                <select name="gateway" id="p_gw" class="pure-input-1-2">
-                    <option value="" selected>{% trans 'Random' %}</option>
-                    <option value="all">{% trans 'All (multiple config files)' %}</option>
-                    {% for c in config_countries %}
-                        <option value="cc_{{c.country_code}}">
-                            {% trans 'Country' %}: {{c.country_name}}
-                            {% if c.message %}
-                            [ {{ c.message }} ]
-                            {% endif %}
-                        </option>
-                    {% endfor %}
-                </select>
-            </div>
-
-            <div class="pure-control-group">
-                <label for="p_proto">{% trans 'Protocol' %}</label>
-                <select name="protocol" id="p_proto" class="pure-input-1-2">
-                    {% for k, v in config_protocols %}
-                        <option value="{{k}}">{{v}}</option>
-                    {% endfor %}
-                </select>
-                <p class="inputinfo">{% trans 'TCP is slower. Use it only if you have important packet loss or if UDP is filtered.' %}</p>
-            </div>
-
-            <div class="pure-control-group">
-                <label for="p_proxy">{% trans 'Use HTTP Proxy?' %}</label>
-                <input type="text" name="http_proxy" id="p_proxy"
-                       placeholder="{% trans "Leave empty if you don't know." %}"
-                       class="pure-input-1-2" />
-                <p class="inputinfo">{% trans 'Requires TCP.' %}</p>
-            </div>
-
-            <div class="pure-controls">
-                <label for="p_ipv6" class="pure-checkbox">
-                    <input type="checkbox" name="enable_ipv6" id="p_ipv6" checked />
-                    {% trans 'Enable IPv6?' %}
-                </label>
-                
-                <input type="submit" class="pure-button pure-button-primary"
-                       value="{% trans 'Download config' %}" />
-            </div>
-        </fieldset>
-    </form>
-</div>
-
+<form action="/account/config_dl" method="get" class="pure-form pure-form-aligned">
+    <fieldset>
+        <div class="pure-control-group">
+            <label for="p_os">{% trans 'OS' %}</label>
+            <select name="platform" id="p_os" class="pure-input-1-2">
+                {% for k, v in config_os %}
+                    <option value="{{k}}">{{v}}</option>
+                {% endfor %}
+            </select>
+        </div>
+
+        <div class="pure-control-group">
+            <label for="p_gw">{% trans 'Gateway' %}</label>
+            <select name="gateway" id="p_gw" class="pure-input-1-2">
+                <option value="" selected>{% trans 'Random' %}</option>
+                <option value="all">{% trans 'All (multiple config files)' %}</option>
+                {% for c in config_countries %}
+                    <option value="cc_{{c.country_code}}">
+                        {% trans 'Country' %}: {{c.country_name}}
+                        {% if c.message %}
+                        [ {{ c.message }} ]
+                        {% endif %}
+                    </option>
+                {% endfor %}
+            </select>
+        </div>
+
+        <div class="pure-control-group">
+            <label for="p_proto">{% trans 'Protocol' %}</label>
+            <select name="protocol" id="p_proto" class="pure-input-1-2">
+                {% for k, v in config_protocols %}
+                    <option value="{{k}}">{{v}}</option>
+                {% endfor %}
+            </select>
+            <p class="inputinfo">{% trans 'TCP is slower. Use it only if you have important packet loss or if UDP is filtered.' %}</p>
+        </div>
+
+        <div class="pure-control-group">
+            <label for="p_proxy">{% trans 'Use HTTP Proxy?' %}</label>
+            <input type="text" name="http_proxy" id="p_proxy"
+                    placeholder="{% trans "Leave empty if you don't know." %}"
+                    class="pure-input-1-2" />
+            <p class="inputinfo">{% trans 'Requires TCP.' %}</p>
+        </div>
+
+        <div class="pure-controls">
+            <label for="p_ipv6" class="pure-checkbox">
+                <input type="checkbox" name="enable_ipv6" id="p_ipv6" checked />
+                {% trans 'Enable IPv6?' %}
+            </label>
+            
+            <input type="submit" class="pure-button pure-button-primary"
+                    value="{% trans 'Download config' %}" />
+        </div>
+    </fieldset>
+</form>
 {% endblock %}
-
-
diff --git a/templates/lambdainst/status.html b/templates/lambdainst/status.html
index 20c638f..54e7ba3 100644
--- a/templates/lambdainst/status.html
+++ b/templates/lambdainst/status.html
@@ -8,7 +8,7 @@
 <div class="pure-u-1 pure-u-xl-2-3" id="gateways">
     <h2>{% trans 'Our Servers' %}</h2>
 
-    <table>
+    <table class="flat-table">
         <thead>
             <tr><td>{% trans 'Location' %}</td>
                 <td>{% trans 'Hostname' %}</td>
diff --git a/templates/payments/payments.html b/templates/payments/payments.html
index 146b7be..25e1b79 100644
--- a/templates/payments/payments.html
+++ b/templates/payments/payments.html
@@ -3,8 +3,8 @@
 {% load static %}
 
 {% block pagetitle %}{% trans 'Payments' %}{% endblock %}
-{% block account_content %}
-<table class="admin-list">
+{% block account_content_outer %}
+<table class="flat-table">
     <thead>
         <tr>
             <td>{% trans 'Date' %}</td>
@@ -15,7 +15,7 @@
     <tbody>
         {% for payment in payments %}
             <tr>
-                <td>{{ payment.created }}</td>
+                <td>{{ payment.created|date:'Y-m-d H:i' }}</td>
                 <td>{{ payment.time }}
                     ({{ payment.get_amount_display }})
                 </td>