diff --git a/_src/_assets/images/photo1.jpg b/_src/_assets/images/photo1.jpg
index 1183e7b..655edae 100644
Binary files a/_src/_assets/images/photo1.jpg and b/_src/_assets/images/photo1.jpg differ
diff --git a/_src/_assets/images/photo1@2x.jpg b/_src/_assets/images/photo1@2x.jpg
new file mode 100644
index 0000000..1183e7b
Binary files /dev/null and b/_src/_assets/images/photo1@2x.jpg differ
diff --git a/_src/_assets/images/photo2.jpg b/_src/_assets/images/photo2.jpg
index e3066a0..b609e5e 100644
Binary files a/_src/_assets/images/photo2.jpg and b/_src/_assets/images/photo2.jpg differ
diff --git a/_src/_assets/images/photo2@2x.jpg b/_src/_assets/images/photo2@2x.jpg
new file mode 100644
index 0000000..e3066a0
Binary files /dev/null and b/_src/_assets/images/photo2@2x.jpg differ
diff --git a/_src/_assets/images/photo3.jpg b/_src/_assets/images/photo3.jpg
new file mode 100644
index 0000000..1fe9980
Binary files /dev/null and b/_src/_assets/images/photo3.jpg differ
diff --git a/_src/_assets/images/photo3@2x.jpg b/_src/_assets/images/photo3@2x.jpg
new file mode 100644
index 0000000..2610828
Binary files /dev/null and b/_src/_assets/images/photo3@2x.jpg differ
diff --git a/_src/_assets/styles/bigchain/_comments.scss b/_src/_assets/styles/bigchain/_comments.scss
index da4262c..8c3b173 100644
--- a/_src/_assets/styles/bigchain/_comments.scss
+++ b/_src/_assets/styles/bigchain/_comments.scss
@@ -8,7 +8,8 @@
     margin-bottom: ($spacer * 2);
 
     .row > h1 {
-        border-bottom: 2px solid $gray-lightest;
+        font-size: $font-size-h2;
+        border-bottom: 1px solid $brand-main-blue-light;
         padding-bottom: $spacer;
         margin-bottom: ($spacer * 2);
         text-align: center;
diff --git a/_src/_assets/styles/bigchain/_sections.scss b/_src/_assets/styles/bigchain/_sections.scss
index a27a103..1b5b2aa 100644
--- a/_src/_assets/styles/bigchain/_sections.scss
+++ b/_src/_assets/styles/bigchain/_sections.scss
@@ -112,6 +112,12 @@
         z-index: 5;
     }
 
+    .section-title {
+        &:after {
+            background: rgba($brand-main-blue-light, .5);
+        }
+    }
+
     .section-title,
     .section-description,
     .header__title {
diff --git a/_src/_assets/styles/page-whitepaper.scss b/_src/_assets/styles/page-whitepaper.scss
index 0c23eea..7e90ae9 100644
--- a/_src/_assets/styles/page-whitepaper.scss
+++ b/_src/_assets/styles/page-whitepaper.scss
@@ -2,12 +2,11 @@
 .page-whitepaper {
     .content--page--markdown {
         > p:nth-child(1),
-        > p:nth-child(2) { text-align: center; }
-    }
-
-    #get-the-whitepaper {
-        + a {
-            @extend .btn, .btn-primary;
-        }
+        > p:nth-child(2),
+        > p:nth-child(3) { text-align: center; }
     }
 }
+
+.section-whitepaper-download {
+    background-image: url('/assets/img/photo3.jpg')
+}
diff --git a/_src/_layouts/page.html b/_src/_layouts/page.html
index 6d702ec..064a09f 100644
--- a/_src/_layouts/page.html
+++ b/_src/_layouts/page.html
@@ -25,6 +25,23 @@ layout: base
 
 </section>
 
+{% if page.title == "Whitepaper" %}
+<section class="section section-whitepaper-download background--photo">
+    <div class="row">
+        <header class="section-header">
+            <h1 class="section-title">{{ page.whitepaper.title }}</h1>
+            <p class="section-description">{{ page.whitepaper.text }}</p>
+        </header>
+
+        <p class="text-center">
+            {% for whitepaper in page.whitepaper.files %}
+                <a href="{{ whitepaper.file }}" class="btn btn-primary btn-sm"><svg class="icon"><use xlink:href="/assets/img/sprite.svg#icon-documents"></use></svg> {{ whitepaper.button }}</a>
+            {% endfor %}
+        </p>
+    </div>
+</section>
+{% endif %}
+
 {% if page.comments %}
     <footer class="comments">
         <div class="row">
diff --git a/_src/whitepaper.md b/_src/whitepaper/index.md
similarity index 86%
rename from _src/whitepaper.md
rename to _src/whitepaper/index.md
index 78de37a..99db2a2 100644
--- a/_src/whitepaper.md
+++ b/_src/whitepaper/index.md
@@ -1,17 +1,28 @@
 ---
 layout: page
 
-title: 'BigchainDB: A Scalable Blockchain Database'
+title: Whitepaper
 description: 'This paper describes BigchainDB. BigchainDB fills a gap in the decentralization ecosystem: a decentralized database, at scale. It is capable of 1 million writes per second throughput, storing petabytes of data, and sub-second latency.'
 
+whitepaper:
+    title: Full Whitepaper
+    text: Download the full whitepaper in various formats.
+    files:
+        - file: bigchaindb-whitepaper.pdf
+          button: Get PDF
+        - file: bigchaindb-whitepaper.epub
+          button: Get ePub
+
 comments: true
 ---
 
+## BigchainDB: A Scalable Blockchain Database
+
 *by <br>Trent McConaghy, Rodolphe Marques, Andreas Müller, Dimitri De Jonghe, Troy McConaghy, Greg McMullen*
 
 *February 8, 2016*
 
-## Abstract
+### Abstract
 
 This paper describes BigchainDB. BigchainDB fills a gap in the decentralization ecosystem: a decentralized database, at scale. It is capable of 1 million writes per second throughput, storing petabytes of data, and sub-second latency.
 
@@ -20,7 +31,3 @@ The BigchainDB design starts with a distributed database (DB), and through a set
 Scalable capacity means that legally binding contracts and certificates may be stored directly on the blockchain database. The permissioning system enables configurations ranging from private enterprise blockchain databases to open, public blockchain databases. BigchainDB is complementary to decentralized processing platforms like Ethereum, and de-centralized file systems like InterPlanetary File System (IPFS).
 
 This paper describes technology perspectives that led to the BigchainDB design: traditional blockchains, distributed databases, and a case study of the domain name system (DNS). We introduce a concept called blockchain pipelining, which is key to scalability when adding blockchainlike characteristics to the distributed DB. We present a thorough description of BigchainDB, a detailed analysis of latency, and experimental results. The paper concludes with a description of use cases.
-
-## Get The Full Whitepaper
-
-[BigchainDB Whitepaper (PDF)]()