diff --git a/portal/templates/portal/base.html b/portal/templates/portal/base.html
index cf89d8985..45d487064 100644
--- a/portal/templates/portal/base.html
+++ b/portal/templates/portal/base.html
@@ -96,10 +96,10 @@
                         <a href="{% url 'teach' %}" class="button--menu button--menu--primary"><b>Teacher</b></a>
                         {% block secondaryButtons %}
                         {% if user|has_teacher_finished_onboarding %}
-                            <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>
+                            {% block dashboard %}<a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>{% endblock dashboard %}
                             {% block rapidrouter %}<a href="{% url 'game.views.level_selection.levels' %}" class="button--menu button--menu--secondary button--menu--enabled">Rapid Router</a>{% endblock rapidrouter %}
                             {% block aimmo %}<a href="{% url 'play_aimmo' %}" class="button--menu button--menu--secondary button--menu--enabled">AI:MMO</a>{% endblock aimmo %}
-                            <a href="{% url 'teaching_resources' %}" class="button--menu button--menu--secondary button--menu--enabled">Teaching Resources</a>
+                            {% block materials %}<a id="resources_button" href="{% url 'teaching_resources' %}" class="button--menu button--menu--secondary button--menu--enabled">Teaching Resources</a>{% endblock materials %}
                         {% else %}
                             <a href="{% url 'onboarding-organisation' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>
                             <a class="button--menu button--menu--secondary button--menu--disabled">Rapid Router</a>
diff --git a/portal/templates/portal/teach/resource_sheets_table.html b/portal/templates/portal/partials/resource_sheets_table.html
similarity index 100%
rename from portal/templates/portal/teach/resource_sheets_table.html
rename to portal/templates/portal/partials/resource_sheets_table.html
diff --git a/portal/templates/portal/play/base.html b/portal/templates/portal/play/base.html
deleted file mode 100644
index 4edeb7deb..000000000
--- a/portal/templates/portal/play/base.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'portal/base_old.html' %}
-
-{% block content %}
-{% endblock content %}
-
diff --git a/portal/templates/portal/play/student_edit_account.html b/portal/templates/portal/play/student_edit_account.html
index 08aa67a35..56c064eef 100644
--- a/portal/templates/portal/play/student_edit_account.html
+++ b/portal/templates/portal/play/student_edit_account.html
@@ -1,4 +1,4 @@
-{% extends 'portal/play/base.html' %}
+{% extends 'portal/base_old.html' %}
 {% load static %}
 
 {% block studentButtons %}
diff --git a/portal/templates/portal/play/student_join_organisation.html b/portal/templates/portal/play/student_join_organisation.html
index b7d6dbdbd..a7cbd03c5 100644
--- a/portal/templates/portal/play/student_join_organisation.html
+++ b/portal/templates/portal/play/student_join_organisation.html
@@ -1,4 +1,4 @@
-{% extends 'portal/play/base.html' %}
+{% extends 'portal/base_old.html' %}
 {% load static %}
 
 {% block studentButtons %}
diff --git a/portal/templates/portal/teach/base_logged_in.html b/portal/templates/portal/teach/base_logged_in.html
deleted file mode 100644
index 350e9c074..000000000
--- a/portal/templates/portal/teach/base_logged_in.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'portal/base.html' %}
-
-{% block secondaryButtons %}
-{% block dashboard %}<a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>{% endblock dashboard %}
-{% block rapidrouter %}<a href="{% url 'game.views.level_selection.levels' %}" class="button--menu button--menu--secondary button--menu--enabled">Rapid Router</a>{% endblock rapidrouter %}
-{% block aimmo %}<a href="{% url 'play_aimmo' %}" class="button--menu button--menu--secondary button--menu--enabled">AI:MMO</a>{% endblock aimmo %}
-{% block materials %}<a id="resources_button" href="{% url 'teaching_resources' %}" class="button--menu button--menu--secondary button--menu--enabled">Teaching Resources</a>{% endblock materials %}
-{% endblock secondaryButtons %}
-
-{% block content %}
-{% endblock content %}
diff --git a/portal/templates/portal/teach/class.html b/portal/templates/portal/teach/class.html
index 9c8487b9e..8d2288c14 100644
--- a/portal/templates/portal/teach/class.html
+++ b/portal/templates/portal/teach/class.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load staticfiles %}
 {% load app_tags %}
 
diff --git a/portal/templates/portal/teach/dashboard.html b/portal/templates/portal/teach/dashboard.html
index 8659d6a1a..6e4f9e917 100644
--- a/portal/templates/portal/teach/dashboard.html
+++ b/portal/templates/portal/teach/dashboard.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load staticfiles %}
 {% load app_tags %}
 
diff --git a/portal/templates/portal/teach/invite.html b/portal/templates/portal/teach/invite.html
index 898e12989..c97d00c6e 100644
--- a/portal/templates/portal/teach/invite.html
+++ b/portal/templates/portal/teach/invite.html
@@ -1,21 +1,17 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load staticfiles %}
 {% load app_tags %}
 
 {% block dashboard %}
