diff --git a/_config.yml b/_config.yml
index 4e8c6f3..709c076 100644
--- a/_config.yml
+++ b/_config.yml
@@ -34,6 +34,11 @@ plugins:
   - jekyll-remote-theme
   - jekyll-toc
 
+collections:
+  docs:
+    output: true
+    permalink: /:collection/:path/
+
 sass:
   quiet_deps: true
 
@@ -62,14 +67,15 @@ toc:
   sublist_class: 'toc-list'
   item_class: toc-entry sidebar-nav-item
   item_prefix: toc-
+
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
 # to override the default setting.
-# exclude:
-#   - Gemfile
-#   - Gemfile.lock
-#   - node_modules
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - node_modules
+  - vendor/bundle/
+  - vendor/cache/
+  - vendor/gems/
+  - vendor/ruby/
diff --git a/_posts/article-experiment/2023-06-21-article-experiment.md b/_docs/article-experiment/index.md
similarity index 100%
rename from _posts/article-experiment/2023-06-21-article-experiment.md
rename to _docs/article-experiment/index.md
diff --git a/_posts/cme-docs/2023-04-22-cme-docs.md b/_docs/cme-docs/index.md
similarity index 100%
rename from _posts/cme-docs/2023-04-22-cme-docs.md
rename to _docs/cme-docs/index.md
diff --git a/_posts/facebook-study/2023-03-22-fb-study.md b/_docs/facebook-study/index.md
similarity index 100%
rename from _posts/facebook-study/2023-03-22-fb-study.md
rename to _docs/facebook-study/index.md
diff --git a/_posts/mediaengagement-org/2023-05-21-mediaengagement.md b/_docs/mediaengagement-org/index.md
similarity index 99%
rename from _posts/mediaengagement-org/2023-05-21-mediaengagement.md
rename to _docs/mediaengagement-org/index.md
index 2e753d5..62eb281 100644
--- a/_posts/mediaengagement-org/2023-05-21-mediaengagement.md
+++ b/_docs/mediaengagement-org/index.md
@@ -1,8 +1,8 @@
 ---
-layout: post
-title:  "CME (Engage) Website Docs"
+layout: docs
+title:  "mediaengagement.org"
 date:   2023-05-21 09:12:12 -0700
-categories: docs site
+categories: mediaengagement-org
 site: https://mediaengagement.org/
 site_shortname: mediaengagement.org
 excerpt: The core platform for the CME public facing website and peripheral solutions.
diff --git a/_posts/misinfo-dashboard/components.md b/_docs/misinfo-dashboard/components.md
similarity index 99%
rename from _posts/misinfo-dashboard/components.md
rename to _docs/misinfo-dashboard/components.md
index d50adad..8524e73 100644
--- a/_posts/misinfo-dashboard/components.md
+++ b/_docs/misinfo-dashboard/components.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Components"
 ---
 
diff --git a/_posts/misinfo-dashboard/dashboard.md b/_docs/misinfo-dashboard/dashboard.md
similarity index 99%
rename from _posts/misinfo-dashboard/dashboard.md
rename to _docs/misinfo-dashboard/dashboard.md
index 181123a..648e019 100644
--- a/_posts/misinfo-dashboard/dashboard.md
+++ b/_docs/misinfo-dashboard/dashboard.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Dashboard"
 ---
 
diff --git a/_posts/misinfo-dashboard/deploy-to-netlify.md b/_docs/misinfo-dashboard/deploy-to-netlify.md
similarity index 99%
rename from _posts/misinfo-dashboard/deploy-to-netlify.md
rename to _docs/misinfo-dashboard/deploy-to-netlify.md
index ddc6689..9058674 100644
--- a/_posts/misinfo-dashboard/deploy-to-netlify.md
+++ b/_docs/misinfo-dashboard/deploy-to-netlify.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Deploy to Netlify"
 ---
 
