diff --git a/_sass/_bootstrap.scss b/_sass/_bootstrap.scss
index 328732cd..797284ba 100644
--- a/_sass/_bootstrap.scss
+++ b/_sass/_bootstrap.scss
@@ -13,10 +13,10 @@ $headings-font-family: "Open Sans", sans-serif;
 $text-color: $brand-secondary;
 $gray-lighter: lighten(#000, 93.5%);
 
-$font-size-h1:            floor(($font-size-base * 2.0)) !default;
-$font-size-h2:            floor(($font-size-base * 1.75)) !default;
-$font-size-h3:            ceil(($font-size-base * 1.5)) !default;
-$font-size-h4:            ceil(($font-size-base * 1.25)) !default;
+$font-size-h1: floor(($font-size-base * 2.0)) !default;
+$font-size-h2: floor(($font-size-base * 1.75)) !default;
+$font-size-h3: ceil(($font-size-base * 1.5)) !default;
+$font-size-h4: ceil(($font-size-base * 1.25)) !default;
 
 $navbar-height: 80px;
 $navbar-margin-bottom: 0;
diff --git a/_sass/_help.scss b/_sass/_help.scss
index 3f812398..7917063f 100644
--- a/_sass/_help.scss
+++ b/_sass/_help.scss
@@ -9,6 +9,7 @@ html {
 
 body {
     margin-bottom: 465px;
+    background-color: #ffffff;
 }
 
 @media(min-width:$screen-sm) {
@@ -145,15 +146,29 @@ footer {
     }
 
     @media(min-width:$screen-sm) {
-        padding-left: 50px;
+        padding-left: 38px;
 
         i {
-            margin-left: -50px;
+            margin-left: -38px;
+        }
+    }
+
+    @media(min-width:$screen-md) {
+        padding-left: 52px;
+
+        i {
+            margin-left: -52px;
         }
     }
 }
 
 @media(max-width:$screen-sm-max) {
+    h1 {
+        font-size: 30px;
+    }
+}
+
+@media(max-width:$screen-xs-max) {
     h1 {
         font-size: 25px;
     }
@@ -175,6 +190,14 @@ footer {
     }
 }
 
+@media(min-width:$screen-md) {
+    .main {
+        .articles:last-child {
+            margin-bottom: 0;
+        }
+    }
+}
+
 .articles {
     margin-bottom: 25px;
 
@@ -211,7 +234,7 @@ footer {
         }
     }
 
-    @media(max-width:$screen-sm-max) {
+    @media(max-width:$screen-xs-max) {
         &.panel {
             border: 0;
             box-shadow: none;
diff --git a/index.html b/index.html
index ec801497..47ee030a 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@ layout: default
 title: Help Center
 ---
 
-<div class="container">
+<div class="container main">
     <div class="row">
         <div class="col-md-8">
             <div class="panel panel-secondary articles">
diff --git a/search/index.html b/search/index.html
index 4865a06d..90ad32cc 100644
--- a/search/index.html
+++ b/search/index.html
@@ -21,7 +21,8 @@ title: Search Results
     {% for article in site.articles %}
       "{{article.url | slugify}}": {
           "title": "{{article.title | xml_escape}}",
-          "category": "{{article.category | xml_escape}}",
+          "categories": "{{article.categories | join: ', ' | xml_escape}}",
+          "tags": "{{article.tags | join: ', ' | xml_escape}}",
           "content": {{article.content | strip_html | strip_newlines | jsonify}},
         "url": "{{article.url | xml_escape}}"
       }
@@ -72,8 +73,9 @@ title: Search Results
             // a boost of 10 to indicate matches on this field are more important.
             var idx = lunr(function () {
                 this.field('id');
-                this.field('title', { boost: 10 });
-                this.field('category');
+                this.field('title', { boost: 20 });
+                this.field('categories');
+                this.field('tags', { boost: 10 });
                 this.field('content');
             });
 
@@ -81,7 +83,8 @@ title: Search Results
                 idx.add({
                     'id': key,
                     'title': window.store[key].title,
-                    'category': window.store[key].category,
+                    'categories': window.store[key].categories,
+                    'tags': window.store[key].tags,
                     'content': window.store[key].content
                 });