diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py
index 69ca24ba..28fc7177 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py
@@ -147,7 +147,7 @@ DJANGO_APPS = (
 THIRD_PARTY_APPS = (
     'south',  # Database migration helpers:
     'crispy_forms',  # Form layouts
-    # 'avatar',  # for user avatars
+    'avatar',  # for user avatars
 )
 
 # Apps specific for this project go here.
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py
index c85e2591..47d8236c 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py
@@ -26,7 +26,7 @@ urlpatterns = patterns('',
     url(r'^accounts/', include('allauth.urls')),
 
     # Uncomment the next line to enable avatars
-    #url(r'^avatar/', include('avatar.urls')),
+    url(r'^avatar/', include('avatar.urls')),
 
     # Your stuff: custom urls go here
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html
index bbc33c6e..508c845a 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/users/user_detail.html
@@ -7,34 +7,29 @@
 {% block content %}
 <div class="container">
 
-<div class="row">
-  <div class="col-lg-3">
-
-    <h2>{{ object.username }} 
-
-    </h2>
-    <p>{{ object.tagline }}</p>
-
-    {% if object == request.user %}
-        <!-- Action buttons -->
-        <div class="well">          
-          <div class="row">
-
-            <div class="col-6">
-              <a class="btn btn-primary btn-block" href="{% url 'users:update' %}">My Info</a>
-              <a class="btn btn-primary btn-block" href="{% url 'account_email' %}">E-Mail</a>
-            </div>
-            <div class="col-6">
-              <a class="btn btn-info btn-block" href="">Avatar</a>
-            </div>
-          </div>
-        </div>
-        <!-- End Action buttons -->
-    {% endif %}
-
+  <div class="row">
+    <div class="col-sm-12">
 
+      <h2>{{ object.username }}</h2>
     </div>
   </div>
+
+{% if object == request.user %}
+<!-- Action buttons -->     
+<div class="row">
+
+  <div class="col-sm-12 ">
+    <a class="btn btn-primary" href="{% url 'users:update' %}">My Info</a>
+    <a class="btn btn-primary" href="{% url 'account_email' %}">E-Mail</a>
+    <a class="btn btn-info" href="{% url 'avatar_change' %}">Avatar</a>
+    <!-- Your Stuff: Custom user template urls -->
+  </div>
+
+</div>
+<!-- End Action buttons -->
+{% endif %}
+
+
 </div>
 {% endblock content %}
 {% endraw %}
\ No newline at end of file