diff --git a/content/_index.md b/content/_index.md
index c0545de..0a4ffb6 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -20,6 +20,8 @@ title = "Home"
 ```
 {% end %}
 
+<br>
+
 # Duckling
 
 Duckling is an minimal and feature-rich [Zola](https://www.getzola.org) theme that has the purpose of greatly simplifying the process of rolling up your project website. It aims to provide all the necessary options for comfortable writing, while keeping the balance of simplicity.
@@ -30,14 +32,16 @@ It is based on the [Duckquill](https://duckquill.daudix.one) theme for blogs.
   <a href="/docs/gettingstarted">Getting Started</a>
 </div>
 
-## In the Wild
+<br><br>
+
+### In the Wild
 
 - [aparoksha.dev](https://aparoksha.dev)
 - [david.aparoksha.dev](https://david.aparoksha.dev)
 - [duckling.aparoksha.dev](https://duckling.aparoksha.dev)
 - Yours? <small>(feel free to send a pull request)</small>
 
-## Thanks To
+### Thanks To
 
 - [David Lapshin](https://daudix.one) for [Duckquill](https://duckquill.daudix.one)
 - [Everything Duckquill is based on](https://duckquill.daudix.one/#thanks-to)
diff --git a/templates/partials/docs_toc.html b/templates/partials/docs_toc.html
index c8f3bae..3b27380 100644
--- a/templates/partials/docs_toc.html
+++ b/templates/partials/docs_toc.html
@@ -13,16 +13,16 @@
 			</li>
 		{%- endif %}
 	{%- endfor %}
-	{%- for page_section, pages in section.pages | group_by(attribute="extra.section") %}
-		{% set int_section = page_section | int %}
-		{%- if int_section > 0 %}
-			<h3>{{ section.extra.sections | nth(n=int_section - 1) }}</h3>
-			{%- for page in pages %}
+	{%- for section in section.extra.sections %}
+		{% set int_section = loop.index %}
+		<h3>{{ section }}</h3>
+		{%- for page in section.pages %}
+			{%- if page.extra.section == int_section %}
 				<li>
 					<a class="{%- if slug == page.slug -%}active{%- endif -%}" href="{{ page.permalink | safe }}">{{ page.title }}</a>
 				</li>
-			{%- endfor %}
-		{%- endif %}
-	{%- endfor %}
+			{%- endif %}
+		{%- endfor %}
+	{% endfor %}
 	</ul>
 </div>