diff --git a/content/gift/index.md b/content/gift/_index.md
similarity index 100%
rename from content/gift/index.md
rename to content/gift/_index.md
diff --git a/layouts/courses/list.html b/layouts/courses/list.html
new file mode 100644
index 0000000..e52f6ae
--- /dev/null
+++ b/layouts/courses/list.html
@@ -0,0 +1,3 @@
+{{ define "main" }}
+{{ partial "courses-body.html" . }}
+{{ end }}
diff --git a/layouts/courses/single.html b/layouts/courses/single.html
index dbc7e2a..e52f6ae 100644
--- a/layouts/courses/single.html
+++ b/layouts/courses/single.html
@@ -1,43 +1,3 @@
 {{ define "main" }}
-<section class="course-hero">
-  <h1>{{ .Title }}</h1>
-  {{ with .Params.hero_subhead }}<p class="course-subhead">{{ . }}</p>{{ end }}
-  {{ with .Params.hero_image }}<img class="course-hero-image" src="{{ . }}" alt="">{{ end }}
-
-  {{ partial "course-enroll-form.html" (dict "id" "top" "page" .) }}
-
-  {{ with .Params.social_proof }}<p class="course-social-proof">{{ . }}</p>{{ end }}
-</section>
-
-{{ if or .Params.credibility_heading .Params.credibility_bullets }}
-<section class="course-credibility">
-  {{ with .Params.credibility_heading }}<h2>{{ . }}</h2>{{ end }}
-  {{ with .Params.credibility_bullets }}
-  <ul class="course-bullets">
-    {{ range . }}<li>{{ . | markdownify }}</li>{{ end }}
-  </ul>
-  {{ end }}
-</section>
-{{ end }}
-
-{{ if or .Params.curriculum_heading .Params.curriculum_items }}
-<section class="course-curriculum">
-  {{ with .Params.curriculum_heading }}<h2>{{ . }}</h2>{{ end }}
-  {{ with .Params.curriculum_intro }}<p>{{ . }}</p>{{ end }}
-  {{ with .Params.curriculum_items }}
-  <ol class="course-curriculum-list">
-    {{ range . }}
-    <li>{{ with .label }}<span class="course-day-label">{{ . }}</span> {{ end }}{{ .text | markdownify }}</li>
-    {{ end }}
-  </ol>
-  {{ end }}
-</section>
-{{ end }}
-
-{{ .Content }}
-
-<section class="course-repeat-cta">
-  {{ with .Params.repeat_cta_heading }}<h2>{{ . }}</h2>{{ end }}
-  {{ partial "course-enroll-form.html" (dict "id" "bottom" "page" .) }}
-</section>
+{{ partial "courses-body.html" . }}
 {{ end }}
diff --git a/layouts/partials/courses-body.html b/layouts/partials/courses-body.html
new file mode 100644
index 0000000..91543f4
--- /dev/null
+++ b/layouts/partials/courses-body.html
@@ -0,0 +1,41 @@
+<section class="course-hero">
+  <h1>{{ .Title }}</h1>
+  {{ with .Params.hero_subhead }}<p class="course-subhead">{{ . }}</p>{{ end }}
+  {{ with .Params.hero_image }}<img class="course-hero-image" src="{{ . }}" alt="">{{ end }}
+
+  {{ partial "course-enroll-form.html" (dict "id" "top" "page" .) }}
+
+  {{ with .Params.social_proof }}<p class="course-social-proof">{{ . }}</p>{{ end }}
+</section>
+
+{{ if or .Params.credibility_heading .Params.credibility_bullets }}
+<section class="course-credibility">
+  {{ with .Params.credibility_heading }}<h2>{{ . }}</h2>{{ end }}
+  {{ with .Params.credibility_bullets }}
+  <ul class="course-bullets">
+    {{ range . }}<li>{{ . | markdownify }}</li>{{ end }}
+  </ul>
+  {{ end }}
+</section>
+{{ end }}
+
+{{ if or .Params.curriculum_heading .Params.curriculum_items }}
+<section class="course-curriculum">
+  {{ with .Params.curriculum_heading }}<h2>{{ . }}</h2>{{ end }}
+  {{ with .Params.curriculum_intro }}<p>{{ . }}</p>{{ end }}
+  {{ with .Params.curriculum_items }}
+  <ol class="course-curriculum-list">
+    {{ range . }}
+    <li>{{ with .label }}<span class="course-day-label">{{ . }}</span> {{ end }}{{ .text | markdownify }}</li>
+    {{ end }}
+  </ol>
+  {{ end }}
+</section>
+{{ end }}
+
+{{ .Content }}
+
+<section class="course-repeat-cta">
+  {{ with .Params.repeat_cta_heading }}<h2>{{ . }}</h2>{{ end }}
+  {{ partial "course-enroll-form.html" (dict "id" "bottom" "page" .) }}
+</section>