diff --git a/web/html/feed.html b/web/html/feed.html
index c32f0da..b00a500 100644
--- a/web/html/feed.html
+++ b/web/html/feed.html
@@ -1,55 +1,5 @@
 {{ define "title" }}{{ if .Items }}({{ len .Items }}) {{ end }}Intake{{ end }}
 
-{{ define "buttons" -}}
-<button class="item-button" title="Deactivate {{ .Source }}/{{ .Id }}">&#10005;</button>
-<button class="item-button" title="Punt {{ .Source }}/{{ .Id }}">&#8631;</button>
-{{- if .Link }}<a class="item-link" href="{{ .Link }}" target="_blank">&#8663;</a>
-{{ end -}}
-{{ end }}
-
-{{ define "item-title" -}}
-<span class="item-title">{{ or .Title .Id | raw }}</span>
-{{- end }}
-
-{{ define "item" -}}
-	<article id="{{ .Source }}-{{ .Id }}">
-
-	{{/* The item title is a clickable <summary> if there is body content */}}
-    {{ if .Body }}
-    <details>
-    <summary>
-        {{ template "buttons" . }}
-        {{ template "item-title" . }}
-    </summary>
-	{{ if .Body }}
-	<p>{{ raw .Body }}</p>
-	{{ end }}
-	</details>
-	{{ template "buttons" . }}
-	{{ else }}
-	{{ template "buttons" . }}
-    {{ template "item-title" . }}<br>
-	{{ end }}
-    {{/* end if .Body */}}
-
-    {{/* author/time footer line */}}
-	{{ if or .Author .Time }}
-	<span class="item-info">
-	{{ .Author }}
-	{{ .Time | tsToDate }}
-	</span><br>
-	{{ end }}
-
-    {{/* source/id/created footer line */}}
-	<span class="item-info">
-    {{ .Source }}/{{ .Id }}
-    {{ .Created | tsToDate }}
-	</span>
-
-	</article>
-{{ end }}
-{{/* end define "item" */}}
-
 {{ define "content" -}}
 <article class="center">
 <span class="item-title">
@@ -67,7 +17,6 @@
 <button>Deactivate All</button>
 </article>
 
-{{/* if .Items */}}
 {{ else }}
 <article class="center">
     <span class="item-title">Feed is empty</span>
diff --git a/web/html/html.go b/web/html/html.go
index 539a8d3..a884b27 100644
--- a/web/html/html.go
+++ b/web/html/html.go
@@ -29,8 +29,9 @@ var Stylesheet []byte
 //go:embed *.html
 var templates embed.FS
 
-func load(file string) *template.Template {
-	return template.Must(template.New("layout.html").Funcs(funcs).ParseFS(templates, "layout.html", file))
+func load(files ...string) *template.Template {
+	files = append([]string{"layout.html"}, files...)
+	return template.Must(template.New("layout.html").Funcs(funcs).ParseFS(templates, files...))
 }
 
 var home = load("home.html")
@@ -47,7 +48,7 @@ func Home(writer io.Writer, data HomeData) error {
 	return home.Execute(writer, data)
 }
 
-var feed = load("feed.html")
+var feed = load("feed.html", "item.html")
 
 type FeedData struct {
 	Items []core.Item
diff --git a/web/html/item.html b/web/html/item.html
new file mode 100644
index 0000000..0cf60b8
--- /dev/null
+++ b/web/html/item.html
@@ -0,0 +1,49 @@
+{{ define "buttons" -}}
+<button class="item-button" title="Deactivate {{ .Source }}/{{ .Id }}">&#10005;</button>
+<button class="item-button" title="Punt {{ .Source }}/{{ .Id }}">&#8631;</button>
+{{- if .Link }}<a class="item-link" href="{{ .Link }}" target="_blank">&#8663;</a>
+{{ end -}}
+{{ end }}
+
+{{ define "item-title" -}}
+<span class="item-title">{{ or .Title .Id | raw }}</span>
+{{- end }}
+
+{{ define "item" -}}
+<article id="{{ .Source }}-{{ .Id }}">
+
+{{/* The item title is a clickable <summary> if there is body content */}}
+{{ if .Body }}
+<details>
+<summary>
+    {{ template "buttons" . }}
+    {{ template "item-title" . }}
+</summary>
+{{ if .Body }}
+<p>{{ raw .Body }}</p>
+{{ end }}
+</details>
+{{ template "buttons" . }}
+{{ else }}
+{{ template "buttons" . }}
+{{ template "item-title" . }}<br>
+{{ end }}
+{{/* end if .Body */}}
+
+{{/* author/time footer line */}}
+{{ if or .Author .Time }}
+<span class="item-info">
+{{ .Author }}
+{{ .Time | tsToDate }}
+</span><br>
+{{ end }}
+
+{{/* source/id/created footer line */}}
+<span class="item-info">
+{{ .Source }}/{{ .Id }}
+{{ .Created | tsToDate }}
+</span>
+
+</article>
+{{ end }}
+{{/* end define "item" */}}