diff --git a/content/demo/index.md b/content/demo/index.md
index 44ad83c..00d44aa 100644
--- a/content/demo/index.md
+++ b/content/demo/index.md
@@ -73,7 +73,7 @@ pre table td:nth-of-type(1) {
 | Pinke Pie    | Fun pone          | Party Horn!     |
 | Twilight     | Decent pone       | Neeerd          |
 | Rainbow Dash | Annoying pone     | Looks badass    |
-| Rarity       | Mixed pone        | Sometimes nice  |
+| Rarity       | Fancy pone        | Sometimes nice  |
 
 - Item foo
 - Item bar
@@ -386,7 +386,7 @@ Blah blah <q>Inline Quote</q> hmm.
 ## Grammar Mistakes
 
 ```html
-<u>Trying to replicate grammar mistakes</u>
+<u>Gmarrar mitsakes</u>
 ```
 
 <u>Yeet</u> the <u>sus</u> drip while <u>vibing</u> with the <u>TikTok</u> <u>fam</u> on a cap-free boomerang.
@@ -408,4 +408,4 @@ Blah blah <q>Inline Quote</q> hmm.
 </div>
 ```
 
-> Look at the end of this page xD
+Look bellow this text XD
diff --git a/templates/article.html b/templates/article.html
index 1bf1c6f..eaeebbb 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -46,35 +46,7 @@
 		{%- endif -%}
 	{%- endif -%}
 
-	{%- if page.extra.archive -%}
-		<div class="statement-container archive">
-			<strong class="big">
-				<i class="icon"></i>
-				{{- macros_translate::translate(key="archived", default="Archived", language_strings=language_strings) -}}
-			</strong>
-			{{ page.extra.archive | markdown | safe }}
-		</div>
-	{%- endif -%}
-
-	{%- if page.extra.trigger -%}
-		<div class="statement-container trigger">
-			<strong class="big">
-				<i class="icon"></i>
-				{{- macros_translate::translate(key="trigger_warning", default="Trigger Warning", language_strings=language_strings) -}}
-			</strong>
-			{{ page.extra.trigger | markdown | safe }}
-		</div>
-	{%- endif -%}
-
-	{%- if page.extra.disclaimer -%}
-		<div class="statement-container disclaimer">
-			<strong class="big">
-				<i class="icon"></i>
-				{{-macros_translate::translate(key="disclaimer", default="Disclaimer", language_strings=language_strings) -}}
-			</strong>
-			{{ page.extra.disclaimer | markdown | safe }}
-		</div>
-	{%- endif -%}
+	{%- include "partials/statements.html" -%}
 
 	{%- if page.extra.toc -%}
 		<h2>{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</h2>
@@ -100,7 +72,7 @@
 </article>
 
 {%- if page.extra.comments.id -%}
-	{% include "partials/comments.html" ignore missing %}
+	{% include "partials/comments.html" %}
 {%- endif -%}
 
 {%- if page.lower or page.higher -%}
diff --git a/templates/page.html b/templates/page.html
index 2a08346..7413f7c 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,14 +1,6 @@
 {% extends "base.html" %}
 
 {% block content %}
-{%- if page.extra.archive %}
-	<div class="statement-container archive">
-		<strong class="big">
-			<i class="icon"></i>
-			{{- macros_translate::translate(key="archived", default="Archived", language_strings=language_strings) -}}
-		</strong>
-		{{ page.extra.archive | markdown | safe }}
-	</div>
-{%- endif %}
+{%- include "partials/statements.html" -%}
 {{ page.content | safe }}
 {% endblock content %}
diff --git a/templates/partials/statements.html b/templates/partials/statements.html
new file mode 100644
index 0000000..d5bbee8
--- /dev/null
+++ b/templates/partials/statements.html
@@ -0,0 +1,29 @@
+{%- if page.extra.archive -%}
+	<div class="statement-container archive">
+		<strong class="big">
+			<i class="icon"></i>
+			{{- macros_translate::translate(key="archived", default="Archived", language_strings=language_strings) -}}
+		</strong>
+		{{ page.extra.archive | markdown | safe }}
+	</div>
+{%- endif -%}
+
+{%- if page.extra.trigger -%}
+	<div class="statement-container trigger">
+		<strong class="big">
+			<i class="icon"></i>
+			{{- macros_translate::translate(key="trigger_warning", default="Trigger Warning", language_strings=language_strings) -}}
+		</strong>
+		{{ page.extra.trigger | markdown | safe }}
+	</div>
+{%- endif -%}
+
+{%- if page.extra.disclaimer -%}
+	<div class="statement-container disclaimer">
+		<strong class="big">
+			<i class="icon"></i>
+			{{-macros_translate::translate(key="disclaimer", default="Disclaimer", language_strings=language_strings) -}}
+		</strong>
+		{{ page.extra.disclaimer | markdown | safe }}
+	</div>
+{%- endif -%}