diff --git a/Makefile b/Makefile
index 501d0d93a..3b2b3d95f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,11 @@
 PORT ?= 3000
+bundle := env BUNDLE_GEMFILE=./_/Gemfile bundle
 
-start:
-	env BUNDLE_GEMFILE=./_/Gemfile bundle exec jekyll serve --drafts --watch --port ${PORT}
+start: bundle
+	${bundle} exec jekyll serve --safe --drafts --watch --port ${PORT}
+
+build: bundle
+	${bundle} exec jekyll build --safe
+
+bundle:
+	${bundle}
diff --git a/_/layouts/default.html b/_/layouts/default.html
index 36d5ab86c..3a2d41110 100644
--- a/_/layouts/default.html
+++ b/_/layouts/default.html
@@ -1,18 +1,17 @@
+---
+---
 {% include head.html %}
+{% include site-header.html %}
 
-<div class='blog-header'>
-  <div>
-    <h1><a href="/">{{ site.meta.name }}</a></h1>
-  </div>
-</div>
+<div class='post-list -single -cheatsheet'>
+  <div class='post-item'>
+    <div class='post-headline -cheatsheet'>
+      <h1>{{ page.title }}</h1>
+    </div>
 
-<div class='article-item -cheatsheet'>
-  <div class='article-headline -cheatsheet'>
-    <h1>{{ page.title }}</h1>
-  </div>
-
-  <div class='article-content -cheatsheet'>
-  {{ content }}
+    <div class='post-content -cheatsheet'>
+      {{ content }}
+    </div>
   </div>
 </div>
 
diff --git a/_/layouts/home.html b/_/layouts/home.html
index 63dfc19b1..6f518a781 100644
--- a/_/layouts/home.html
+++ b/_/layouts/home.html
@@ -2,12 +2,7 @@
 html_class: home
 ---
 {% include head.html %}
-
-<div class='blog-header'>
-  <div>
-    <h1><a href="./">{{ site.meta.name }}</a></h1>
-  </div>
-</div>
+{% include site-header.html %}
 
 <div class='pages-list'>
   {% for page in site.pages %}
diff --git a/_includes/head.html b/_includes/head.html
index 24f979d43..b30598f36 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8" />
   <title>{{ page.title }} cheatsheet</title>
-  <link href="http://ricostacruz.com/assets/article.css" rel="stylesheet" />
+  <link href="http://ricostacruz.com/til/assets/style.css" rel="stylesheet" />
   <link href="assets/style.css" rel="stylesheet" />
 </head>
 <body>
diff --git a/_includes/site-header.html b/_includes/site-header.html
new file mode 100644
index 000000000..f3ad011f2
--- /dev/null
+++ b/_includes/site-header.html
@@ -0,0 +1,6 @@
+<div class='site-header'>
+  <div class='container'>
+    This is <a href="/"><em>{{ site.meta.name }}</em></a> &mdash; collection of cheatsheets I've written.
+  </div>
+</div>
+
diff --git a/assets/style.css b/assets/style.css
index eb0331cc2..7f3fde8ab 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -1,32 +1,34 @@
-  .article-content pre, .with-footnote pre , .panorama-section pre , .article-content > .panorama-section pre  {
-    /*max-width: 900px; */
-  }
-  .article-content pre > code, .with-footnote pre > code, .panorama-section pre > code, .article-content > .panorama-section pre > code {
-    overflow: auto;
-    font-size: 0.85em;
-    margin-left: -30px;
-    margin-right: -30px;
-  }
-
-  .article-headline h1:after {
-    content: '';
-    display: block;
-    width: 80px;
-    height: 1px;
-    background: #ddd;
-    margin: 40px auto;
-  }
-
-  .hljs-keyword, .hljs-builtin {
-    font-weight: normal;
-    color: #050505;
-  }
-
-  .article-content h2 a,
-  .article-content h3 a,
-  .article-content h4 a,
-  .article-content h2 a:visited,
-  .article-content h3 a:visited,
-  .article-content h4 a:visited {
-    color: #111;
-  }
+.pages-list {
+  font-size: 0.9em;
+  max-width: 800px;
+  margin: 60px auto;
+  overflow: hidden;
+}
+.pages-list a {
+  display: block;
+  padding: 6px 0;
+  text-align: left;
+  float: left;
+  width: 44%;
+  margin: 0 3%;
+  box-shadow: none;
+  transition: all 100ms linear;
+}
+.pages-list a .title,
+.pages-list a .date {
+  display: block;
+}
+.pages-list a .title {
+  font-weight: bold;
+  color: #111;
+  float: left;
+}
+.pages-list a .date {
+  color: #aaa;
+  font-size: 0.9em;
+  float: right;
+}
+.pages-list a:hover .title,
+.pages-list a:focus .title {
+  color: dodgerblue;
+}
