diff --git a/config.yaml b/config.yaml
index b7431e0a5e77d1b1a00739557d258421026c6f1a..27413fe94e0aaadc053b3207b6554886f98ff78f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -6,6 +6,9 @@ theme: briar
 Params:
   flatterid: 4pq200
 
+Author:
+  name: Briar Team
+
 permalinks:
   #post:  /:section/:year/:month/:title/
   page: /:slug/
@@ -33,7 +36,7 @@ menu:
   - identifier: about
     name: About
     title: About
-    url: /about/
+    url: /about-us/
     weight: -80
 
   - identifier: getinvolved
diff --git a/content/_index.md b/content/_index.md
index 754000ee1eb4e6ce9266270d63c4d81ab13cdbf4..074abb8e38ed120f4f8693918d63c6fa3b702c19 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -11,8 +11,10 @@ title: Secure messaging, anywhere
    <li>Free and open source software</li>
   </ul>
 
-  <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.android" rel="noopener noreferrer" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"></a>
-  <a href="/fdroid"><img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"></a>
+{{< googleplay url="https://play.google.com/store/apps/details?id=org.briarproject.briar.android" >}}
+
+{{< fdroid  url="/fdroid" >}}
+
 </div> <!-- intro -->
 
 <div id="phone">
diff --git a/content/hiring/2018-05-java-developer.md b/content/hiring/2018-05-java-developer.md
index eaf3a611bb0fa7308228d0ea81bec33533830482..db980f9f919654b1fb3c644576d1c2f0dc90c701 100644
--- a/content/hiring/2018-05-java-developer.md
+++ b/content/hiring/2018-05-java-developer.md
@@ -3,9 +3,6 @@ title: Java Developer
 date: 2018-05-01T00:00:00+01:00
 ---
 
-Java Developer
---------------
-
 Sorry, this position is no longer available. If you'd like to hear about
 future vacancies, please email <contact@briarproject.org> \[[PGP
 key](/keys/contact.asc)\].
diff --git a/content/hiring/2018-05-usability-consultant.md b/content/hiring/2018-05-usability-consultant.md
index 96c646f053f5d0aa21f0ae37b6b50152e13a6551..9fb25b13324929c78d652bf4332828256663e9df 100644
--- a/content/hiring/2018-05-usability-consultant.md
+++ b/content/hiring/2018-05-usability-consultant.md
@@ -3,9 +3,6 @@ date: 2018-05-01T00:00:00+02:00
 title: Usability Consultant
 ---
 
-Usability Consultant
---------------------
-
 Sorry, this position is no longer available. If you'd like to hear about
 future vacancies, please email <contact@briarproject.org> \[[PGP
 key](/keys/contact.asc)\].
diff --git a/content/hiring/2018-05-ux-designer.md b/content/hiring/2018-05-ux-designer.md
index 49ff85ae0fbea921bfd92705ba24018edb5f3635..aa090b2ddc678ff062deb3923e862e4c56c487c0 100644
--- a/content/hiring/2018-05-ux-designer.md
+++ b/content/hiring/2018-05-ux-designer.md
@@ -3,9 +3,6 @@ date: 2018-05-01T00:00:00+01:00
 title: UX Designer
 ---
 
-UX Designer
------------
-
 Sorry, this position is no longer available. If you'd like to hear about
 future vacancies, please email <contact@briarproject.org> \[[PGP
 key](/keys/contact.asc)\].
diff --git a/content/news/2017-beta-released-security-audit.md b/content/news/2017-beta-released-security-audit.md
index 9c9c8b2ba61e9f14eb2f51004f6c9b3ab59ac268..283a7884b86c0c704794640e8a7f1796c406f5ee 100644
--- a/content/news/2017-beta-released-security-audit.md
+++ b/content/news/2017-beta-released-security-audit.md
@@ -8,9 +8,6 @@ title: 'Briar - Darknet Messenger Releases Beta, Passes Security Audit'
 Press Release
 -------------
 
-Darknet Messenger Releases Beta, Passes Security Audit
-------------------------------------------------------
-
 ##### July 21 2017
 
 After extensive private beta tests, the first public beta of Briar was
diff --git a/content/news/2018-1.0-released-new-funding.md b/content/news/2018-1.0-released-new-funding.md
index 6e3a43e5e0d46237b7da3852c30280ba82fc5366..e926b5a41052c1546f696c88f8f63a388f761c63 100644
--- a/content/news/2018-1.0-released-new-funding.md
+++ b/content/news/2018-1.0-released-new-funding.md
@@ -7,9 +7,6 @@ title: 'Briar - Secure P2P Messenger Releases First Version, Receives New Fundin
 
 ### Press Release
 
