diff --git a/static/css/matemat.css b/static/css/matemat.css
index 51712eb..489617d 100644
--- a/static/css/matemat.css
+++ b/static/css/matemat.css
@@ -13,8 +13,8 @@ nav div {
 
 .thumblist-item {
     display: inline-block;
-    margin: 5px;
-    padding: 5px;
+    margin: 5px 5px 10px 10px;
+    padding: 15px;
     background: #f0f0f0;
     text-decoration: none;
 }
@@ -331,4 +331,4 @@ aside#overlay > img {
 aside#overlay > div.price {
     padding-top: 30px;
     font-size: 2em;
-}
\ No newline at end of file
+}
diff --git a/templates/base.html b/templates/base.html
index dce01a1..5fbcfb0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -18,12 +18,11 @@
 <header>
     {% block header %}
 
-        {# Always show a link to the home page, either a list of users or of products. #}
-        <nav class="navbarbutton">
-            <div class="selected"><a href="/">Home</a></div>
+        <nav class="navbarbutton">	
         {# Show a link to the settings, if a user logged in via password (authlevel 2). #}
         {% if authlevel|default(0) > 1 %}
             {% if authuser is defined %}
+                <a href="/">Home</a>
                 {# If a user is an admin, call the link "Administration".  Otherwise, call it "Settings". #}
                 {% if authuser.is_admin %}
                     <a href="/admin">Administration</a>
diff --git a/templates/userlist.html b/templates/userlist.html
index 936f2d1..bb7fc28 100644
--- a/templates/userlist.html
+++ b/templates/userlist.html
@@ -22,9 +22,13 @@
 
     <br/>
     {# Link to the password login #}
-    <a href="/login">Password login</a>
+    <div class="thumblist-item">
+	<a href="/login">Password login</a>
+    </div>
     {% if signup %}
-    <a href="/signup">Create account</a>
+    <div class="thumblist-item">
+	<a href="/signup">Create account</a>
+    </div>
     {% endif %}
 
     {{ super() }}