diff --git a/site/boot2docker.md b/site/boot2docker.md
index ac10553b..9835cb48 100644
--- a/site/boot2docker.md
+++ b/site/boot2docker.md
@@ -3,7 +3,7 @@ title: Installing Weave with Boot2Docker
 layout: default
 ---
 
-## Installation with Boot2Docker
+# Installing Weave with Boot2Docker
 
 If you are running Docker inside the Boot2Docker VM, e.g. because you
 are on a Mac, then the following changes are required to the weave
diff --git a/site/building.md b/site/building.md
index 5f344a21..4a4704aa 100644
--- a/site/building.md
+++ b/site/building.md
@@ -3,6 +3,8 @@ title: Building Weave
 layout: default
 ---
 
+# Building Weave
+
 You only need to build weave if you want to work on the weave codebase
 (or you just enjoy building software).
 
diff --git a/site/features.md b/site/features.md
index f829c545..a5058e63 100644
--- a/site/features.md
+++ b/site/features.md
@@ -1,9 +1,9 @@
 ---
-title: Weave features
+title: Weave Features
 layout: default
 ---
 
-# Weave features
+# Weave Features
 
 Weave has a few more features beyond those illustrated by the [basic
 example](https://github.com/weaveworks/weave#example):
diff --git a/site/how-it-works.md b/site/how-it-works.md
index 704f92c2..c707dd6c 100644
--- a/site/how-it-works.md
+++ b/site/how-it-works.md
@@ -1,9 +1,9 @@
 ---
-title: How Weave works
+title: How Weave Works
 layout: default
 ---
 
-## How does it work?
+# How Weave Works
 
  * [Overview](#overview)
  * [Encapsulation](#encapsulation)
diff --git a/site/index.md b/site/index.md
index 57264417..2b23f795 100644
--- a/site/index.md
+++ b/site/index.md
@@ -3,7 +3,7 @@ title: weave, the Docker network
 layout: default
 ---
 
-# weave documentation
+# Weave Documentation
 
  * [Introduction, Installation and Example](https://github.com/weaveworks/weave#readme)
  * [Getting Started Guides](http://weave.works/guides/)
diff --git a/site/proxy.md b/site/proxy.md
index 57914dab..ed1727d1 100644
--- a/site/proxy.md
+++ b/site/proxy.md
@@ -3,7 +3,7 @@ title: Weave Proxy
 layout: default
 ---
 
-# Proxy
+# Weave Proxy
 
 Instead of the `weave` command-line utility, you may prefer to use the
 standard [Docker command-line
diff --git a/site/systemd.md b/site/systemd.md
index 95d4c758..85e8806c 100644
--- a/site/systemd.md
+++ b/site/systemd.md
@@ -1,8 +1,10 @@
 ---
-title: Using Weave with systemd
+title: Using Weave with Systemd
 layout: default
 ---
 
+# Using Weave with Systemd
+
 Having installed `weave` as per [readme][], you might wish to configure the
 init daemon to start it on boot. Most recent Linux distribution releases are
 shipping with [systemd][]. The information below should provide you with some
diff --git a/site/troubleshooting.md b/site/troubleshooting.md
index bc4f1514..bc968e6d 100644
--- a/site/troubleshooting.md
+++ b/site/troubleshooting.md
@@ -3,7 +3,7 @@ title: Troubleshooting Weave
 layout: default
 ---
 
-## Troubleshooting
+# Troubleshooting Weave
 
 Check what version of weave you are running with
 
diff --git a/site/weavedns-design.md b/site/weavedns-design.md
index 5c09afc3..fe70df18 100644
--- a/site/weavedns-design.md
+++ b/site/weavedns-design.md
@@ -1,9 +1,9 @@
 ---
-title: WeaveDNS Design Notes
+title: WeaveDNS (service discovery) Design Notes
 layout: default
 ---
 
-# Weave DNS (service discovery) design
+# WeaveDNS (service discovery) Design Notes
 
 The model is that each host has a service that is notified of
 hostnames and weave addresses for containers on the host. It binds to
diff --git a/site/weavedns.md b/site/weavedns.md
index 8d5f7095..df8e311c 100644
--- a/site/weavedns.md
+++ b/site/weavedns.md
@@ -3,7 +3,7 @@ title: Automatic Discovery with WeaveDNS
 layout: default
 ---
 
-# Weave DNS server
+# Automatic Discovery with WeaveDNS
 
 The Weave DNS server answers name queries in a Weave network. This
 provides a simple way for containers to find each other: just give