diff --git a/_config.yml b/_config.yml
index 58d048a0c96dc43ade617d4a7a3f9a5a933d7e87..22aef3f2a2b3976a33067589eb55e87472407c3a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -21,6 +21,9 @@ baseurl: "/just-the-docs/" # the subpath of your site, e.g. /blog
 permalink: pretty
 exclude: ["node_modules/", "*.gemspec", "*.gem", "Gemfile", "Gemfile.lock", "package.json", "script/", "LICENSE.txt", "lib/", "bin/", "README.md", "Rakefile"]
 
+# Enable or disable the site search
+search_enabled: true
+
 # Aux links for the upper right navigation
 aux_links:
   "Just the Docs on GitHub":
diff --git a/_includes/head.html b/_includes/head.html
index 8aae2cf99de1a2f95c100ef30a8e143b44e4713a..cbd41f9d3cd65937ded1b7e991001730b4ac19a2 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,7 +4,9 @@
 
   <title>{{ page.title }} - {{ site.title }}</title>
   <link rel="stylesheet" href="{{ "/assets/css/just-the-docs.css" | absolute_url }}">
+  {% if site.search_enabled != nil %}
   <script type="text/javascript" src="{{ "/assets/js/vendor/lunr.min.js" | absolute_url }}"></script>
+  {% endif %}
   <script type="text/javascript" src="{{ "/assets/js/just-the-docs.js" | absolute_url }}"></script>
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/_layouts/default.html b/_layouts/default.html
index fe76346d43c23b502f7105483d0b91ac1b256caf..cc7678631dbaf3c5c8160fb4ab1e4809f661849e 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -16,7 +16,8 @@
     </div>
     <div class="main-content-wrap">
       <div class="page-header">
-        <div class="main-content pb-0">
+        <div class="main-content">
+          {% if site.search_enabled != nil %}
           <div class="search js-search">
             <div class="search-input-wrap">
               <input type="text" class="js-search-input search-input" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">
@@ -24,8 +25,9 @@
             </div>
             <div class="js-search-results search-results-wrap"></div>
           </div>
+          {% endif %}
           {% if site.aux_links != nil %}
-            <ul class="list-style-none text-small mt-md-2 pb-4 pb-md-0 js-aux-nav aux-nav">
+            <ul class="list-style-none text-small mt-md-1 mb-md-1 pb-4 pb-md-0 js-aux-nav aux-nav">
               {% for link in site.aux_links %}
                 <li class="d-inline-block my-0{% unless forloop.last %} mr-2{% endunless %}"><a href="{{ link.last }}">{{ link.first }}</a></li>
               {% endfor %}
diff --git a/_sass/content.scss b/_sass/content.scss
index 4ef15ce12476bc806df07f84535ed96b0ed91a2e..1dd5256593b8fbf2cb13aa29c8556f542a6bf9ce 100644
--- a/_sass/content.scss
+++ b/_sass/content.scss
@@ -56,6 +56,23 @@
     }
   }
 
+  .task-list {
+    padding-left: 0;
+  }
+
+  .task-list-item {
+    display: flex;
+    align-items: center;
+
+    &::before {
+      content: "";
+    }
+  }
+
+  .task-list-item-checkbox {
+    margin-right: 0.6em;
+  }
+
   hr + * {
     margin-top: 0;
   }
diff --git a/_sass/layout.scss b/_sass/layout.scss
index e3c93e480b562f568863fb249e41393d7d91338a..35b9631b0e897244058c7961e19f5368b1d26431 100644
--- a/_sass/layout.scss
+++ b/_sass/layout.scss
@@ -79,8 +79,6 @@
 
   @include mq(md) {
     background-color: $white;
-    border-bottom: $border $border-color;
-
   }
 
   .main-content {
@@ -88,8 +86,11 @@
 
     @include mq(md) {
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-end;
+      height: 60px;
       padding-top: $sp-4;
+      padding-bottom: $sp-4;
+      border-bottom: $border $border-color;
     }
   }
 }
diff --git a/_sass/navigation.scss b/_sass/navigation.scss
index 0c7925cd694027448e2deb60becca166e7f88883..e5d580b02ac7553e32e3128047520926e27ce9e9 100644
--- a/_sass/navigation.scss
+++ b/_sass/navigation.scss
@@ -14,7 +14,7 @@
     z-index: 101;
     height: 60px;
     padding-top: $sp-4;
