diff --git a/content/_index.md b/content/_index.md
index 6d25475..cf3e1c5 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -15,19 +15,3 @@ in our [manifesto](/docs/manifesto),
 namely *anti-commoditization*,
 *self-reliance*,
 and *radical cooperation*.
-
-## news
-
-
-
-## join us!
-
-if you like to bake, want to learn more about baking,
-or just love bread, come [join us](/join)!
-it's easy to apply for membership and we're looking forward to having you.
-
-## bakers
-
-> in order of their most recent bake
-
-{{ users() }}
diff --git a/templates/index.html b/templates/index.html
index ff6e20f..d75604e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,4 +1,9 @@
 {% extends "base.html" %}
 {% block main_content %}
 {{ section.content | safe }}
+
+{% include "index/news.html" %}
+{% include "index/join.html" %}
+{% include "index/bakers.html" %}
+
 {% endblock main_content %}
diff --git a/templates/shortcodes/users.html b/templates/index/bakers.html
similarity index 68%
rename from templates/shortcodes/users.html
rename to templates/index/bakers.html
index bcef797..22b8c12 100644
--- a/templates/shortcodes/users.html
+++ b/templates/index/bakers.html
@@ -1,3 +1,5 @@
+<h2>bakers</h2>
+<p class="description">in order of their most recent bake</p>
 {% set user_data = load_data(path="static/users.toml") %}
 <ul>
     {% for u in user_data.all -%}
diff --git a/templates/index/join.html b/templates/index/join.html
new file mode 100644
index 0000000..5bcd6a7
--- /dev/null
+++ b/templates/index/join.html
@@ -0,0 +1,6 @@
+<h2>join us!</h2>
+<p>
+    if you like to bake, want to learn more about baking,
+    or just love bread, come <a href="/join">join us</a>!
+    it's easy to apply for membership and we're looking forward to having you.
+</p>
diff --git a/templates/index/news.html b/templates/index/news.html
new file mode 100644
index 0000000..f6bea1c
--- /dev/null
+++ b/templates/index/news.html
@@ -0,0 +1,11 @@
+<h2>news</h2>
+<ul>
+    {% set s = get_section(path="news/_index.md") %}
+    {% for p in s.pages %}
+    {% if loop.index > 3 %}
+    <li><a href="/news#news-item-4">older news</a></li>
+    {% break %}
+    {% endif %}
+    <li><a href="{{ p.permalink }}">{{ p.title }}</a></li>
+    {% endfor %}
+</ul>