diff --git a/static/img/bump.png b/static/img/bump.png
new file mode 100644
index 0000000..dd251f2
Binary files /dev/null and b/static/img/bump.png differ
diff --git a/static/img/jenkins.png b/static/img/jenkins.png
new file mode 100644
index 0000000..bb82e3d
Binary files /dev/null and b/static/img/jenkins.png differ
diff --git a/static/img/merged.png b/static/img/merged.png
new file mode 100644
index 0000000..5bdf884
Binary files /dev/null and b/static/img/merged.png differ
diff --git a/static/img/open-pr.png b/static/img/open-pr.png
new file mode 100644
index 0000000..436d9a5
Binary files /dev/null and b/static/img/open-pr.png differ
diff --git a/static/img/stackage.png b/static/img/stackage.png
new file mode 100644
index 0000000..57fa12c
Binary files /dev/null and b/static/img/stackage.png differ
diff --git a/templates/all-snapshots.hamlet b/templates/all-snapshots.hamlet
index 94ff5a8..3ecb800 100644
--- a/templates/all-snapshots.hamlet
+++ b/templates/all-snapshots.hamlet
@@ -1,4 +1,5 @@
 <div .container>
+    <h1>All Snapshots
     <ul>
         $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages
             <li>
diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet
index 80155e9..9d4b4a0 100644
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@@ -16,6 +16,7 @@ $newline never
         <meta name="author" content="">
 
         <meta name="viewport" content="width=device-width,initial-scale=1">
+        <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
 
         ^{pageHead pc}
 
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 5d58aa2..54c1afe 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -1,34 +1,43 @@
-<div .container>
-    <div .navbar role=navigation>
-        <div .navbar-inner>
-            <a .brand href=@{HomeR}>
-                Stackage
-            <ul .nav>
-                <li>
-                    <a href=@{AllSnapshotsR}>
-                        All Snapshots
-                <li>
-                    <a href=@{UploadStackageR}>
-                        Upload
-            <ul .nav .pull-right>
-                $maybe Entity _ user <- muser
-                    <li>
-                        <a href=@{ProfileR}>
-                            <span .user-handle>
-                                #{userHandle user}
-                    <li>
-                        <a href=@{AuthR LogoutR}>Logout
-                $nothing
-                    <li>
-                        <a href=@{AuthR LoginR}>Login
-
-$maybe msg <- mmsg
+<div .wrap>
     <div .container>
-        <div .alert .alter-info>#{msg}
+        <div .navbar role=navigation>
+            <div .navbar-inner>
+                <a .brand href=@{HomeR}>
+                    Stackage
+                <ul .nav>
+                    <li>
+                        <a href=@{AllSnapshotsR}>
+                            All Snapshots
+                    <li>
+                        <a href=@{UploadStackageR}>
+                            Upload
+                <ul .nav .pull-right>
+                    $maybe Entity _ user <- muser
+                        <li>
+                            <a href=@{ProfileR}>
+                                <span .user-handle>
+                                    #{userHandle user}
+                        <li>
+                            <a href=@{AuthR LogoutR}>Logout
+                    $nothing
+                        <li>
+                            <a href=@{AuthR LoginR}>Login
 
-$case cur
-  $of Just (AuthR _)
-      <div .container>
+    $maybe msg <- mmsg
+        <div .container>
+            <div .alert .alter-info>#{msg}
+
+    $case cur
+      $of Just (AuthR _)
+          <div .container>
+              ^{widget}
+      $of _
           ^{widget}