diff --git a/_posts/misinfo-dashboard/emulator-tips.md b/_docs/misinfo-dashboard/emulator-tips.md
similarity index 99%
rename from _posts/misinfo-dashboard/emulator-tips.md
rename to _docs/misinfo-dashboard/emulator-tips.md
index 91fde75..1029183 100644
--- a/_posts/misinfo-dashboard/emulator-tips.md
+++ b/_docs/misinfo-dashboard/emulator-tips.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Emulator Tips"
 ---
 
diff --git a/_posts/misinfo-dashboard/firebase.md b/_docs/misinfo-dashboard/firebase.md
similarity index 99%
rename from _posts/misinfo-dashboard/firebase.md
rename to _docs/misinfo-dashboard/firebase.md
index 469c773..2de123e 100644
--- a/_posts/misinfo-dashboard/firebase.md
+++ b/_docs/misinfo-dashboard/firebase.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Firebase Setup"
 ---
 
diff --git a/_posts/misinfo-dashboard/graphs.md b/_docs/misinfo-dashboard/graphs.md
similarity index 99%
rename from _posts/misinfo-dashboard/graphs.md
rename to _docs/misinfo-dashboard/graphs.md
index 10597a9..f59edac 100644
--- a/_posts/misinfo-dashboard/graphs.md
+++ b/_docs/misinfo-dashboard/graphs.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Graphs"
 ---
 
diff --git a/_posts/misinfo-dashboard/index.md b/_docs/misinfo-dashboard/index.md
similarity index 65%
rename from _posts/misinfo-dashboard/index.md
rename to _docs/misinfo-dashboard/index.md
index 125253a..bb16d35 100644
--- a/_posts/misinfo-dashboard/index.md
+++ b/_docs/misinfo-dashboard/index.md
@@ -1,13 +1,10 @@
 ---
-layout: post
-title:  "Misinfo Dashboard"
-date:   2023-06-21 010:12:12 -0700
+layout: docs
+title: "Misinfo Dashboard"
+date: 2023-06-21 10:12:12 -0700
 categories: misinfo-dashboard
-site: https://misinfo-dashboard.netlify.app/
-site_shortname: misinfo-dashboard.netlify.app
+permalink: /docs/misinfo-dashboard/
 excerpt: Web dashboard for the misinformation application.
