diff --git a/docs/federation/resolutions/drafts/index.md b/docs/federation/resolutions/drafts/index.md
deleted file mode 100644
index c4684c15..00000000
--- a/docs/federation/resolutions/drafts/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Drafts
----
diff --git a/docs/federation/resolutions/in-progress/index.md b/docs/federation/resolutions/in-progress/index.md
deleted file mode 100644
index 78d32831..00000000
--- a/docs/federation/resolutions/in-progress/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: In progress
----
diff --git a/docs/federation/resolutions/index.md b/docs/federation/resolutions/index.md
index 99a3b9c8..99c7ba61 100644
--- a/docs/federation/resolutions/index.md
+++ b/docs/federation/resolutions/index.md
@@ -4,15 +4,21 @@ title: Resolutions
 
 ### Resolution Template
 
-```javascript
-## Resolution <number>: <title> - <date>
+``` yaml
+---
+title: Resolution <number>
+---
 
+- Topic: <title>
+- Date: 13-12-2023
 - Deadline: Date
 - Size: large or medium
 
 ### Summary
-Who this affects, and what it does
+
+Who this affects, and what it does...
 
 ### Details
-A narrative with details
+
+A narrative with details...
 ```
diff --git a/mkdocs.yml b/mkdocs.yml
index 1d2d58a0..8da7ba62 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -45,6 +45,7 @@ markdown_extensions:
   - pymdownx.magiclink
   - pymdownx.mark
   - pymdownx.smartsymbols
+  - pymdownx.snippets
   - pymdownx.superfences
   - pymdownx.tabbed
   - pymdownx.tilde
@@ -93,7 +94,9 @@ nav:
       - get-involved/index.md
   - "Federation":
       - federation/index.md
-      - "FAQ": federation/faq.md
+      - "Bylaws": federation/bylaws.md
+      - "Finance": federation/finance.md
+      - "Membership": federation/membership.md
       - "Resolutions":
         - federation/resolutions/index.md
         - "Passed":
@@ -111,20 +114,16 @@ nav:
           - federation/resolutions/passed/012.md
           - federation/resolutions/passed/014.md
           - federation/resolutions/passed/015.md
-        - "In progress":
-          - federation/resolutions/in-progress/index.md
+        - "In Progress":
           - federation/resolutions/in-progress/016.md
           - federation/resolutions/in-progress/017.md
         - "Draft":
-          - federation/resolutions/drafts/index.md
           - federation/resolutions/drafts/013.md
-      - "Finance": federation/finance.md
-      - "Membership": federation/membership.md
       - "Minutes":
         - federation/minutes/index.md
         - "2022":
           - federation/minutes/2022-03-03.md
-      - "Digital tools": federation/tools.md
+      - "Digital Tools": federation/tools.md
   - "Glossary":
     - glossary/index.md