diff --git a/docs/content/bounty/0.md b/docs/content/bounty/0.md
index bb14e2944f..1d7fec5161 100644
--- a/docs/content/bounty/0.md
+++ b/docs/content/bounty/0.md
@@ -2,9 +2,14 @@
 title = "Bounty 0"
 date = 2022-08-19
 [extra]
-claimed = true
+status = "claimed"
+reward = "100,000 sats"
 +++
-Send an ordinal whose number ends with a zero:
+
+Criteria
+--------
+
+Send an ordinal whose number ends with a zero to the submission address:
 
 ✅: [1857578125803250](/ordinal/1857578125803250)
 
@@ -12,9 +17,17 @@ Send an ordinal whose number ends with a zero:
 
 The ordinal must be the first ordinal of the output you send.
 
-Reward: 100,000 sats
+Reward
+------
+
+100,000 sats
+
+Submission Address
+------------------
 
-Address:
 [`1PE7u4wbDP2RqfKN6geD1bG57v9Gj9FXm3`](https://mempool.space/address/1PE7u4wbDP2RqfKN6geD1bG57v9Gj9FXm3)
 
-Status: Claimed by [@count_null](https://twitter.com/rodarmor/status/1560793241473400833)!
+Status
+------
+
+Claimed by [@count_null](https://twitter.com/rodarmor/status/1560793241473400833)!
diff --git a/docs/content/bounty/1.md b/docs/content/bounty/1.md
index dcc5a50f4d..588da10708 100644
--- a/docs/content/bounty/1.md
+++ b/docs/content/bounty/1.md
@@ -2,8 +2,13 @@
 title = "Bounty 1"
 date = 2022-08-24
 [extra]
-claimed = true
+status = "claimed"
+reward = "200,000 sats"
 +++
+
+Criteria
+--------
+
 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.
 
@@ -11,9 +16,17 @@ The bounty is open for submissions until block 753984—the first block of
 difficulty adjustment period 374. Submissions included in block 753984 or later
 will not be considered.
 
-Reward: 200,000 sats
+Reward
+------
+
+200,000 sats
+
+Submission Address
+------------------
 
-Address:
 [`145Z7PFHyVrwiMWwEcUmDgFbmUbQSU9aap`](https://mempool.space/address/145Z7PFHyVrwiMWwEcUmDgFbmUbQSU9aap)
 
-Status: Claimed by [@ordinalsindex](https://twitter.com/rodarmor/status/1569883266508853251)!
+Status
+------
+
+Claimed by [@ordinalsindex](https://twitter.com/rodarmor/status/1569883266508853251)!
diff --git a/docs/content/bounty/2.md b/docs/content/bounty/2.md
index 764c36d982..feadd28c22 100644
--- a/docs/content/bounty/2.md
+++ b/docs/content/bounty/2.md
@@ -2,5 +2,32 @@
 title = "Bounty 2"
 date = 2022-10-03
 [extra]
-claimed = false
+status = "unclaimed"
+reward = "300,000 sats"
 +++
+
+Criteria
+--------
+
+Send an <span class=uncommon>uncommon</span> ordinal to the submission address:
+
+✅: [347100000000000](/ordinal/347100000000000)
+
+❌: [6685000001337](/ordinal/6685000001337)
+
+Confirm that the submission address has not received transactions before submitting your entry. Only the first successful submission will receive the reward.
+
+Reward
+------
+
+300,000 sats
+
+Submission Address
+------------------
+
+[`1Hyr94uypwWq5CQffaXHvwUMEyBPp3TUZH`](https://mempool.space/address/1Hyr94uypwWq5CQffaXHvwUMEyBPp3TUZH)
+
+Status
+------
+
+Unclaimed!
diff --git a/docs/content/bounty/_index.md b/docs/content/bounty/_index.md
index a63c22f097..9217bfb304 100644
--- a/docs/content/bounty/_index.md
+++ b/docs/content/bounty/_index.md
@@ -1,8 +1,10 @@
 +++
 title = "Bounties"
 page_template = "bounty.html"
+template = "bounties.html"
 sort_by = "date"
 +++
+
 Hints
 -----
 
diff --git a/docs/templates/section.html b/docs/templates/bounties.html
similarity index 54%
rename from docs/templates/section.html
rename to docs/templates/bounties.html
index 8521e6967d..65b923bc84 100644
--- a/docs/templates/section.html
+++ b/docs/templates/bounties.html
@@ -1,12 +1,16 @@
 {% extends "base.html" %}
 {% block content %}
 <h1>{{ section.title }}</h1>
-<ul>
+<ul class=monospace>
 {% for page in section.pages %}
   <li>
     <time>{{ page.date | date(format="%d %b %Y") }}</time>
     »
-    <a href="{{ page.permalink | safe }}">{{ page.title }}</a>
+    <a href="{{ page.permalink | safe }}" class={{page.extra.status}}>{{ page.title }}:
+    {{ page.extra.reward }}</a>
+    {% if page.extra.status == "claimed" %}
+    Claimed!
+    {% endif%}
   </li>
 {% endfor %}
 </ul>
diff --git a/docs/templates/index.html b/docs/templates/index.html
index b3d37a3d63..02f2d62c21 100644
--- a/docs/templates/index.html
+++ b/docs/templates/index.html
@@ -7,19 +7,9 @@ <h1>Ordinal Docs</h1>
 {% 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 %}
-  <li>
-    <time>{{ page.date | date(format="%d %b %Y") }}</time>
-    »
-    <a href="{{ page.permalink | safe }}">{{ page.title }}</a>
-  </li>
-{% endfor %}
-</ul>
+  <a href="{{ section.permalink | safe }}">{{ section.title }}</a>
 {% endfor %}
 {% endblock content %}
+</nav>
diff --git a/static/index.css b/static/index.css
index f3ca0fd661..a8456dffa5 100644
--- a/static/index.css
+++ b/static/index.css
@@ -40,6 +40,10 @@ ol {
   white-space: nowrap;
 }
 
+.claimed {
+  text-decoration: line-through;
+}
+
 .monospace {
   font-family: monospace, monospace;
 }