-    box-shadow: inset 0 -1px 0 $border-color;
+    border-bottom: $border $border-color;
   }
 }
 
diff --git a/_sass/search.scss b/_sass/search.scss
index 7037080661b29ecb2b12377dd9f639e4fbd58fcc..7e3a80267faf0f8ce967f996e860f22d88651620 100644
--- a/_sass/search.scss
+++ b/_sass/search.scss
@@ -17,7 +17,7 @@
     display: block;
     padding-top: $sp-1;
     padding-right: 0;
-    padding-bottom: $sp-4;
+    padding-bottom: 0;
     padding-left: 0;
     margin-bottom: 0;
     background-color: transparent;
diff --git a/assets/js/just-the-docs.js b/assets/js/just-the-docs.js
index dd24cfc854e25a5c37e96ffecc849539a524f24e..3c0a1b5574f3c94fc4648158b75ff2921d8adacf 100644
--- a/assets/js/just-the-docs.js
+++ b/assets/js/just-the-docs.js
@@ -155,7 +155,9 @@ function initSearch() {
 
 function ready(){
   toggleNav();
-  initSearch();
+  if (typeof lunr !== 'undefined') {
+    initSearch();
+  }
 }
 
 // in case the document is already rendered
diff --git a/docs/configuration.md b/docs/configuration.md
new file mode 100644
index 0000000000000000000000000000000000000000..c2f867b66abd680292c6d5f2405c28c088d013ec
--- /dev/null
+++ b/docs/configuration.md
@@ -0,0 +1,25 @@
+---
+layout: default
+title: Configuration
+nav_order: 2
+---
+
+# Configuration
+
+Just the Docs has some specific configuration parameters that can be definied in your Jekyll site's `config.yml` file.
+
+## Search enabled
+
+```yml
+# Enable or disable the site search
+search_enabled: true
+```
+
+## Aux links
+
+```yml
+# Aux links for the upper right navigation
+aux_links:
+"Just the Docs on GitHub":
+    - "//github.com/pmarsceill/just-the-docs"
+```
diff --git a/docs/customization.md b/docs/customization.md
index 6bcb8427b9ba54549e5f18259aadcde3bc27f065..b5a4f83ce17918c9780c6b825e1d251a6e436b91 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Customization
-nav_order: 5
+nav_order: 6
 ---
 
 # Customization
diff --git a/docs/index-test.md b/docs/index-test.md
index ab7a1f2df3cd86f0b95d76a066e1a8708d0abc4d..1d0db73cbae63f590b3e1a659ad1d8100c449dd5 100644
--- a/docs/index-test.md
+++ b/docs/index-test.md
@@ -94,6 +94,12 @@ end
   - level 2 item
 - level 1 item
 
+### And a task list
+
+- [ ] Hello, this is a TODO item
+- [ ] Hello, this is another TODO item
+- [x] Goodbye, this item is done
+
 ### Small image
 
 ![](https://assets-cdn.github.com/images/icons/emoji/octocat.png)
diff --git a/docs/navigation-structure.md b/docs/navigation-structure.md
index 2bce40fdb6c2fd38023839152a15b6beadaf5dd1..81143214c513af7cccb0483e34d6f9e1a0a7c49a 100644
--- a/docs/navigation-structure.md
+++ b/docs/navigation-structure.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Navigation Structure
-nav_order: 4
+nav_order: 5
 ---
 
 # Navigation Structure
diff --git a/docs/search.md b/docs/search.md
index f5850152fa67b74323c8422a57b38d928906ae9e..0c9543fd056ba35a0a4ed89257a8595adcd1726e 100644
--- a/docs/search.md
+++ b/docs/search.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Search
-nav_order: 6
+nav_order: 7
 ---
 
 # Search
@@ -12,7 +12,9 @@ Just the docs uses [lunr.js](http://lunrjs.com) to add a client-side search inte
 - Page content
 - Page URL
 
-## Setup search
+## Set up search
+
+### 1. Generate search index
 
 Before you can use search, you must initialize the feature by running this
 rake command that comes with the `just-the-docs`
@@ -41,3 +43,12 @@ your search index. Alternatively, you can create the file manually in the
 ```
 
 _Note: If you don't run this rake command or create this file manually, search will not work (or it will use the search index data from this docs site, not your site's content)._
+
+### 2. Enable search in configuration
+
+In your site's `_config.yml` enable search:
+
+```yml
+# Enable or disable the site search
+search_enabled: true
+```
diff --git a/docs/ui-components/code.md b/docs/ui-components/code.md
index c98055c8f786bc4676f2b18f9b7962c414c9b8ab..40faf41272d69cea0e9c4403870d98e9273d14b0 100644
--- a/docs/ui-components/code.md
+++ b/docs/ui-components/code.md
@@ -2,7 +2,7 @@
 layout: default
 title: Code
 parent: UI Components
-nav_order: 5
+nav_order: 6
 ---
 
 # Code
diff --git a/docs/ui-components/lists.md b/docs/ui-components/lists.md
new file mode 100644
index 0000000000000000000000000000000000000000..364316e40d171c1f72bd7c39d718ddf25a7272d5
--- /dev/null
+++ b/docs/ui-components/lists.md
@@ -0,0 +1,98 @@
+---
+layout: default
+title: Lists
+parent: UI Components
+nav_order: 5
+---
+
+# Lists
+{:.no_toc}
+
+## Table of contents
+{: .no_toc .text-delta }
+
+1. TOC
+{:toc}
+
+---
+
+Most lists can be rendered with pure markdown...
+
+## Unordered list
+<div class="code-example" markdown="1">
+- Item 1
+- Item 2
+- Item 3
+
+_or_
+
+* Item 1
+* Item 2
+* Item 3
+</div>
+```markdown
+- Item 1
+- Item 2
+- Item 3
+
+_or_
+
+* Item 1
+* Item 2
+* Item 3
+```
+
+
+## Ordered list
+<div class="code-example" markdown="1">
+1. Item 1
+1. Item 2
+1. Item 3
+</div>
+  ```markdown
+1. Item 1
+1. Item 2
+1. Item 3
+  ```
+## Task list
+
+<div class="code-example" markdown="1">
+- [ ] hello, this is a todo item
+- [ ] hello, this is another todo item
+- [x] goodbye, this item is done
+</div>
+  ```markdown
+- [ ] hello, this is a todo item
+- [ ] hello, this is another todo item
+- [x] goodbye, this item is done
+  ```
+
+## Definition list
+
+Definition lists require HTML syntax and aren't supported with the GitHub flavored markdown compiler.
+
+<div class="code-example" markdown="1">
+<dl>
+<dt>Name</dt>
+<dd>Godzilla</dd>
+<dt>Born</dt>
+<dd>1952</dd>
+<dt>Birthplace</dt>
+<dd>Japan</dd>
+<dt>Color</dt>
+<dd>Green</dd>
+</dl>
+</div>
+```html
+<dl>
+  <dt>Name</dt>
+  <dd>Godzilla</dd>
+  <dt>Born</dt>
+  <dd>1952</dd>
+  <dt>Birthplace</dt>
+  <dd>Japan</dd>
+  <dt>Color</dt>
+  <dd>Green</dd>
+</dl>
+```
+
diff --git a/docs/ui-components/ui-components.md b/docs/ui-components/ui-components.md
index 26df511e13035e0f0479fe90371ca4b319353153..00e34b84d1e28d1547140eb1122228e679423217 100644
--- a/docs/ui-components/ui-components.md
+++ b/docs/ui-components/ui-components.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: UI Components
-nav_order: 2
+nav_order: 3
 has_children: true
 parent: UI Components
 permalink: /ui-components
diff --git a/docs/utilities/utilities.md b/docs/utilities/utilities.md
index d897142986651b857b550412010c5d07050d63c2..58cdf0180033aa14556bbcf8ed23aa220e61b152 100644
--- a/docs/utilities/utilities.md
+++ b/docs/utilities/utilities.md
@@ -1,7 +1,7 @@
 ---
 layout: default
 title: Utilities
-nav_order: 3
+nav_order: 4
 parent: Utilities
 has_children: true
 permalink: /utilities