diff --git a/src/assets/styles/components/_discussion.scss b/src/assets/styles/components/_discussion.scss
new file mode 100644
index 00000000..e2530be1
--- /dev/null
+++ b/src/assets/styles/components/_discussion.scss
@@ -0,0 +1,7 @@
+.discussion {
+	padding: 44px 0px;
+
+	@include mq-down(sm) {
+		padding: 24px;
+	}
+}
diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss
index 1dd5eecd..c379f1c0 100755
--- a/src/assets/styles/main.scss
+++ b/src/assets/styles/main.scss
@@ -65,6 +65,7 @@
 @import "components/writing/article-card";
 @import "components/writing/header";
 @import "components/social-card";
+@import "components/discussion";
 
 // Pages
 @import "pages/home";
diff --git a/src/assets/styles/pages/_writing.scss b/src/assets/styles/pages/_writing.scss
index 5ba75f75..8117b202 100644
--- a/src/assets/styles/pages/_writing.scss
+++ b/src/assets/styles/pages/_writing.scss
@@ -1,12 +1,4 @@
 .writing {
-	&.article-content {
-		padding-bottom: 44px;
-
-		@include mq-down(sm) {
-			padding-bottom: 24px;
-		}
-	}
-
 	&--article-list {
 		gap: 24px;
 	}
diff --git a/src/includes/writing/discussion.njk b/src/includes/writing/discussion.njk
new file mode 100644
index 00000000..aa63009c
--- /dev/null
+++ b/src/includes/writing/discussion.njk
@@ -0,0 +1,17 @@
+<div class="discussion">
+    <script src="https://giscus.app/client.js"
+        data-repo="afnizarnur/afnizarnur.com"
+        data-repo-id="MDEwOlJlcG9zaXRvcnk3ODgxMDAyNg=="
+        data-category="Writing"
+        data-category-id="DIC_kwDOBLKLqs4CfN33"
+        data-mapping="title"
+        data-strict="0"
+        data-reactions-enabled="1"
+        data-emit-metadata="0"
+        data-input-position="top"
+        data-theme="light"
+        data-lang="en"
+        data-loading="lazy"
+        crossorigin="anonymous"
+        async></script>
+</div>
\ No newline at end of file
diff --git a/src/layouts/writing.njk b/src/layouts/writing.njk
index dcf38254..a5b7fb96 100644
--- a/src/layouts/writing.njk
+++ b/src/layouts/writing.njk
@@ -29,6 +29,9 @@ layout: base
                     {% endfor %}
                 </ul>
             </div>
+
+            {% include "writing/discussion.njk" %}
+
         </r-cell>
 
     </r-grid>
diff --git a/src/pages/contact.njk b/src/pages/contact.njk
index 3965ba3e..4017da78 100644
--- a/src/pages/contact.njk
+++ b/src/pages/contact.njk
@@ -3,7 +3,7 @@ layout: base
 title: Contact
 eleventyNavigation:
     key: Contact
-    order: 5
+    order: 4
 permalink: /contact/
 ---
 
diff --git a/src/pages/index.njk b/src/pages/index.njk
index d12a5e0b..f4565587 100644
--- a/src/pages/index.njk
+++ b/src/pages/index.njk
@@ -1,8 +1,5 @@
 ---
 layout: base
-eleventyNavigation:
-    key: Home
-    order: 1
 permalink: /
 ---
 
diff --git a/src/pages/work.njk b/src/pages/work.njk
index e54c61f5..4b979033 100644
--- a/src/pages/work.njk
+++ b/src/pages/work.njk
@@ -3,7 +3,7 @@ layout: base
 title: Work
 eleventyNavigation:
     key: Work
-    order: 2
+    order: 1
 permalink: /work/
 ---
 
diff --git a/src/pages/writing.njk b/src/pages/writing.njk
index c0318d41..54db5e04 100644
--- a/src/pages/writing.njk
+++ b/src/pages/writing.njk
@@ -3,7 +3,7 @@ layout: base
 title: Writing
 eleventyNavigation:
     key: Writing
-    order: 3
+    order: 2
 permalink: /writing/
 ---