diff --git a/_includes/glossary.html b/_includes/glossary.html
new file mode 100644
index 0000000..74204b1
--- /dev/null
+++ b/_includes/glossary.html
@@ -0,0 +1,31 @@
+<section class="fws-glossary" role="complementary">
+  <div class="glossary-container">
+    <div class="glossary-header">
+      <button class="glossary-trigger back button fill-blue">Close</button>
+      <label for="glossary-search" class="glossary-search-label">Search Glossary:</label>
+      <input type="search" class="glossary-search" id="glossary-search" placeholder="Search terms..." roll="search"/>
+    </div>
+    <p>Enter a search term in the above search box to filter glossary terms.  Click on tags to automatically search for related terms.</p>
+    <ul class="glossary-terms">
+      {% for term in site.data.glossary %}
+      <li class="term">
+        <h3 class="term-name">{{ term.term }}</h3>
+        <p class="term-definition">{{ term.definition }}</p>
+        <p class="term-tags">{% for tag in term.tags %}<span class="glossary-tag">{{tag}}</span>{% endfor %}</p>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+</section>
+
+{% raw %}
+<script class="glossary-template" type="text/x-handlebars-template">
+{{#terms}}
+  <li class="term">
+    <h3 class="term-name">{{ name }} {{ acronym }}</h3>
+    <p class="term-definition">{{{ definition }}}</p>
+    <p class="term-tags">{{#if tags}}Tags: {{#tags}}<span class="glossary-tag">{{this}}</span>{{/tags}}{{/if}}</p>
+  </li>
+{{/terms}}
+</script>
+{% endraw %}
diff --git a/_layouts/default.html b/_layouts/default.html
index bb26a50..0445a80 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -6,15 +6,15 @@
   {% include menu.html %}
   {% if page.title == 'About' %}
     <div class='main about col12 contain dark'>
-  {% else %} 
+  {% else %}
     <div class='main col12 contain dark'>
   {% endif %}
     <a href='{{site.baseurl}}/' class='sprite maptime pin-left'>Maptime</a>
     {% include header.html %}
 
   </div>
-  
-  <div class='limiter pad4y'>
+
+  <div class='limiter pad4y main-content'>
     <div class='col12 clearfix'>
       <aside class='col3 fr space-bottom2 sidebar'>
             {% if page.title == 'Chapters' %}
@@ -50,6 +50,7 @@
       <p>This website is <a href='http://github.com/{{site.github_org}}/{{site.repo}}/'>open source</a> and you can improve it. Learn more about contributing <a href='https://guides.github.com/activities/forking/'>here</a>.  In founding partnership with <a href="http://stamen.com">Stamen</a>.</p>
    </div>
   </footer>
+{% include glossary.html %}
 <script src='{{site.baseurl}}/js/jquery.min.js'></script>
 <script src='{{site.baseurl}}/js/underscore.min.js'></script>
 <script src='{{site.baseurl}}/site.js'></script>
@@ -59,4 +60,4 @@
 {% endfor %}
 
 </body>
-</html>
\ No newline at end of file
+</html>