-  $of _
-      ^{widget}
+
+<div .footer>
+  <div .container>
+      <div .row>
+          <div .span12>
+              A service provided by
+              <a href="http://www.fpcomplete.com/">
+                  FP Complete
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index ab58c7d..4479948 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -1,4 +1,64 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+   Global styles
+   */
+
+html {
+  position:relative;
+  min-height:100%;
+}
+
+body {
+  background: #fff;
+  margin:0 0 4em;
+  padding:0;
+  font-family: 'Open Sans';
+}
+
+.wrap {
+  background:#fff;
+  padding-bottom:2em;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+h1 {
+  font-size: 30px;
+  line-height: 40px;
+  font-weight: normal;
+}
+
+h2 {
+  font-size: 25px;
+  margin-top: 15px;
+}
+
+.media-top {
+  margin-top: 20px;
+}
+
+h3 {
+  font-size: 15px;
+}
+
+code {
+  color: #9f1ec0;
+}
+
+a code {
+  color: inherit;
+  background: 0;
+  padding: 0;
+  border: 0;
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+   Navigation
+   */
+
 .navbar {
+  margin-top: 10px;
+  margin-bottom: 0;
   .brand {
     color: #0088cc;
     padding-left: 0;
@@ -22,6 +82,38 @@
   }
 }
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+   Footer
+   */
+
+.footer {
+  border-top: 1px solid #ddd;
+  background-color: #eee;
+  color: #777;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 4em;
+  line-height: 2em;
+
+  .span12 {
+    padding: 0px 15px 0 0;
+    line-height: 4em;
+  }
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+   Responsiveness
+   */
+
+.container {
+  max-width: 724px;
+}
+
+.span12 {
+  width: auto;
+}
+
 @media (max-width: 979px) {
   .navbar-inner {
     padding-left: 0;
@@ -37,7 +129,7 @@
   }
 }
 
-@media (max-width: 480px){
+@media (max-width: 480px) {
   .navbar .brand + .nav {
     float: none;
     display: block;
diff --git a/templates/homepage.hamlet b/templates/homepage.hamlet
index 42394cf..d9d3916 100644
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@@ -1,35 +1,87 @@
 <div .container>
-    <p>
+    <h1>
         Stackage is an infrastructure to create stable builds of complete package sets. Think “stable Hackage”.
-    <h2>Recommended Snapshots
-    <ul .snapshots>
-        $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages
+    <div .recommended-snapshots>
+        <h2>Recommended Snapshots
+        <ul .snapshots>
+            $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages
+                <li>
+                    <a href=@{StackageHomeR ident}>
+                        #{title}
+    <div .how-it-works>
+        <h2>How Stackage Works
+        <div .row .media-top>
+          <div .span12>
+            <div .media>
+              <a .pull-left>
+                <img .media-object src=@{StaticR img_open_pr_png}>
+              <div .media-body>
+                <h4 .media-heading>
+                  Submission
+                <div .media>
+                  A contributor (either an author of a package, or a kind
+                  soul) submits a patch to the Github repository. The pack
+                  will be checked and then be merged in.
+            <div .media>
+              <a .pull-left>
+                <img .media-object src=@{StaticR img_jenkins_png}>
+              <div .media-body>
+                <h4 .media-heading>
+                  Testing
+                <div .media>
+                  The update is sent to a Jenkins build system at
+                  <a href="http://jenkins.stackage.org/">
+                    jenkins.stackage.org
+                  in the cloud. There is a daily build which takes
+                  about 8 hours.
+            <div .media>
+              <a .pull-left>
+                <img .media-object src=@{StaticR img_bump_png}>
+              <div .media-body>
+                <h4 .media-heading>
+                  Notification
+                <div .media>
+                  If a build failure occurs, the submitter is notified
+                   via a Github issue and pinged via their
+                   <code>@name</code>. Also, any authors of packages
+                   which now fail to build will be notified.
+            <div .media>
+              <a .pull-left>
+                <img .media-object src=@{StaticR img_stackage_png}>
+              <div .media-body>
+                <h4 .media-heading>
+                  Snapshot
+                <div .media>
+                  If the build succeeds, a new snapshot is created. The new
+                   snapshot is used by the community.
+    <div .contributing>
+        <h2>Contributing
+        <p>The steps are simple:
+        <ul>
             <li>
-                <a href=@{StackageHomeR ident}>
-                    #{title}
-    <h2>How Stackage Works
-    <p .muted>
-        Explanation here.
-    <h2>Contributing
-
-    <p>The steps are simple:
-
-    <ul>
-        <li>Open the Stackage project on Github.
-        <li>Fork it.
-        <li>Add a line to the Stackage.Config module.
-        <li>Push to your fork.
-        <li>Open a pull request.
-
-    <p> Once you have submitted the pull request, a build will be
-        started. There is a dedicated jenkins server at this location:
-        jenkins.stackage.org From here you can track the progress,
-        status and results of Stackage builds.
-
-    <h2>Stackage for businesses
-
-    <p> We're offering custom installations for businesses who want to
-        build their development platform upon Stackage. If you're
-        considering this for your business and want to find out more,
-        please email us at: <a
-        href="mailto:sales@fpcomplete.com">sales@fpcomplete.com
+                Open the
+                <a href="https://github.com/fpco/stackage">
+                    Stackage project on Github.
+            <li>Fork it.
+            <li>
+                <a href="https://github.com/fpco/stackage#get-your-package-included">
+                    Add a line to the
+                    <code>
+                        Stackage.Config
+                    module.
+            <li>Push to your fork.
+            <li>Open a pull request.
+        <p> Once you have submitted the pull request, a build will be
+            started. There is a dedicated jenkins server at this location:
+            <a href="http://jenkins.stackage.org/">
+                    jenkins.stackage.org.
+            From here you can track the progress, status and results
+            of Stackage builds.
+    <div .businesses>
+        <h2>Stackage for businesses
+        <p> We're offering custom installations for businesses who want to
+            build their development platform upon Stackage. If you're
+            considering this for your business and want to find out more,
+            please email us at:
+            <a href="mailto:sales@fpcomplete.com">
+                sales@fpcomplete.com
diff --git a/templates/homepage.lucius b/templates/homepage.lucius
index 3dd792f..5a9ed96 100644
--- a/templates/homepage.lucius
+++ b/templates/homepage.lucius
@@ -8,3 +8,12 @@
     margin-top: 0.5em;
   }
 }
+
+.how-it-works {
+  .media .pull-left {
+    width: 100px;
+    height: 100px;
+    background: #eee;
+    border: 2px solid #eee;
+  }
+}
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index fad2a12..8b35783 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -1,4 +1,6 @@
 <div .container>
+    <h1>
+        Profile
     <div .row>
         <div .span12>
             <h2>Email addresses
diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet
index 7c94fcc..8d10efa 100644
--- a/templates/stackage-home.hamlet
+++ b/templates/stackage-home.hamlet
@@ -1,8 +1,10 @@
-<hgroup>
-    <h1>#{stackageTitle stackage}
-    <h2>Uploaded by #{userDisplay user} (#{userHandle user}) on #{tshow $ stackageUploaded stackage}
-<p>#{stackageDesc stackage}
-<hr>
-<p>To use, add a line like the following to ~/.cabal/config:
+<div .container>
+    <h1>Hello!
+    <hgroup>
+        <h1>#{stackageTitle stackage}
+        <h2>Uploaded by #{userDisplay user} (#{userHandle user}) on #{tshow $ stackageUploaded stackage}
+    <p>#{stackageDesc stackage}
+    <hr>
+    <p>To use, add a line like the following to ~/.cabal/config:
 
-<pre>remote-repo: stackage:@{StackageHomeR ident}
+    <pre>remote-repo: stackage:@{StackageHomeR ident}
diff --git a/templates/upload-stackage.hamlet b/templates/upload-stackage.hamlet
index 06b49ac..316d9a1 100644
--- a/templates/upload-stackage.hamlet
+++ b/templates/upload-stackage.hamlet
@@ -1,5 +1,8 @@
 <div .container>
-    <form method=post action=@{UploadStackageR}?_method=PUT enctype=multipart/form-data>
-        Stackage file:
-        <input type=file name=#{fileKey}>
-        <button>Upload
+    <h1>Upload Snapshot
+    <div .row>
+        <div .span12>
+            <form method=post action=@{UploadStackageR}?_method=PUT enctype=multipart/form-data>
+                Stackage file:
+                <input type=file name=#{fileKey}>
+                <button>Upload