diff --git a/amadeus/templates/pagination.html b/amadeus/templates/pagination.html
new file mode 100644
index 0000000..982bb66
--- /dev/null
+++ b/amadeus/templates/pagination.html
@@ -0,0 +1,11 @@
+<div class="row-fluid">
+	<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12 text-center">
+	  	<ul class="pagination">
+	    	{% for page_number in paginator.page_range %}
+	    		<li{% if page_obj.number == page_number %} class="active"{% endif %}>
+	        		<a href="?page={{ page_number }}{{ getvars }}">{{ page_number }}</a>
+	    		</li>
+	    	{% endfor %}
+	  	</ul>
+	</div>
+</div>
\ No newline at end of file
diff --git a/amadeus/templatetags/__init__.py b/amadeus/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/amadeus/templatetags/__init__.py
diff --git a/amadeus/templatetags/pagination.py b/amadeus/templatetags/pagination.py
new file mode 100644
index 0000000..7b16a8e
--- /dev/null
+++ b/amadeus/templatetags/pagination.py
@@ -0,0 +1,21 @@
+from django import template
+
+register = template.Library()
+
+@register.inclusion_tag('pagination.html')
+def pagination(request, paginator, page_obj):
+    context = {
+        'request': request,
+        'paginator': paginator,
+        'page_obj': page_obj,
+    }
+
+    getvars = request.GET.copy()
+
+    if 'page' in getvars:
+        del getvars['page']
+        
+    if len(getvars) > 0:
+        context['getvars'] = '&%s' % getvars.urlencode()
+
+    return context
\ No newline at end of file
diff --git a/users/templates/users/list.html b/users/templates/users/list.html
index 8179496..2cc93d2 100644
--- a/users/templates/users/list.html
+++ b/users/templates/users/list.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load i18n django_bootstrap_breadcrumbs permission_tags static  %}
+{% load i18n pagination django_bootstrap_breadcrumbs permission_tags static  %}
 
 {% block breadcrumbs %}
     {{ block.super }}
@@ -21,18 +21,26 @@
             </div>
         {% endfor %}
     {% endif %}
-    <form action="" method="GET" class="form-horizontal">
-        <div class="form-group">
-            <div class="col-md-11 col-sm-11 col-xs-11">
-                <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
-            </div>
-            <div class="col-md-1 col-sm-1 col-xs-1">
-                <button type="submit" class="btn btn-fab btn-fab-mini">
-                    <i class="material-icons">search</i>
-                </button>
-            </div>
+
+    <div class="row">
+        <div class="col-md-9">
+            <form action="" method="GET" class="form-horizontal">
+                <div class="form-group">
+                    <div class="col-md-11 col-sm-11 col-xs-11">
+                        <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
+                    </div>
+                    <div class="col-md-1 col-sm-1 col-xs-1">
+                        <button type="submit" class="btn btn-fab btn-fab-mini">
+                            <i class="fa fa-search"></i>
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="col-md-3">
+            <a href="#" class="pull-right btn btn-primary btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
         </div>
-    </form>
+    </div>
 
     {% if users %}
         {% for acc in users %}
@@ -57,6 +65,7 @@
                 </div>
             </div>
         {% endfor %}
+        {% pagination request paginator page_obj %}
     {% else %}
         <div class="row">
             <div class="col-md-12 col-sm-12 col-xs-12">
--
libgit2 0.21.2