diff --git a/users/migrations/0010_auto_20160906_2332.py b/users/migrations/0010_auto_20160906_2332.py
new file mode 100644
index 0000000..55ca9d2
--- /dev/null
+++ b/users/migrations/0010_auto_20160906_2332.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-07 02:32
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import re
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0009_auto_20160906_1450'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[\\w.@+-]+$', 32), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', 'invalid')], verbose_name='Login'),
+        ),
+    ]
diff --git a/users/templates/list_users.html b/users/templates/list_users.html
index 486fd9f..36c8163 100644
--- a/users/templates/list_users.html
+++ b/users/templates/list_users.html
@@ -28,7 +28,16 @@
 {% endblock %}
 
 {% block content %}
-	<input type="text" class="form-control" name="search" placeholder="search..">
+    <form action="" method="GET" class="form-horizontal">
+        <div class="form-group">
+            <div class="col-md-9 col-sm-9 col-xs-9">
+                <input type="text" class="form-control" name="search" placeholder="{% trans 'Search...' %}" />
+            </div>
+            <div class="col-md-3 col-sm-3 col-xs-3">
+                <input type="submit" class="btn btn-primary" value="{% trans 'Search' %}" />
+            </div>
+        </div>
+    </form>
 
     {% if users|length > 0 %}
         {% for acc in users %}
@@ -43,8 +52,8 @@
                         <p>{% trans 'Email' %}: {{ acc.email }}</p>
                         <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
                         <div align="right">
-                            <a href="javascript:void(0)" class="btn btn-raised btn-inverse">{% trans 'Edit' %}</a>
-                            <a href="javascript:void(0)" class="btn btn-raised btn-danger">{% trans 'Delete' %}</a>
+                            <a href="javascript:void(0)" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
+                            <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Delete' %}</a>
                         </div>
                     </div>
                 </div>
--
libgit2 0.21.2