diff --git a/_includes/components/hero-image-small.html b/_includes/components/hero-image-small.html
new file mode 100644
index 0000000..0a8932b
--- /dev/null
+++ b/_includes/components/hero-image-small.html
@@ -0,0 +1,4 @@
+<div
+  class="hero-image-small grid-col-12"
+  style="background-image: url({{include.image}})"
+></div>
diff --git a/_includes/components/hero-image.html b/_includes/components/hero-image.html
index 30ba331..5985ccb 100644
--- a/_includes/components/hero-image.html
+++ b/_includes/components/hero-image.html
@@ -1,4 +1,3 @@
-{% if include.title or include.subtitle %}
 <div
   class="hero-image grid-col-12"
   style="background-image: url({{include.image}})"
@@ -12,9 +11,3 @@ <h1 class="margin-top-0">{{include.title}}</h1>
     </div>
   </div>
 </div>
-{% else %}
-<div
-  class="hero-image-small grid-col-12"
-  style="background-image: url({{include.image}})"
-></div>
-{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 913c0c9..202eeb3 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -2,9 +2,7 @@
 layout: base
 ---
 
-{% include core/header.html %} {% include core/google-analytics.html %} {%
-include components/hero-image.html title=page.hero-title
-subtitle=page.hero-subtitle image=page.hero-image %}
+{% include core/header.html %} {% include core/google-analytics.html %}
 <div class="grid-container">{{ content }}</div>
 
 {% include core/footer.html %}
diff --git a/_layouts/hero-image-small.html b/_layouts/hero-image-small.html
new file mode 100644
index 0000000..192e584
--- /dev/null
+++ b/_layouts/hero-image-small.html
@@ -0,0 +1,9 @@
+---
+layout: base
+---
+
+{% include core/header.html %} {% include core/google-analytics.html %} {%
+include components/hero-image-small.html image=page.hero-image %}
+<div class="grid-container">{{ content }}</div>
+
+{% include core/footer.html %}
diff --git a/_layouts/hero-image.html b/_layouts/hero-image.html
new file mode 100644
index 0000000..913c0c9
--- /dev/null
+++ b/_layouts/hero-image.html
@@ -0,0 +1,10 @@
+---
+layout: base
+---
+
+{% include core/header.html %} {% include core/google-analytics.html %} {%
+include components/hero-image.html title=page.hero-title
+subtitle=page.hero-subtitle image=page.hero-image %}
+<div class="grid-container">{{ content }}</div>
+
+{% include core/footer.html %}
diff --git a/code-of-conduct.md b/code-of-conduct.md
index e665f70..eb6bf80 100644
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: hero-image-small
 title: Code of Conduct
 hero-image: assets/images/hero-image-code-of-conduct.jpg
 ---
diff --git a/donate.md b/donate.md
index 5e6a75a..81bdd9b 100644
--- a/donate.md
+++ b/donate.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: hero-image-small
 title: Donate
 hero-image: assets/images/hero-image-donate.jpg
 ---
diff --git a/index.md b/index.md
index b4e5565..79bed2a 100644
--- a/index.md
+++ b/index.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: hero-image
 title: Civic Tech DC
 hero-subtitle: Founded in 2012, Civic Tech DC is a non-partisan, non-political group of volunteer civic hackers working together to solve local issues and help people engage with the city.
 hero-image: assets/images/hero-image-homepage.jpg
diff --git a/partners.md b/partners.md
index 3e27692..75881c9 100644
--- a/partners.md
+++ b/partners.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: hero-image
 banner-hero: true
 title: Partners
 hero-title: Partners
diff --git a/slack.md b/slack.md
index 1b1e16e..d927748 100644
--- a/slack.md
+++ b/slack.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: hero-image-small
 title: Join our Slack
 hero-image: assets/images/hero-image-slack.jpg
 ---