diff --git a/docs/content/bounty/0.md b/docs/content/bounty/0.md
index 1dfb34c7f5..bb14e2944f 100644
--- a/docs/content/bounty/0.md
+++ b/docs/content/bounty/0.md
@@ -1,5 +1,8 @@
 +++
-title = "Ordinal Bounty 0"
+title = "Bounty 0"
+date = 2022-08-19
+[extra]
+claimed = true
 +++
 Send an ordinal whose number ends with a zero:
 
diff --git a/docs/content/bounty/1.md b/docs/content/bounty/1.md
index d5f98bde7e..dcc5a50f4d 100644
--- a/docs/content/bounty/1.md
+++ b/docs/content/bounty/1.md
@@ -1,5 +1,8 @@
 +++
-title = "Ordinal Bounty 1"
+title = "Bounty 1"
+date = 2022-08-24
+[extra]
+claimed = true
 +++
 The transaction that submits a UTXO containing the oldest ordinal, i.e., that
 with the lowest number, amongst all submitted UTXOs will be judged the winner.
diff --git a/docs/content/bounty/2.md b/docs/content/bounty/2.md
new file mode 100644
index 0000000000..764c36d982
--- /dev/null
+++ b/docs/content/bounty/2.md
@@ -0,0 +1,6 @@
++++
+title = "Bounty 2"
+date = 2022-10-03
+[extra]
+claimed = false
++++
diff --git a/docs/content/bounty/index.md b/docs/content/bounty/_index.md
similarity index 87%
rename from docs/content/bounty/index.md
rename to docs/content/bounty/_index.md
index 62949e6221..a63c22f097 100644
--- a/docs/content/bounty/index.md
+++ b/docs/content/bounty/_index.md
@@ -1,15 +1,8 @@
 +++
 title = "Bounties"
+page_template = "bounty.html"
+sort_by = "date"
 +++
-
-Next bounty coming soon! 🤠
-
-Claimed Bounties
-----------------
-
-- [Bounty 0](0/)
-- [Bounty 1](1/)
-
 Hints
 -----
 
diff --git a/docs/templates/bounty.html b/docs/templates/bounty.html
new file mode 100644
index 0000000000..1ce0c6b34f
--- /dev/null
+++ b/docs/templates/bounty.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h1>{{ page.title }}</h1>
+{{ page.content | safe }}
+
+{% set section = get_section(path=page.ancestors | last) %}
+{{ section.content | safe }}
+{% endblock content %}
diff --git a/docs/templates/index.html b/docs/templates/index.html
index 5da77f35b5..b3d37a3d63 100644
--- a/docs/templates/index.html
+++ b/docs/templates/index.html
@@ -1,11 +1,25 @@
 {% extends "base.html" %}
 
 {% block content %}
+<h1>Ordinal Docs</h1>
+
+<nav>
+{% for page in section.pages %}
+  <a href="{{ page.permalink | safe }}">{{ page.title }}</a>
+{% endfor %}
+</nav>
+
+{% for path in section.subsections %}
+{% set section = get_section(path=path) %}
+<h2><a href="{{ section.permalink | safe }}">{{ section.title }}</a></h2>
 <ul>
-  {% for page in section.pages %}
+{% for page in section.pages %}
   <li>
+    <time>{{ page.date | date(format="%d %b %Y") }}</time>
+    »
     <a href="{{ page.permalink | safe }}">{{ page.title }}</a>
   </li>
-  {% endfor %}
+{% endfor %}
 </ul>
+{% endfor %}
 {% endblock content %}
diff --git a/docs/templates/page.html b/docs/templates/page.html
index 80424c428e..0ea71d760c 100644
--- a/docs/templates/page.html
+++ b/docs/templates/page.html
@@ -2,6 +2,5 @@
 
 {% block content %}
 <h1>{{ page.title }}</h1>
-<p><strong>{{ page.date }}</strong></p>
 {{ page.content | safe }}
 {% endblock content %}
diff --git a/docs/templates/section.html b/docs/templates/section.html
new file mode 100644
index 0000000000..8521e6967d
--- /dev/null
+++ b/docs/templates/section.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% block content %}
+<h1>{{ section.title }}</h1>
+<ul>
+{% for page in section.pages %}
+  <li>
+    <time>{{ page.date | date(format="%d %b %Y") }}</time>
+    »
+    <a href="{{ page.permalink | safe }}">{{ page.title }}</a>
+  </li>
+{% endfor %}
+</ul>
+{{ section.content | safe }}
+{% endblock content %}