diff --git a/src/_includes/blog/blognav.njk b/src/_includes/blog/blognav.njk
deleted file mode 100644
index e8c394d3..00000000
--- a/src/_includes/blog/blognav.njk
+++ /dev/null
@@ -1,17 +0,0 @@
-<aside class="right-sidebar">
-    <nav class="blog__nav">
-        <h2 class="blog__nav--title">Navigation</h2>
-        <ul class="blog__nav--links">
-            {% for page in collections["blog pages"] %}
-                <li><a href="{{ page.url }}">{{ page.data.blogNav or page.data.title }}</a></li>
-            {% endfor %}
-        </ul>
-    </nav>
-</aside>
-
-<style>
-    .blog__nav {
-        position: sticky;
-        top: 4rem;
-    }
-</style>
\ No newline at end of file
diff --git a/src/_includes/main/article.njk b/src/_includes/main/article.njk
index 0e633b84..173faa23 100644
--- a/src/_includes/main/article.njk
+++ b/src/_includes/main/article.njk
@@ -31,7 +31,7 @@ metadata:
         {{ content | safe }}
     </article>
 
-    {% if tags and tags.includes("posts") %}
-        {% include "blog/blognav.njk" %}
+    {% if tags and tags.includes("articles") or tags and tags.includes("posts") %}
+        {% include "main/content-nav.njk" %}
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/src/_includes/blog/blogpost.njk b/src/_includes/main/blogpost.njk
similarity index 100%
rename from src/_includes/blog/blogpost.njk
rename to src/_includes/main/blogpost.njk
diff --git a/src/_includes/main/content-nav.njk b/src/_includes/main/content-nav.njk
new file mode 100644
index 00000000..50ffdf95
--- /dev/null
+++ b/src/_includes/main/content-nav.njk
@@ -0,0 +1,25 @@
+<aside class="right-sidebar">
+    <nav class="content__nav">
+        <h2 class="content__nav--title">Content Index</h2>
+        <ul class="content__nav--links">
+            {% for archive in collections.archive %}
+                <li><a href="{{ archive.url }}">{{ archive.data.title }}</a></li>
+            {% endfor %}
+            <li><a href="/articles/">Articles</a></li>
+            {% for page in collections["blog pages"] %}
+                <li><a href="{{ page.url }}">{{ page.data.navTitle or page.data.title }}</a></li>
+            {% endfor %}
+        </ul>
+    </nav>
+</aside>
+
+<style>
+    .content__nav {
+        position: sticky;
+        top: 4rem;
+    }
+
+    .content__nav--title {
+        font-size: 1.7rem;
+    }
+</style>
\ No newline at end of file
diff --git a/src/_includes/main/content.njk b/src/_includes/main/content.njk
index 1a4d5fd2..ae9d806c 100644
--- a/src/_includes/main/content.njk
+++ b/src/_includes/main/content.njk
@@ -18,7 +18,7 @@ layout: main/base
         {{ content | safe }}
     </div>
 
-    {% if tags and tags.includes("blog pages") %}
-        {% include "blog/blognav.njk" %}
+    {% if title === "Articles" or tags and tags.includes("blog pages") %}
+        {% include "main/content-nav.njk" %}
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/src/blog/posts.njk b/src/blog/posts.njk
index 9db91f46..f6be9899 100644
--- a/src/blog/posts.njk
+++ b/src/blog/posts.njk
@@ -7,6 +7,8 @@ pagination:
 title: Blog Archive
 layout: main/content
 tags: blog pages
+eleventyComputed:
+    desc: Archive of blog posts on {{ sitemeta.siteName | safe }}
 ---
 
 <ul class="blog__postlist">
diff --git a/src/blog/posts/posts.11tydata.json b/src/blog/posts/posts.11tydata.json
index de7b5732..66ecb2fb 100644
--- a/src/blog/posts/posts.11tydata.json
+++ b/src/blog/posts/posts.11tydata.json
@@ -1,5 +1,5 @@
 {
-    "layout": "blog/blogpost",
+    "layout": "main/blogpost",
     "tags": ["posts", "contents", "feed items"],
     "eleventyComputed": {
         "title": "{{ articleTitle }} | Blog"
diff --git a/src/pages/blog.njk b/src/pages/blog.njk
index 9f84f5ff..4a057981 100644
--- a/src/pages/blog.njk
+++ b/src/pages/blog.njk
@@ -5,7 +5,7 @@ desc: Blog hosted on Leilukin's personal website.
 tags: blog pages
 date: 2022-01-04
 pageTitle: Welcome to Leilukin's Hub Blog!
-blogNav: Blog Home
+navTitle: Blog Home
 pagination:
     data: collections.posts
     size: 5