diff --git a/cfp/templates/cfp/admin/category_form.html b/cfp/templates/cfp/admin/category_form.html
new file mode 100644
index 0000000..1fb03bb
--- /dev/null
+++ b/cfp/templates/cfp/admin/category_form.html
@@ -0,0 +1,33 @@
+{% extends 'cfp/admin/base.html' %}
+
+{% load bootstrap3 i18n %}
+
+{% block categoriestab %} class="active"{% endblock %}
+
+{% block css %}
+{{ block.super }}
+{{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+
+<h1>
+  {% if tag %}
+    {% trans "Edit category" %}
+  {% else %}
+    {% trans "New category" %}
+  {% endif %}
+</h1>
+
+<div class="row">
+  <div class="col-md-8 col-md-offset-2">
+{% include "_form.html" %}
+  </div>
+</div>
+
+{% endblock %}
+
+{% block js_end %}
+{{ block.super }}
+{{ form.media.js }}
+{% endblock %}
diff --git a/cfp/templates/cfp/admin/category_list.html b/cfp/templates/cfp/admin/category_list.html
new file mode 100644
index 0000000..3fec586
--- /dev/null
+++ b/cfp/templates/cfp/admin/category_list.html
@@ -0,0 +1,26 @@
+{% extends 'cfp/admin/base.html' %}
+
+{% load bootstrap3 cfp_tags i18n %}
+
+{% block categoriestab %} class="active"{% endblock %}
+
+{% block content %}
+
+<h1>{% trans "Categories" %}</h1>
+
+<p><a href="{% url 'category-add' %}" class="btn btn-success">{% trans "Add a category" %}</a><p>
+
+<ul class="list-group">
+  {% for category in talkcategory_list %}
+  <div class="list-group-item">
+    <a href="{{ category.get_filter_url }}" class="btn btn-primary">{{ category.name }}</a>
+    <a href="{% url 'category-edit' category.pk %}" class="btn btn-success pull-right">{% bootstrap_icon "pencil" %} {% trans "Edit" %}</a>
+  </div>
+  {% empty %}
+  <li class="list-group-item">
+    <i>{% trans "No categories." %}</li>
+  </li>
+  {% endfor %}
+</ul>
+
+{% endblock %}
diff --git a/cfp/templates/cfp/admin/tag_form.html b/cfp/templates/cfp/admin/tag_form.html
new file mode 100644
index 0000000..79d7d1c
--- /dev/null
+++ b/cfp/templates/cfp/admin/tag_form.html
@@ -0,0 +1,33 @@
+{% extends 'cfp/admin/base.html' %}
+
+{% load bootstrap3 i18n %}
+
+{% block tagstab %} class="active"{% endblock %}
+
+{% block css %}
+{{ block.super }}
+{{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+
+<h1>
+  {% if tag %}
+    {% trans "Edit tag" %}
+  {% else %}
+    {% trans "New tag" %}
+  {% endif %}
+</h1>
+
+<div class="row">
+  <div class="col-md-8 col-md-offset-2">
+{% include "_form.html" %}
+  </div>
+</div>
+
+{% endblock %}
+
+{% block js_end %}
+{{ block.super }}
+{{ form.media.js }}
+{% endblock %}
diff --git a/cfp/templates/cfp/admin/tag_list.html b/cfp/templates/cfp/admin/tag_list.html
new file mode 100644
index 0000000..26455c9
--- /dev/null
+++ b/cfp/templates/cfp/admin/tag_list.html
@@ -0,0 +1,26 @@
+{% extends 'cfp/admin/base.html' %}
+
+{% load bootstrap3 cfp_tags i18n %}
+
+{% block tagstab %} class="active"{% endblock %}
+
+{% block content %}
+
+<h1>{% trans "Tags" %}</h1>
+
+<p><a href="{% url 'tag-add' %}" class="btn btn-success">{% trans "Add a tag" %}</a><p>
+
+<ul class="list-group">
+  {% for tag in tag_list %}
+  <div class="list-group-item">
+    <a href="{{ tag.get_filter_url }}" class="btn" style="{{ tag.style }}">{{ tag.name }}</a>
+    <a href="{% url 'tag-edit' tag.slug %}" class="btn btn-success pull-right">{% bootstrap_icon "pencil" %} {% trans "Edit" %}</a>
+  </div>
+  {% empty %}
+  <li class="list-group-item">
+    <i>{% trans "No tags." %}</li>
+  </li>
+  {% endfor %}
+</ul>
+
+{% endblock %}