diff --git a/content/common/kwant.css b/content/common/kwant.css
index 41b065c2d0f26ea0b4215b34f1c78f1150f92bd1..72b77c53054cd1ea1a9465ff2e4232b1c2dc4d03 100644
--- a/content/common/kwant.css
+++ b/content/common/kwant.css
@@ -6,12 +6,12 @@ Style sheet for http://kwant-project.org/
 
 body {
     min-width: 20em;
-    max-width: 50em;
+    max-width: 60em;
     margin: 0 auto;
     font-family: "Bitstream Vera Serif",  Georgia, serif;
 }
 
-#header { margin-top: 0.5em; height: 1.5em; }
+#header { margin-top: 0.5em; height: 150px; }
 #footer { margin: 2em 0; }
 #header, #header a:link, #header a:visited, #footer {
     color: gray;
diff --git a/content/kwant_logo.png b/content/common/kwant_logo.png
similarity index 100%
rename from content/kwant_logo.png
rename to content/common/kwant_logo.png
diff --git a/content/contact.txt b/content/contact.txt
index 046e07dd1d6899d33d2219bed1d0c82b921a8ef9..1765b73d3dc2100f3ce919f60d73bff741ca9912 100644
--- a/content/contact.txt
+++ b/content/contact.txt
@@ -2,4 +2,4 @@ Contact
 =======
 
 If you have any questions regarding, kwant, or find a bug, please email to
-kwant-authors@kwant-project.org.
+authors@kwant-project.org.
diff --git a/content/downloads.txt b/content/download.txt
similarity index 100%
rename from content/downloads.txt
rename to content/download.txt
diff --git a/content/gallery/index.txt b/content/gallery/index.txt
deleted file mode 100644
index af120847aaf94147f2df3f296daa2a36284b66c5..0000000000000000000000000000000000000000
--- a/content/gallery/index.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Gallery
-=======
-
-docutils 0.9 knows how to do syntax highlighting.  With docutils 0.8 there seems
-to be no way.  But we can do this::
-
-    import math
-    import cmath
-    import numpy
-    from matplotlib import pyplot
-
-    import kwant
-    from kwant.contrib.digest import gauss
-
-    def hopping(site0, site1, phi):
-        x0, y0 = site0.pos
-        x1, y1 = site1.pos
-        return -cmath.exp(-0.5j * phi * (x0 - x1) * (y0 + y1))
-
-    def onsite(site, phi):
-        return 0.05 * gauss(repr(site)) + 4
-    def make_system(L=50):
-        def central_region(pos):
-            x, y = pos
-            return -L < x < L and \
-                abs(y) < L - 37.5 * math.exp(-x**2 / 12**2)
-
-        lat = kwant.lattice.square()
-        sys = kwant.Builder()
-        sys[lat.shape(central_region, (0, 0))] = onsite
-        sys[lat.nearest] = hopping
-
-        sym = kwant.TranslationalSymmetry((-1, 0))
-        lead = kwant.Builder(sym)
-        lead[(lat(0, y) for y in range(-L + 1, L))] = 4
-        lead[lat.nearest] = hopping
-
-        sys.attach_lead(lead)
-        sys.attach_lead(lead.reversed())
-
-        return sys.finalized()
-
-    def lesser_gf(sys, args):
-        wf = kwant.solvers.default.wave_function(sys, 0.15, args=args)
-        return (abs(wf(0))**2).sum(axis=0)
-
-    sys = make_system()
-    kwant.plotter.map(sys, lesser_gf(sys, args=[1/40.0]))
diff --git a/content/index.txt b/content/index.txt
index a4e1a66327eb156bfae560816a64358e982fdbad..9fc32ba860058ed79f2c4946b33d3dd025c6b33b 100644
--- a/content/index.txt
+++ b/content/index.txt
@@ -1,9 +1,6 @@
 ---
 __template__: home.mako
 ---
-
-.. image:: kwant_logo.png
-
 Numerics of tight binding models made easy
 ==========================================
 
@@ -17,6 +14,7 @@ carefully tested.
 
 .. image:: collage.png
    :scale: 30%
+   :target: collage.png
 
 Image: various applications of kwant:
 
diff --git a/templates/base.mako b/templates/base.mako
index 10039ee46053017984103741dad0f48525d97add..bb774938ebd03428b6eaa2d6b6ac327b8ac7457b 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -10,18 +10,19 @@
 <%block name="extra_head" />\
 </head>
 
-<div id="header" class="meta">
 <body>
+<div id="header" class="meta">
+<img alt="kwant_logo.png" src="/common/kwant_logo.png" />
 <h3 class="hidden_structure">Navigation</h3>
 <ul class="navigation">
   <li><a href="/">home</a></li>
-  <li><a href="/gallery/">gallery</a></li>
   <li><a href="/docs/">documentation</a></li>
-  <li><a href="/downloads.html">downloads</a></li>
-  <li><a href="/community.html">community</a></li>
+  <li><a href="/download.html">download</a></li>
+  <li><a href="/contact.html">contact</a></li>
   <li><a href="/citing.html">citing</a></li>
 </ul>
 </div>
+<br />
 
 ${next.body()}\
 <%block name="tail"></%block>\