diff --git a/templates/base.html b/templates/base.html
index d0bd299..282a55a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load static wagtailcore_tags wagtailuserbar %}
+{% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags cache %}
@@ -23,13 +23,18 @@
{% wagtailuserbar %}
- {% include "navbar.html" %}
+ {% cache 3600 "navbar" page %}
+ {% navbar page %}
+ {% endcache %}
{% block content %}{% endblock %}
- {% include "footer.html" %}
+ {% cache 3600 "footer" %}
+ {% footer %}
+ {% endcache %}
+
diff --git a/templates/footer.html b/website/common/templates/common/footer.html
similarity index 67%
rename from templates/footer.html
rename to website/common/templates/common/footer.html
index 413b10c..7b0f885 100644
--- a/templates/footer.html
+++ b/website/common/templates/common/footer.html
@@ -1,7 +1,9 @@
+{% load wagtailcore_tags %}
+