-<a href="{% url 'invite_teacher' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
+<a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
 {% endblock dashboard %}
 
 {% block css %}
 {{ block.super }}
 {% endblock css %}
 
-
 {% block pageID %}id='homeWrapper'{% endblock %}
 
-
-
-
 {% block content %}
 
 <div class="background form--register form--register--teacher col-sm-12">
@@ -25,31 +21,19 @@ <h1>Invite a teacher</h1>
             <p>To invite another teacher from your school or club to join Code for Life,</p>
             <p>Just put <b>their email address</b> in the field below.</p>
         </div>
-          <form action="{% url 'invite_teacher' %}" method="post" class="col-md-6 col-md-offset-3">
-              {{ invite_form.non_field_errors }}
-              <div class="btn-toolbar" >
-                  {% csrf_token %}
-                  {{ invite_form.email }}
-                  {{ invite_form.email.errors }}
-                  </br>
-                  <a class="button button--regular button--secondary button--secondary--light">Cancel</a>
-                  <button type="submit" name="submit" value="Submit" class="button button-primary button--primary--general-educate">Submit</button>
-              </div>
-            </br>
-          </form>
+        <form action="{% url 'invite_teacher' %}" method="post" class="col-md-6 col-md-offset-3">
+            {{ invite_form.non_field_errors }}
+            <div class="btn-toolbar" >
+                {% csrf_token %}
+                {{ invite_form.email }}
+                {{ invite_form.email.errors }}
+                <div class="background button-group">
+                    <a class="button button--regular button--secondary button--secondary--light">Cancel</a>
+                    <button type="submit" name="submit" value="Submit" class="button button-primary button--primary--general-educate">Submit</button>
+                </div>
+            </div>
+        </form>
     </div>
 </div>
 
-<script type="text/javascript">
-    $(document).ready(function(){
-        if($(window).width() > 760) {
-            toggleStickySubnav($('.banner').outerHeight() + $('.menu').outerHeight());
-        }
-
-        {% if anchor %}
-            window.location = '#{{anchor}}';
-        {% endif %}
-    });
-</script>
-
 {% endblock content %}
diff --git a/portal/templates/portal/teach/materials.html b/portal/templates/portal/teach/materials.html
index 1013f6622..898111a1e 100644
--- a/portal/templates/portal/teach/materials.html
+++ b/portal/templates/portal/teach/materials.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load staticfiles %}
 {% load app_tags %}
 {% load table_tags %}
diff --git a/portal/templates/portal/teach/onboarding_classes.html b/portal/templates/portal/teach/onboarding_classes.html
index b46242ac6..f80ff730a 100644
--- a/portal/templates/portal/teach/onboarding_classes.html
+++ b/portal/templates/portal/teach/onboarding_classes.html
@@ -67,12 +67,6 @@ <h3>Create a class</h3>
         </form>
     </div>
 </div>
-
-<script>
-    $(document).ready(function(){
-        toggleStickySubnav($('.banner').outerHeight() + $('.menu').outerHeight());
-    });
-</script>
 {% endif %}
 
 {% endblock content %}
diff --git a/portal/templates/portal/teach/onboarding_school.html b/portal/templates/portal/teach/onboarding_school.html
index 2d58f1d49..852f42a54 100644
--- a/portal/templates/portal/teach/onboarding_school.html
+++ b/portal/templates/portal/teach/onboarding_school.html
@@ -147,10 +147,6 @@ <h3>It looks like you&rsquo;ve already created your school ({{ user.new_teacher.
             document.getElementById("right-arrow").style.display = "block";
         }
     }
-
-    $(document).ready(function(){
-        toggleStickySubnav($('.banner').outerHeight() + $('.menu').outerHeight());
-    });
 </script>
 {% endif %}
 {% endif %}
diff --git a/portal/templates/portal/teach/onboarding_students.html b/portal/templates/portal/teach/onboarding_students.html
index e2004042d..dcab61d11 100644
--- a/portal/templates/portal/teach/onboarding_students.html
+++ b/portal/templates/portal/teach/onboarding_students.html
@@ -63,8 +63,6 @@ <h3>Add students to class: {{ class.name }}</h3>
 
 <script>
   $(document).ready(function(){
-    toggleStickySubnav($('.banner').outerHeight() + $('.menu').outerHeight());
-
     $('#form-create-students').submit(disableOnClick('#submitStudents'));
   });
 </script>
diff --git a/portal/templates/portal/teach/teacher_add_external_student.html b/portal/templates/portal/teach/teacher_add_external_student.html
index 86d9d9a39..e481130ff 100644
--- a/portal/templates/portal/teach/teacher_add_external_student.html
+++ b/portal/templates/portal/teach/teacher_add_external_student.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load static %}
 
 {% block dashboard %}
