diff --git a/djangoshaker/templates/djangoshaker/user.html b/djangoshaker/templates/djangoshaker/user.html
--- a/djangoshaker/templates/djangoshaker/user.html
+++ b/djangoshaker/templates/djangoshaker/user.html
@@ -3,40 +3,30 @@
 {% load djangoshaker_html_helpers %}
 
 {% block content %}
+<div class="row">
 
+  <div class="span6">  
 {% if available_recipes %}
-<h1>Drinks that You Can Make</h1>
-
+<h1>Your Drinks</h1>
 <ul class="unstyled">
   {% for recipe in available_recipes %}
   <li>{% html_link 'recipe' recipe.name recipe.id "btn btn-link" %}</li>
   {% endfor %}
 </ul>
-
+{% include "djangoshaker/pagination.html" with page_obj=available_recipes page_param="recipe_page" extra_param=ingredient_page_param %}
 {% endif %}
-
-{% if user_ingredients %}
-<h1>Your Ingredients</h1>
-
-<div>List of ingredients that you own. Click on the ingredient to remove it from the list.</div>
+  </div>
 
-<ul class="unstyled">
-  {% for ingredient in user_ingredients %}
-  <li>{% html_link 'remove_user_ingredient' ingredient.name ingredient.id "btn btn-link btn-fixed" %}</li>
-  {% endfor %}
-</ul>
+  <div class="span6">
+<h1>Your Ingredients</h1>
+{% if user_ingredients %}
+{% include "djangoshaker/ingredient_selection.html" with ingredients=user_ingredients %}
 {% endif %}
+{% include "djangoshaker/pagination.html" with page_obj=user_ingredients page_param="ingredient_page" extra_param=recipe_page_param %}
+<a class="btn" href="{% url user_ingredient_list %}">Show all ingredients.</a>
 
-{% if ingredients %}
-<h1>Available Ingredients</h1>
-
-<div>List of ingredients that are available. Click on the ingredient to add it to the list of ingredients you own.</div>
+  </div>
+</div>
 
-<ul class="unstyled">
-  {% for ingredient in ingredients %}
-  <li>{% html_link 'add_user_ingredient' ingredient.name ingredient.id "btn btn-link btn-fixed" %}</li>
-  {% endfor %}
-</ul>
-{% endif %}
 {% endblock %}