-github: https://github.com/engagingnewsproject/misinfo-dashboard
-github_shortname: misinfo-dashboard
 ---
 
 [![React](https://img.shields.io/badge/react-%2320232a.svg?style=for-the-badge&logo=react&logoColor=%2361DAFB)](https://react.dev/)
@@ -26,18 +23,18 @@ To learn more about Next.js, take a look at the following resources:
 
 ## Table of Contents
 
-- [Installation](misinfo-dashboard/installation.md)
-- [Firebase Emulator Tips](misinfo-dashboard/emulator-tips.md)
-- [Deploy to Netlify](misinfo-dashboard/deploy.md)
-- [User Documentation](misinfo-dashboard/user-documentation.md)
-- [Tools](misinfo-dashboard/tools.md)
-- [Project Structure](misinfo-dashboard/project-structure.md)
-- [Firebase Setup](misinfo-dashboard/firebase.md)
-- [Dashboard Components](misinfo-dashboard/dashboard.md)
-- [Reports](misinfo-dashboard/reports.md)
-- [Tagging System](misinfo-dashboard/tagging-system.md)
-- [Graphs](misinfo-dashboard/graphs.md)
-- [Components Overview](misinfo-dashboard/components.md)
+- [Installation](/docs/misinfo-dashboard/installation/)
+- [Firebase Emulator Tips](/docs/misinfo-dashboard/emulator-tips/)
+- [Deploy to Netlify](/docs/misinfo-dashboard/deploy-to-netlify/)
+- [User Documentation](/docs/misinfo-dashboard/user-documentation/)
+- [Tools](/docs/misinfo-dashboard/tools/)
+- [Project Structure](/docs/misinfo-dashboard/project-structure/)
+- [Firebase Setup](/docs/misinfo-dashboard/firebase/)
+- [Dashboard Components](/docs/misinfo-dashboard/dashboard/)
+- [Reports](/docs/misinfo-dashboard/reports/)
+- [Tagging System](/docs/misinfo-dashboard/tagging-system/)
+- [Graphs](/docs/misinfo-dashboard/graphs/)
+- [Components Overview](/docs/misinfo-dashboard/components/)
 
 # Links
 
diff --git a/_posts/misinfo-dashboard/installation.md b/_docs/misinfo-dashboard/installation.md
similarity index 99%
rename from _posts/misinfo-dashboard/installation.md
rename to _docs/misinfo-dashboard/installation.md
index 6fb054e..cf34be3 100644
--- a/_posts/misinfo-dashboard/installation.md
+++ b/_docs/misinfo-dashboard/installation.md
@@ -1,7 +1,6 @@
 ---
-layout: post
+layout: docs
 title: "Installation"
-categories: docs
 ---
 
 # Installation
diff --git a/_posts/misinfo-dashboard/project-structure.md b/_docs/misinfo-dashboard/project-structure.md
similarity index 99%
rename from _posts/misinfo-dashboard/project-structure.md
rename to _docs/misinfo-dashboard/project-structure.md
index 49fa298..cc14ed9 100644
--- a/_posts/misinfo-dashboard/project-structure.md
+++ b/_docs/misinfo-dashboard/project-structure.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Project Structure"
 ---
 
diff --git a/_posts/misinfo-dashboard/reports.md b/_docs/misinfo-dashboard/reports.md
similarity index 98%
rename from _posts/misinfo-dashboard/reports.md
rename to _docs/misinfo-dashboard/reports.md
index 7144401..9af3e52 100644
--- a/_posts/misinfo-dashboard/reports.md
+++ b/_docs/misinfo-dashboard/reports.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Reports"
 ---
 
diff --git a/_posts/misinfo-dashboard/tagging-system.md b/_docs/misinfo-dashboard/tagging-system.md
similarity index 97%
rename from _posts/misinfo-dashboard/tagging-system.md
rename to _docs/misinfo-dashboard/tagging-system.md
index 4aff15d..d440c47 100644
--- a/_posts/misinfo-dashboard/tagging-system.md
+++ b/_docs/misinfo-dashboard/tagging-system.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Tagging System"
 ---
 
diff --git a/_posts/misinfo-dashboard/tools.md b/_docs/misinfo-dashboard/tools.md
similarity index 98%
rename from _posts/misinfo-dashboard/tools.md
rename to _docs/misinfo-dashboard/tools.md
index f79ae55..bc493a5 100644
--- a/_posts/misinfo-dashboard/tools.md
+++ b/_docs/misinfo-dashboard/tools.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "Tools"
 ---
 
diff --git a/_posts/misinfo-dashboard/user-documentation.md b/_docs/misinfo-dashboard/user-documentation.md
similarity index 99%
rename from _posts/misinfo-dashboard/user-documentation.md
rename to _docs/misinfo-dashboard/user-documentation.md
index f8683eb..c7b1078 100644
--- a/_posts/misinfo-dashboard/user-documentation.md
+++ b/_docs/misinfo-dashboard/user-documentation.md
@@ -1,5 +1,5 @@
 ---
-layout: post
+layout: docs
 title: "User Documentation"
 ---
 
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 214688b..c2f374e 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -6,64 +6,63 @@
 <div class="sidebar" id="sidebar">
 
 	<nav class="sidebar-nav">
-		<div class="sidebar-item">
-			<h3 class="masthead-title masthead-title__sidebar">
-				<a href="{{ site.baseurl }}/" title="Home">{{ site.title }}</a>
-				<small>{{ site.tagline }}</small>
-			</h3>
-			<!-- {%- if page.path contains 'index' -%}
-			<sub class="sidebar-nav__page-title">Home</sub>
-			{%- else -%}
-			<sub class="sidebar-nav__page-title">{{ page.title }}</sub>
-			{%- endif -%} -->
-		</div>
-		<div class="sidebar-item__main-nav">
-			{% comment %}
-			The code below dynamically generates a sidebar nav of pages with
-			`layout: page` in the front-matter. See readme for usage.
-			{% endcomment %}
-
-			{% assign pages_list = site.posts | sort %}
-			<ul class="doc-posts-list">
-				<li class="sidebar-nav__toc-title">
-					<a href="{{site.baseurl}}/">← Docs</a>
-				</li>
-			{% for node in pages_list %}
-			{% if group == null or group == node.group %}
-				{% if page.url == node.url %}
-					<li class="sidebar-nav-item active"><a href="{{node.url}}" class="active">{{node.title}}</a></li>
-				{% else %}
-					<li><a class="sidebar-nav-item" href="{{node.url}}">{{node.title}}</a></li>
-				{% endif %}
-			{% endif %}
-			{% endfor %}
-			{% assign pages_list = nil %}
-			{% assign group = nil %}
-			
-			{% assign pages_list = site.pages | sort:"url" %}
-			{% for node in pages_list %}
-				{% if node.title != null %}
-					{% if node.layout == "page" %}
-						<a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}"
-							href="{{ node.url | absolute_url }}">{{
-							node.title }}</a>
-					{% endif %}
-				{% endif %}
-			{% endfor %}
-			</ul>
-			
+    <div class="sidebar-item">
+      <h3 class="masthead-title masthead-title__sidebar">
+        <a href="{{ site.baseurl }}/" title="Home">{{ site.title }}</a>
+        <small>{{ site.tagline }}</small>
+      </h3>
+    </div>
+    <div class="sidebar-item__main-nav">
+      <p class="sidebar-nav__toc-title">Main Nav</p>
+      
+      <!-- Main Navigation -->
+      <div class="doc-posts-list">
+        {% assign current_collection = page.collection %}
+        {% assign current_dir = page.dir %}
+        
+        <!-- Show all base pages -->
+        {% for collection in site.collections %}
 
-		</div>
-		{%- if page.path contains '_posts' -%}
-		<div id="table-of-contents" class="sidebar-nav__toc">
-			<p class="sidebar-nav__toc-title">{{ page.title | escape }}
-			<span class="subtitle">Table of contents</span>
-		</p>
-
-			{% toc %}
-		</div>
-		{%- endif -%}
-	</nav>
+        {% if collection.label != 'posts' && page.url == doc.url %}
+          {% for doc in collection.docs %}
+            {% if doc.path contains 'index.md' %}
+              <li class="sidebar-nav-item{% if page.url == doc.url %} active{% endif %}">
+                <a href="{{ doc.url | relative_url }}">{{ doc.title }}</a>
+              </li>
+            {% else %}
+            {% endif %}
+          {% endfor %}
+        {% endif %}
+      {% endfor %}
+        
+      <!-- Show subpages only if on a base page or subpage -->
+      {% if current_dir and current_dir != '/' %}
+      <ul class="subpage-list">
+        {% assign parent_dir = current_dir | remove: '/' %}
+        {% for subpage in site.docs %}
+          {% if subpage.dir contains parent_dir %}
+            <li class="sidebar-nav-item{% if page.url == subpage.url %} active{% endif %}">
+              <a href="{{ subpage.url | relative_url }}">{{ subpage.title }}</a>
+            </li>
+          {% endif %}
+        {% endfor %}
+      </ul>
+      {% endif %}
+      
+      </div>
+    </div>
+    
+    {% if page.path contains '_docs' %}
+    <div id="table-of-contents" class="sidebar-nav__toc">
+      <p class="sidebar-nav__toc-title">TABLE OF CONTENTS</p>
+      {% toc %}
+    </div>
+    {% endif %}
+  </nav>
+  
+	<pre>
+		<span>{{ current_collection }}</span>
+	</pre>
 
 	<div class="sidebar-item sidebar-item__footer">
 		<sub>
diff --git a/_layouts/docs.html b/_layouts/docs.html
new file mode 100644
index 0000000..9110144
--- /dev/null
+++ b/_layouts/docs.html
@@ -0,0 +1,43 @@
+---
+layout: base
+---
+<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">
+
+	<header class="post-header">
+		<h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>
+		{%- include post-meta.html post = page -%}
+		
+		{% comment %}
+		<p class="post-meta">
+			{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
+			<time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
+				{{ page.date | date: date_format }}
+			</time>
+			{%- if page.modified_date -%}
+			~
+			{%- assign mdate = page.modified_date | date_to_xmlschema -%}
+			<time class="dt-modified" datetime="{{ mdate }}" itemprop="dateModified">
+				{{ mdate | date: date_format }}
+			</time>
+			{%- endif -%}
+			{%- if page.author -%}
+			• {% for author in page.author %}
+			<span itemprop="author" itemscope itemtype="http://schema.org/Person">
+				<span class="p-author h-card" itemprop="name">{{ author }}</span></span>
+			{%- if forloop.last == false %}, {% endif -%}
+			{% endfor %}
+			{%- endif -%}
+		</p>
+		{% endcomment %}
+	</header>
+
+	<div class="post-content e-content" itemprop="articleBody">
+		{{ content }}
+	</div>
+
+	{%- if site.disqus.shortname -%}
+	{%- include disqus_comments.html -%}
+	{%- endif -%}
+
+	<a class="u-url" href="{{ page.url | relative_url }}" hidden></a>
+</article>
\ No newline at end of file
diff --git a/_layouts/home.html b/_layouts/home.html
index 82f714b..f36beda 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -8,33 +8,34 @@ <h1 class="page-heading">{{ page.title }}</h1>
 	{%- endif -%}
 
 	{{ content }}
-
-
+	
 	{% if site.paginate %}
-	{% assign posts = paginator.posts %}
+	{% assign docs = paginator.docs %}
 	{% else %}
-	{% assign posts = site.posts %}
+	{% assign docs = site.docs %}
 	{% endif %}
 
 
-	{%- if posts.size > 0 -%}
-	{%- if page.list_title -%}
-	<h2 class="post-list-heading">{{ page.list_title }}</h2>
+	{%- if docs.size > 0 -%}
+	{%- if docs.list_title -%}
+	<h2 class="post-list-heading">{{ docs.list_title }}</h2>
 	{%- endif -%}
 	<ul class="post-list">
 		{%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%}
-		{%- for post in posts -%}
-		<li>
-			<h3>
-				<a class="post-link" href="{{ post.url | relative_url }}">
-					{{ post.title | escape }}
-				</a>
-			</h3>
-			{%- if site.show_excerpts -%}
-			<p>{{ post.excerpt }}</p>
+		{%- for doc in docs -%}
+			{%- if doc.path contains 'index.md' -%}
+			<li>
+				<h3>
+					<a class="post-link" href="{{ doc.url | relative_url }}">
+						{{ doc.title | escape }}
+					</a>
+				</h3>
+				{%- if site.show_excerpts -%}
+				<p>{{ doc.excerpt }}</p>
+				{%- endif -%}
+				{%- include post-meta.html post = doc -%}
+			</li>
 			{%- endif -%}
-			{%- include post-meta.html post = post -%}
-		</li>
 		{%- endfor -%}
 	</ul>
 
diff --git a/package.json b/package.json
index a0106fb..53bf38c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "format": "prettier --write .",
     "check-format": "prettier --check .",
-    "watch": "bundle exec jekyll serve --livereload --port 4001"
+    "watch": "bundle exec jekyll serve --livereload --port 4002"
   },
   "keywords": [],
   "author": "",