diff --git a/colab/templates/base.html b/colab/templates/base.html
index 2535a0d..7d9271d 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -1,5 +1,5 @@
-{% load i18n browserid conversejs gravatar plugins %}
+{% load i18n browserid conversejs gravatar %}
{% load static from staticfiles %}
@@ -54,7 +54,7 @@
-
+
{% if BROWSERID_ENABLED %}
{% browserid_info %}
{% endif %}
@@ -70,94 +70,8 @@
{% endblock %}
{% block navbar %}
-
+
{% block main-content %}{% endblock %}
{% block footer %}
-
+
+ {% include "footer.html" %}
+
{% endblock %}
{% if not is_mobile %}
diff --git a/colab/templates/footer.html b/colab/templates/footer.html
new file mode 100644
index 0000000..d833235
--- /dev/null
+++ b/colab/templates/footer.html
@@ -0,0 +1,19 @@
+{% load i18n browserid conversejs gravatar %}
+{% load static from staticfiles %}
+
+
diff --git a/colab/templates/header.html b/colab/templates/header.html
new file mode 100644
index 0000000..43c7765
--- /dev/null
+++ b/colab/templates/header.html
@@ -0,0 +1,100 @@
+{% load i18n browserid conversejs gravatar plugins %}
+{% load static from staticfiles %}
+
+
+
--
libgit2 0.21.2