diff --git a/portal/templates/portal/teach/teacher_added_external_student.html b/portal/templates/portal/teach/teacher_added_external_student.html
index 15041dc23..3d48ea162 100644
--- a/portal/templates/portal/teach/teacher_added_external_student.html
+++ b/portal/templates/portal/teach/teacher_added_external_student.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load static %}
 
 {% block dashboard %}
diff --git a/portal/templates/portal/teach/teacher_dismiss_students.html b/portal/templates/portal/teach/teacher_dismiss_students.html
index 7b0b8b816..1e351f050 100644
--- a/portal/templates/portal/teach/teacher_dismiss_students.html
+++ b/portal/templates/portal/teach/teacher_dismiss_students.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load static %}
 
 {% block dashboard %}
diff --git a/portal/templates/portal/teach/teacher_edit_class.html b/portal/templates/portal/teach/teacher_edit_class.html
index 276657f67..2d9a48aaa 100644
--- a/portal/templates/portal/teach/teacher_edit_class.html
+++ b/portal/templates/portal/teach/teacher_edit_class.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% block dashboard %}
 <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
diff --git a/portal/templates/portal/teach/teacher_edit_student.html b/portal/templates/portal/teach/teacher_edit_student.html
index d48a83baf..b3ffe97f1 100644
--- a/portal/templates/portal/teach/teacher_edit_student.html
+++ b/portal/templates/portal/teach/teacher_edit_student.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% block dashboard %}
 <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
@@ -20,8 +20,6 @@
         $('#password-setter').show();
         window.location = '#set-password';
         {%endif%}
-
-        toggleStickySubnav($('.menu').outerHeight());
     });
 </script>
 
diff --git a/portal/templates/portal/teach/teacher_move_all_classes.html b/portal/templates/portal/teach/teacher_move_all_classes.html
index 0ed1b1470..b840c4cf2 100644
--- a/portal/templates/portal/teach/teacher_move_all_classes.html
+++ b/portal/templates/portal/teach/teacher_move_all_classes.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load static %}
 {% load app_tags %}
 
diff --git a/portal/templates/portal/teach/teacher_move_class.html b/portal/templates/portal/teach/teacher_move_class.html
index 7236c4bc5..ef14a2f8a 100644
--- a/portal/templates/portal/teach/teacher_move_class.html
+++ b/portal/templates/portal/teach/teacher_move_class.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load static %}
 
 {% block dashboard %}
diff --git a/portal/templates/portal/teach/teacher_move_students.html b/portal/templates/portal/teach/teacher_move_students.html
index bbf22f425..6f9fbb71f 100644
--- a/portal/templates/portal/teach/teacher_move_students.html
+++ b/portal/templates/portal/teach/teacher_move_students.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% block dashboard %}
 <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
diff --git a/portal/templates/portal/teach/teacher_move_students_to_class.html b/portal/templates/portal/teach/teacher_move_students_to_class.html
index 7e371fe8c..f68c8773f 100644
--- a/portal/templates/portal/teach/teacher_move_students_to_class.html
+++ b/portal/templates/portal/teach/teacher_move_students_to_class.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% block dashboard %}
 <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
diff --git a/portal/templates/portal/teach/teacher_resources.html b/portal/templates/portal/teach/teacher_resources.html
index 5551d30c4..92cbaa3ba 100644
--- a/portal/templates/portal/teach/teacher_resources.html
+++ b/portal/templates/portal/teach/teacher_resources.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 {% load staticfiles %}
 {% load app_tags %}
 
diff --git a/portal/templates/portal/teach/teacher_student_reset.html b/portal/templates/portal/teach/teacher_student_reset.html
index f1f4695f0..00ce9792d 100644
--- a/portal/templates/portal/teach/teacher_student_reset.html
+++ b/portal/templates/portal/teach/teacher_student_reset.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% block dashboard %}
 <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled button--menu--teacher--active">School / Club</a>
diff --git a/portal/templates/portal/teach/viewer.html b/portal/templates/portal/teach/viewer.html
index cd72e24af..89d791fb7 100644
--- a/portal/templates/portal/teach/viewer.html
+++ b/portal/templates/portal/teach/viewer.html
@@ -1,4 +1,4 @@
-{% extends 'portal/teach/base_logged_in.html' %}
+{% extends 'portal/base.html' %}
 
 {% load app_tags %}
 {% load static %}
diff --git a/portal/templatetags/table_tags.py b/portal/templatetags/table_tags.py
index eca22f827..4b8cde095 100644
--- a/portal/templatetags/table_tags.py
+++ b/portal/templatetags/table_tags.py
@@ -59,7 +59,7 @@ def is_numerical(str):
         return False
 
 
-@register.inclusion_tag('portal/teach/resource_sheets_table.html')
+@register.inclusion_tag('portal/partials/resource_sheets_table.html')
 def resource_sheets_table(table):
     max_count = len(max(table, key=len))
     return {'table': [lengthen_list(max_count, row) for row in table]}