-Secure P2P Messenger Releases First Version, Receives New Funding
------------------------------------------------------------------
-
 ##### May 9 2018
 
 The peer-to-peer messenger Briar released its first stable version
diff --git a/content/news/2018-briar-1.1-released.md b/content/news/2018-briar-1.1-released.md
index 25f1c7f1acf24ab62c90210dbcd3234521fc99af..8cef8982b3cd35632ddbed7a9ec18bf51f960917 100644
--- a/content/news/2018-briar-1.1-released.md
+++ b/content/news/2018-briar-1.1-released.md
@@ -7,9 +7,6 @@ title: 'Briar 1.1 released with dark theme, new emoji and more'
 
 ### Press Release
 
-Briar 1.1 released with dark theme, new emoji and more
-------------------------------------------------------
-
 ##### September 14 2018
 
 The Briar Project released version 1.1 of its Android app today. This
diff --git a/content/page/about.md b/content/page/about.md
index c54ca19584458a359150e5d4d86e9b683b63a259..ea883a9d6d7c3175f0385fa0c1c75488bd86c742 100644
--- a/content/page/about.md
+++ b/content/page/about.md
@@ -1,11 +1,10 @@
 ---
 aliases:
 - /about.html
-title: About
+- /about
+title: About Us
 ---
 
-# About Us
-
 **Michael Rogers** started the Briar project to support freedom of
 expression, freedom of association and the right to privacy. He has
 studied and built peer-to-peer systems for over a decade and contributed
diff --git a/content/page/apk.md b/content/page/apk.md
index 47512e7dd4cc82a74d838d21ef860fa5f90ff13a..66fcce147cad556f0293ef70e4e5e4630c0e4f2c 100644
--- a/content/page/apk.md
+++ b/content/page/apk.md
@@ -1,12 +1,10 @@
 ---
 aliases:
+- /apk
 - /apk.html
 title: Installing Briar via Direct Download
 ---
 
-Installing Briar via Direct Download
-------------------------------------
-
 1\) Open the **Settings** app, scroll down, and open the **Security**
 section.
 
diff --git a/content/page/building.md b/content/page/building.md
index 75f63c6b62a27f05795a3fa7ef9ada85ed18caeb..ff805f9b024fa8bd5adfd2b8316de72fdba6888b 100644
--- a/content/page/building.md
+++ b/content/page/building.md
@@ -5,9 +5,6 @@ aliases:
 title: Building the Source Code
 ---
 
-Building the Source Code
-------------------------
-
 1\) Download and install [Android
 Studio](http://developer.android.com/sdk/index.html).
 
@@ -15,28 +12,35 @@ Studio](http://developer.android.com/sdk/index.html).
 Control**.
 
 ![](/img/building/01.png)
+
 3\) Select **Git** from the popup menu.
 
 ![](/img/building/02.png)
+
 4\) Enter **https://code.briarproject.org/briar/briar.git** as the **Git
 Repository URL**, then click **Clone**.
 
 ![](/img/building/03.png)
+
 5\) When the source code has downloaded, click **Yes** to open the
 project.
 
 ![](/img/building/04.png)
+
 6\) Click **OK** to accept the default settings.
 
 ![](/img/building/05.png)
+
 7\) If Android Studio asks you about an **Unregistered VCS root**, click
 **Add root**. This will allow you to update the source code later
 without repeating the previous steps.
 
 ![](/img/building/06.png)
+
 8\) Select **Build &gt; Build APK** from the Android Studio menu.
 
 ![](/img/building/13.png)
+
 9\) When the build process finishes, click **Show in File Manager** to
 open the folder containing the APK file, **briar-android-debug.apk**.
 You can
@@ -44,14 +48,17 @@ You can
 this file onto any Android device.
 
 ![](/img/building/11.png)
+
 10\) Briar is under constant development, so you should check for updates
 regularly. To get the latest version of the source code, click the
 **Update Project** button on the Android Studio toolbar.
 
 ![](/img/building/09.png)
+
 11\) Click **OK** to accept the default settings.
 
 ![](/img/building/10.png)
+
 12\) Repeat steps 8 and 9 to build and install the updated app.
 
 If you're interested in getting involved or following the progress of
diff --git a/content/page/copyright.md b/content/page/copyright.md
index 20a85a58c442fdf8a701d8ec5bde37577f91970b..f6bd2a950f637a791678156d7c6cea9bc402f762 100644
--- a/content/page/copyright.md
+++ b/content/page/copyright.md
@@ -4,9 +4,6 @@ aliases:
 title: Copyright
 ---
 
