diff --git a/core/templates/register_user.html b/core/templates/register_user.html
index c798538..79a200f 100644
--- a/core/templates/register_user.html
+++ b/core/templates/register_user.html
@@ -23,97 +23,106 @@
 {% endfor %}
 {% endif %}
 <div class="row">
-  <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4  col-xl-6 col-xl-offset-4 ">
-    <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2  col-lg-8 col-lg-offset-2  col-xl-8 col-xl-offset-2">
-      <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
-    </div>
-  </div>
+	<div class="col-sm-7 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-8 col-xs-offset-3 col-lg-6 col-lg-offset-4  col-xl-6 col-xl-offset-4 ">
+		<div class="col-sm-9 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-9 col-xs-offset-2  col-lg-8 col-lg-offset-2  col-xl-8 col-xl-offset-2">
+			<img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
+		</div>
+	</div>
 </div>
 
 <div class="row">
-	<div class="col-lg-8 col-lg-offset-3 col-md-8 col-md-offset-3 col-sm-8 col-sm-offset-3 col-xs-8 col-xs-offset-3">
+	<div class="col-lg-8 col-lg-offset-3 col-md-8 col-md-offset-3 col-sm-9 col-sm-offset-3 col-xs-10 col-xs-offset-2">
 		<div class="card">
 			<div class="card-body">
 				<div class="row">
-          <div class="col-md-12 text-center">
-            <h2 style="color:#43a251"><strong>{% trans "User Register" %}</strong></h2>
-          </div>
-        </div>
+					<div class="col-md-12 text-center">
+						<h2 style="color:#43a251"><strong>{% trans "User Register" %}</strong></h2>
+					</div>
+				</div>
 
-				<form class="form-horizontal" name="registerForm" method="post" action="" enctype="multipart/form-data">
+				<form class="{% if form.has_error %} has-error {% endif %} is-fileinput" method="post" enctype="multipart/form-data">
 					{% csrf_token %}
 					{% for field in form %}
-					<div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
-						{% if field.field.required %}
-						<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
-						{% else %}
-						<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
-						{% endif %}
-						<div class="col-md-10">
-							{% if field.auto_id == 'id_birth_date' %}
-							{% render_field field class='form-control input-sm date-picker' %}
-
-							<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-							{% elif field.auto_id == 'id_image' %}
-							{% render_field field class='form-control input-sm' %}
-							<div class="input-group">
-								<input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
-								<span class="input-group-btn input-group-sm">
-									<button type="button" class="btn btn-fab btn-fab-mini">
-										<i class="material-icons">image</i>
-									</button>
-								</span>
-							</div>
-							{% elif field.auto_id == 'id_curriculum' %}
-							{% render_field field class='form-control input-sm' %}
-							<div class="input-group">
-								<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose the file ...' %}">
-								<span class="input-group-btn input-group-sm">
-									<button type="button" class="btn btn-fab btn-fab-mini">
-										<i class="material-icons">attach_file</i>
-									</button>
-								</span>
+					<div class="col-md-10 col-md-offset-1 col-sm-12 col-xs-12 col-lg-10 col-lg-offset-1">
+						<div class="row form-group">
+							<div class="col-md-2 col-sm-3 col-xs-5 col-lg-2 text-right">
+								{% if field.field.required %}
+								<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
+								{% else %}
+								<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
+								{% endif %}
 							</div>
