diff --git a/benchcoach/templates/base.html b/benchcoach/templates/base.html
index 29520bc..7571b72 100644
--- a/benchcoach/templates/base.html
+++ b/benchcoach/templates/base.html
@@ -54,9 +54,6 @@
           <li class="nav-item active">
             <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
           </li>
-          <li class="nav-item">
-            <a class="nav-link" href="{% url 'about' %}">About</a>
-          </li>
           {% if request.user.is_authenticated %}
             {% if request.user.teamsnap_preferences %}
               <li class="nav-item">
@@ -129,7 +126,7 @@
 
 </div>
 
-<div class="mb-3 bg-white px-4 pt-1 border-bottom"><h6 class="display-6">{% block title_header %}{% endblock title_header%}</h6></div>
+{% block pre_container %}<div class="mt-1"></div>{% endblock pre_container %}
 
 <div class="container">
 
diff --git a/benchcoach/templates/page-heading.html b/benchcoach/templates/page-heading.html
new file mode 100644
index 0000000..02ef10b
--- /dev/null
+++ b/benchcoach/templates/page-heading.html
@@ -0,0 +1 @@
+<div class="mb-3 bg-white px-4 pt-1 border-bottom"><h6 class="display-6">{{ title }}</h6></div>
diff --git a/gamechanger/templates/gamechanger/events.html b/gamechanger/templates/gamechanger/events.html
index 98f885b..6e9b24b 100644
--- a/gamechanger/templates/gamechanger/events.html
+++ b/gamechanger/templates/gamechanger/events.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}{% load tz %}
-{% block title_header %}GameChanger Events{% endblock title_header %}
+{% block pre_container %}GameChanger Events{% endblock title_header %}
 {% block content %}
   <table class="table">
     {% for event in events %}
diff --git a/instagen/templates/instagen/instagen.html b/instagen/templates/instagen/instagen.html
index 78497b0..fa53e01 100644
--- a/instagen/templates/instagen/instagen.html
+++ b/instagen/templates/instagen/instagen.html
@@ -9,8 +9,8 @@
         <div class="col text-nowrap px-0">Hounds Instagenerator</div>
     </div>
 {% endblock %}
+{% block pre_container %}Generate Social Image{% endblock %}
 {% block content %}
-    <h4 class="display-4">Generate Image</h4>
     <form method="get" action="{% url 'instagen_generate' team_id=event.data.team_id event_id=event.data.id %}">
 
         <div class="mb-3">
diff --git a/teamsnap/dashboard/templates/dashboard.html b/teamsnap/dashboard/templates/dashboard.html
index 1ed7ab5..95f0098 100644
--- a/teamsnap/dashboard/templates/dashboard.html
+++ b/teamsnap/dashboard/templates/dashboard.html
@@ -1,12 +1,7 @@
 {% extends "base.html" %}{% load static %}
 {% block title %}Dashboard{% endblock %}
-{% block title_header %}Dashboard{% endblock title_header %}
+{% block pre_container %}{% include "page-heading.html" with title="Dashboard" %}{% endblock pre_container %}
 {% block content %}
-{#  <div class="row">#}
-{#    <div class="col">#}
-{#      <h4 class="display-4">Dashboard</h4>#}
-{#    </div>#}
-{#  </div>#}
 
   <div class="row">
     <div class="col">
diff --git a/teamsnap/lineup/templates/lineup/multiple_choose.html b/teamsnap/lineup/templates/lineup/multiple_choose.html
index 324c0c0..05a2996 100644
--- a/teamsnap/lineup/templates/lineup/multiple_choose.html
+++ b/teamsnap/lineup/templates/lineup/multiple_choose.html
@@ -1,13 +1,8 @@
 {% extends "base.html" %}{% load static %}
 {% block title %} {{ title }}{% endblock %}
 
-{% block page_heading %}
-    <div class="row d-inline-flex">
-        <div class="col">
-            Multiple Lineup Edit
-        </div>
-    </div>
-
+{% block pre_container %}
+  {% include 'page-heading.html' with title="Choose Events" %}
 {% endblock %}
 {% block content %}
     <form method="post" action="{% url 'teamsnap_choose_multiple_lineups' team_id=team_id%}">
diff --git a/teamsnap/templates/opponent.html b/teamsnap/templates/opponent.html
index 72f20ce..19b5c29 100644
--- a/teamsnap/templates/opponent.html
+++ b/teamsnap/templates/opponent.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
-{% block title %}{{ opponent.data.name }}{% endblock %}
+{% block pre_container %}{% include 'page-heading.html' with title=opponent.data.name%}{% endblock %}
 {% block content %}
-  <h4>{{ opponent.data.name }}</h4>
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
     {{ form.as_p }}
     <input type="submit" value="Save">
diff --git a/teamsnap/templates/opponents.html b/teamsnap/templates/opponents.html
index 19b20e2..dbbd882 100644
--- a/teamsnap/templates/opponents.html
+++ b/teamsnap/templates/opponents.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}Opponents{% endblock %}
+{% block pre_container %}{% include 'page-heading.html' with title="Opponents"%}{% endblock %}
 {% block content %}
-  <h4 class="display-4">Opponents</h4>
   <table class="table bg-white">
     <thead>
     <tr>
diff --git a/teamsnap/templates/schedule.html b/teamsnap/templates/schedule.html
index 97e48c4..7c991ed 100644
--- a/teamsnap/templates/schedule.html
+++ b/teamsnap/templates/schedule.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}{% load static %}
 {% block title %} {{ title }}{% endblock %}
 
-{% block title_header %}Schedule{% endblock title_header %}
+{% block pre_container %}{% include "page-heading.html" with title="Dashboard" %}{% endblock pre_container %}
 {% block content %}
     {% load tz %}
     <div class="">