-Copyright
----------
-
 Briar is free software. You can redistribute it and modify it under the
 terms of the [GNU General Public
 License](https://gnu.org/licenses/gpl.txt).
diff --git a/content/page/fdroid.md b/content/page/fdroid.md
index 2950dabee2eb6f0b83ddaa01f018fd890b293e00..d01b602ca686d1a8cfde879c672b6b91990df852 100644
--- a/content/page/fdroid.md
+++ b/content/page/fdroid.md
@@ -5,9 +5,6 @@ aliases:
 title: Installing Briar via F-Droid
 ---
 
-Installing Briar via F-Droid
-----------------------------
-
 1\) Install the [F-Droid app](https://f-droid.org/).
 
 2\) Open [this
diff --git a/content/page/get-involved.md b/content/page/get-involved.md
index 39b7f70b89b46970db801569a2e2ebbcf0a705cf..a4598490dba1f5fad4650c26eaefa283bdeabf08 100644
--- a/content/page/get-involved.md
+++ b/content/page/get-involved.md
@@ -4,8 +4,6 @@ aliases:
 title: Get Involved
 ---
 
-# Get Involved
-
 We're looking for volunteers to contribute to all aspects of the
 project, including design, development, documentation, translation and
 testing. We're happy to provide guidance or mentoring for less
diff --git a/content/page/hiring.md b/content/page/hiring.md
index 06aeb100deeba97314561503b73a542a5e177fff..bd252c185a1635a6936a5eb596b1cc29435cfd4e 100644
--- a/content/page/hiring.md
+++ b/content/page/hiring.md
@@ -4,9 +4,6 @@ aliases:
 title: Sorry, We're Not Currently Hiring
 ---
 
-Sorry, We're Not Currently Hiring
----------------------------------
-
 We don't currently have any paid positions available. If you'd like to
 hear about future vacancies, please email <contact@briarproject.org>
 \[[PGP key](/keys/contact.asc)\].
diff --git a/content/page/how-it-works.md b/content/page/how-it-works.md
index 5ce4f6fa7cdfd993087d3070eef86b990b7f32fd..6e9ef3f8996895b27f0a206b2b2ae7cfd53b03b5 100644
--- a/content/page/how-it-works.md
+++ b/content/page/how-it-works.md
@@ -4,8 +4,6 @@ aliases:
 title: How it works
 ---
 
-# How It Works
-
 Briar is a messaging app designed for activists, journalists, and anyone
 else who needs a safe, easy and robust way to communicate. Unlike
 traditional messaging apps, Briar doesn't rely on a central server -
diff --git a/content/page/privacy.md b/content/page/privacy.md
index d397a008475c5830433d11b42407bf91c8d6a632..09ac88faa24ce290620e48621fae5162544e2e69 100644
--- a/content/page/privacy.md
+++ b/content/page/privacy.md
@@ -5,9 +5,6 @@ aliases:
 title: Privacy Policy
 ---
 
-Privacy Policy
---------------
-
 We do not have access to the content or metadata of your communications
 via the Briar app. We will not modify the Briar app to enable us or
 anyone else to access that content or metadata.
diff --git a/themes/briar/layouts/_default/single.html b/themes/briar/layouts/_default/single.html
index 18bbb26fe183284923a76cd0316b8f5d3c25f3fc..1271be3f92284e9375f35b0b17b7ee6499edda3d 100644
--- a/themes/briar/layouts/_default/single.html
+++ b/themes/briar/layouts/_default/single.html
@@ -1,6 +1,7 @@
 {{ define "main" }}
  <div id="container">
       <div id="content">
+      <h2>{{ .Title }}</h2>
       {{ .Content }}
       </div> <!-- content -->
     </div> <!-- container -->
diff --git a/themes/briar/layouts/shortcodes/fdroid.html b/themes/briar/layouts/shortcodes/fdroid.html
new file mode 100644
index 0000000000000000000000000000000000000000..63298bd74ec62291d08dc7d2efe2465d810f895c
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/fdroid.html
@@ -0,0 +1,2 @@
+<a href="{{.Get "url" }}">
+<img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"></a>
diff --git a/themes/briar/layouts/shortcodes/googleplay.html b/themes/briar/layouts/shortcodes/googleplay.html
new file mode 100644
index 0000000000000000000000000000000000000000..d9807be123274de5def4fbcf89f8a750aca733ff
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/googleplay.html
@@ -0,0 +1,3 @@
+<a href="{{.Get "url" }}" rel="noopener noreferrer" target="_blank">
+<img id="playbutton" src="/img/google_play_badge_web_generic.png"
+alt="Get it on Google Play" border="0"></a>