-							{% elif field.auto_id == 'id_cpf' %}
-							{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
-
-							{% elif field.auto_id == 'id_year_titration' %}
-							{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
+							<div class="col-md-10 col-sm-9 col-xs-7 col-lg-10">
+								{% if field.auto_id == 'id_birth_date' %}
+								{% render_field field class='form-control date-picker' %}
+								{% elif field.auto_id == 'id_image' %}
+								{% render_field field class='form-control' %}
+								<div class="input-group">
+									<input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
+									<span class="input-group-btn input-group-sm">
+										<button type="button" class="btn btn-fab btn-fab-mini">
+											<i class="material-icons">image</i>
+										</button>
+									</span>
+								</div>
+								{% elif field.auto_id == 'id_curriculum' %}
+								{% render_field field class='form-control' %}
+								<div class="input-group">
+									<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose the file ...' %}">
+									<span class="input-group-btn input-group-sm">
+										<button type="button" class="btn btn-fab btn-fab-mini">
+											<i class="material-icons">attach_file</i>
+										</button>
+									</span>
+								</div>
+								{% elif field.auto_id == 'id_cpf' %}
+								{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
 
-							{% elif field.auto_id == 'id_phone' %}
-							{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
-							{% else %}
-							{% render_field field class='form-control' %}
-							<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-							{% endif %}
-						</div>
+								{% elif field.auto_id == 'id_year_titration' %}
+								{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
 
-						{% if field.errors %}
-						<div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
-							<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-							<ul>
-								{% for error in field.errors %}
-								<li>{{ error }}</li>
-								{% endfor %}
-							</ul>
+								{% elif field.auto_id == 'id_phone' %}
+								{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+								{% else %}
+								{% render_field field class='form-control' %}
+								{% endif %}
+								<span class="help-block">{{ field.help_text }}</span>
+								{% if field.errors %}
+								<div class="row">
+									<div class="alert alert-danger alert-dismissible" role="alert">
+										<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+											<span aria-hidden="true">&times;</span>
+										</button>
+										<ul>
+											{% for error in field.errors %}
+											<li>{{ error }}</li>
+											{% endfor %}
+										</ul>
+									</div>
+								</div>
+								{% endif %}
+							</div>
 						</div>
-						{% endif %}
 					</div>
 					{% endfor %}
-					<div class="col-md-offset-2 col-md-6 col-sm-offset-2 col-sm-6 col-xs-6 col-xs-offset-2 col-xs-6">
-						<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
-					</div>
-					<div class=" col-md-4 col-sm-4 col-xs-4">
-						<a href="{% url 'core:home' %}" class="  btn btn-danger btn-raised" >{% trans 'Cancel' %}</a>
+					<div class="row">
+						<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 col-md-offset-1 text-center">
+							<input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-primary" />
+						</div>
+						<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
+							<a href="{% url 'core:home' %}" class="btn btn-Success btn-raised" >{% trans 'Login' %}</a>
+						</div>
 					</div>
-
 				</form>
 			</div>
 		</div>
 	</div>
 </div>
+<script type="text/javascript">
+var locale = navigator.language || navigator.userLanguage;
 
-<br clear="all" />
+$('.date-picker').datepicker({
+	language: locale,
+});
+</script>
 {% endblock %}
diff --git a/users/models.py b/users/models.py
index 29a9e0f..20b3823 100644
--- a/users/models.py
+++ b/users/models.py
@@ -20,14 +20,14 @@ class User(AbstractBaseUser, PermissionsMixin):
 	city = models.CharField(_('City'), max_length = 90, blank = True)
 	state = models.CharField(_('State'), max_length = 30, blank = True)
 	gender = models.CharField(_('Gender'), max_length = 1, choices = (('M', _('Male')), ('F', _('Female'))))
-	image = models.ImageField(verbose_name = _('Image'), null=True, blank = True, upload_to = 'users/')
+	image = models.ImageField(verbose_name = _('Photo'), null=True, blank = True, upload_to = 'users/')
 	birth_date = models.DateField(_('Birth Date'), null=True)
 	phone = models.CharField(_('Phone'), max_length = 30, blank = True)
-	cpf = models.CharField(_('Cpf'), max_length = 15)
+	cpf = models.CharField(_('CPF'), max_length = 15, blank=True, null=True)
 	type_profile = models.IntegerField(_('Type'), null = True, blank = True, choices = ((1, _('Professor')), (2, _('Student'))), default=2)
 	titration = models.CharField(_('Titration'), max_length = 50, blank = True, null = True)
 	year_titration = models.CharField(_('Year of titration'), max_length = 4, blank = True, null = True)
-	institution = models.CharField(_('Institution where he had titration'), max_length = 50, blank=True, null=True)
+	institution = models.CharField(_('Institution'), max_length = 50, blank=True, null=True)
 	curriculum = models.FileField(verbose_name = _('Curriculum'), upload_to='users/curriculum/', null=True, blank=True)
 	date_created = models.DateTimeField(_('Create Date'), auto_now_add = True)
 	is_staff = models.BooleanField(_('Administrador'), default = False)
--
libgit2 0.21.2