diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html
index 334e6302a..d41533b3f 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirm.html
@@ -10,7 +10,7 @@
 {% block content %}
 <div class="container">
   <div class="row">
-    <div class="col-12">
+    <div class="col-xs-12">
         <h2>{% trans "Confirm E-mail Address" %}</h2>
 
         {% if confirmation %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html
index 61c53b824..9b4937cd1 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/email_confirmed.html
@@ -9,7 +9,7 @@
 {% block content %}
 <div class="container">
   <div class="row">
-    <div class="col-12">
+    <div class="col-xs-12">
         <h2>{% trans "Confirm E-mail Address" %}</h2>
 
         {% user_display email_address.user as user_display %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html
index 2f9102b65..e954abc61 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_done.html
@@ -8,7 +8,7 @@
 {% block content %}
 <div class="container">
   <div class="row">
-    <div class="col-12">
+    <div class="col-xs-12">
         <h2>{% trans "Password Reset" %}</h2>
         
         {% if user.is_authenticated %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html
index 525cee7c1..1355f6309 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/password_reset_from_key.html
@@ -9,7 +9,7 @@
 {% block content %}
 <div class="container">
   <div class="row">
-    <div class="col-12">
+    <div class="col-xs-12">
     <h2>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h2>
     
     {% if token_fail %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html
new file mode 100644
index 000000000..3e3742a6a
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/add.html
@@ -0,0 +1,21 @@
+{% extends "avatar/base.html" %}
+{% load i18n avatar_tags %}
+{% load url from future %}
+
+{% block content %}
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12">
+      <h2>{% trans "Your current avatar: " %}</h2>
+        {% avatar user %}
+        {% if not avatars %}
+            <p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
+        {% endif %}
+        <form enctype="multipart/form-data" method="POST" action="{% url 'avatar_add' %}">
+            {{ upload_avatar_form.as_p }}
+            <p>{% csrf_token %}<input type="submit" value="{% trans "Upload New Image" %}" /></p>
+        </form>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html
new file mode 100644
index 000000000..81842d1e6
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/avatar_tag.html
@@ -0,0 +1 @@
+<img src="{{ url }}" width="{{ size }}" height="{{ size }}" class="img-thumbnail">
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html
new file mode 100644
index 000000000..a05af9a55
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/base.html
@@ -0,0 +1,4 @@
+{% extends "base.html" %}
+
+{% block title %}django-avatar{% endblock %}
+{% block content %}{% endblock %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html
new file mode 100644
index 000000000..5a2198b90
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/change.html
@@ -0,0 +1,28 @@
+{% extends "avatar/base.html" %}
+{% load i18n avatar_tags %}
+{% load url from future %}
+
+{% block content %}
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12">
+        <h2>{% trans "Your current avatar: " %}</h2>
+        {% avatar user %}
+        {% if not avatars %}
+            <p>{% trans "You haven't uploaded an avatar yet. Please upload one now." %}</p>
+        {% else %}
+            <form method="POST" action="{% url 'avatar_change' %}">
+                <ul>
+                    {{ primary_avatar_form.as_ul }}
+                </ul>
+                <p>{% csrf_token %}<input type="submit" value="{% trans "Choose new Default" %}" /></p>
+            </form>
+        {% endif %}
+        <form enctype="multipart/form-data" method="POST" action="{% url 'avatar_add' %}">
+            {{ upload_avatar_form.as_p }}
+            <p>{% csrf_token %}<input type="submit" value="{% trans "Upload New Image" %}" /></p>
+        </form>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html
new file mode 100644
index 000000000..3085ed765
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/avatar/confirm_delete.html
@@ -0,0 +1,24 @@
+{% extends "avatar/base.html" %}
+{% load i18n %}
+{% load url from future %}
+
+{% block content %}
+<div class="container">
+  <div class="row">
+    <div class="col-xs-12">
+    <h2>{% trans "Please select the avatars that you would like to delete." %}</h2>
+    {% if not avatars %}
+        {% url 'avatar_change' as avatar_change_url %}
+        <p>{% blocktrans %}You have no avatars to delete. Please <a href="{{ avatar_change_url }}">upload one</a> now.{% endblocktrans %}</p>
+    {% else %}
+        <form method="POST" action="{% url 'avatar_delete' %}">
+            <ul>
+                {{ delete_avatar_form.as_ul }}
+            </ul>
+            <p>{% csrf_token %}<input type="submit" value="{% trans "Delete These" %}" /></p>
+        </form>
+    {% endif %}
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html
index b5154a63f..f7c03fd79 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_list.html
@@ -9,9 +9,8 @@
 <div class="container">
     
   <div class="row">
-    <div class="col-12">
-      <h2>Members</h2>
-      <p>Who loves cheese!</p>
+    <div class="col-xs-12">
+      <h2>Users</h2>
     </div>
   </div>