diff --git a/app/models/InstructorDocumentsAndAddress.php b/app/models/InstructorDocumentsAndAddress.php
index 2829a7a5e..021de2b13 100755
--- a/app/models/InstructorDocumentsAndAddress.php
+++ b/app/models/InstructorDocumentsAndAddress.php
@@ -110,8 +110,8 @@ public function attributeLabels()
 			'school_inep_id_fk' => Yii::t('default', 'School Inep Id Fk'),
 			'inep_id' => Yii::t('default', 'Inep'),
 			'id' => Yii::t('default', 'ID'),
-			'cpf' => Yii::t('default', 'Cpf') . " *",
-			'area_of_residence' => Yii::t('default', 'Area Of Residence') . " *",
+			'cpf' => Yii::t('default', 'Cpf'),
+			'area_of_residence' => Yii::t('default', 'Area Of Residence'),
 			'cep' => Yii::t('default', 'Cep'),
 			'address' => Yii::t('default', 'Address'),
 			'address_number' => Yii::t('default', 'Address Number'),
diff --git a/instance.php b/instance.php
index 0737b0a2e..82e3c28b9 100644
--- a/instance.php
+++ b/instance.php
@@ -17,7 +17,7 @@
 $newdb = $domain . '.tag.ong.br';
 
 if ($domain == "localhost") {
-    $newdb = 'boquim25/11.tag.ong.br';
+    $newdb = 'boquim.tag.ong.br';
 }
 
 $_GLOBALGROUP = 0;
diff --git a/js/student/form/validations.js b/js/student/form/validations.js
index 5f4d2159e..11463382d 100755
--- a/js/student/form/validations.js
+++ b/js/student/form/validations.js
@@ -288,7 +288,7 @@ $(formIdentification + "nationality").change(function () {
                 .show()
                 .find("label")
                 .addClass("required")
-                .html("Estado *");
+                .html("Estado");
             $(formIdentification + "edcenso_city_fk")
                 .removeAttr("disabled")
                 .closest(".js-change-required")
diff --git a/themes/default/views/instructor/_form.php b/themes/default/views/instructor/_form.php
index 54953743e..ae780d2e3 100755
--- a/themes/default/views/instructor/_form.php
+++ b/themes/default/views/instructor/_form.php
@@ -117,10 +117,10 @@
                             <div class="separator"></div>
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'name',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -149,10 +149,10 @@
                             </div>
                             <div class="control-group instructor-civil-name" style="display: none;">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'civil_name',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     );
                                     ?>
                                 </div>
@@ -174,10 +174,10 @@
 
                             <div class="control-group" id="cpfInstructor">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'cpf',
-                                        array('class' => 'control-label required')
+                                        array('class' => 't-field-select__label--required')
                                     );
                                     ?>
                                 </div>
@@ -200,10 +200,10 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'email',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -226,10 +226,10 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'nis',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -252,10 +252,10 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'birthday_date',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div style="margin-left: 23px">
@@ -271,10 +271,10 @@
 
                             <div class="control-group" id="gender-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'sex',
-                                        array('class' => 'control-label ')
+                                        array('class' => 't-field-select__label--required ')
                                     );
                                     ?>
                                 </div>
@@ -295,10 +295,10 @@
 
                             <div class="control-group" id="colorRace">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'color_race',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     );
                                     ?>
                                 </div>
@@ -324,10 +324,10 @@
 
                             <div class="control-group" id="filiation-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'filiation',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -347,10 +347,10 @@
 
                             <div class="control-group" id="filiation-select_1">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'filiation_1',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -372,10 +372,10 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'filiation_2',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -400,10 +400,10 @@
                             <div class="separator"></div>
                             <div class="control-group" id="nationality_select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'nationality',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -424,10 +424,10 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'edcenso_nation_fk',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -448,10 +448,10 @@
                             </div>
                             <div class="control-group" id="state-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'edcenso_uf_fk',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -471,10 +471,10 @@
 
                             <div class="control-group" id="city-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorIdentification,
                                         'edcenso_city_fk',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -501,11 +501,11 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <label class="control-label required">
-                                        <?php echo $form->labelEx(
+                                    <label class="required">
+                                        <?php echo $form->label(
                                             $modelInstructorIdentification,
                                             'deficiency',
-                                            array('class' => 'control-label')
+                                            array('class' => 't-field-select__label--required')
                                         ); ?>
                                 </div>
                                 <div class="controls">
@@ -516,7 +516,7 @@
 
                             <div class="control-group deficiencies-container">
                                 <div class="controls">
-                                    <label class="control-label required">
+                                    <label class="required">
                                         <?php echo Yii::t('default', 'Deficiency Type'); ?>
                                         *
                                     </label>
@@ -673,10 +673,10 @@
                             <div class="control-group">
                                 <div class="controls">
                                     <?php
-                                    echo $form->labelEx(
+                                    echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'cep',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     );
                                     ?>
                                 </div>
@@ -704,10 +704,10 @@
                             <div class="control-group">
                                 <div class="controls">
                                     <?php
-                                    echo $form->labelEx(
+                                    echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'address',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     );
                                     ?>
                                 </div>
@@ -733,10 +733,10 @@
                             </div>
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'address_number',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -759,11 +759,11 @@
                             <div class="control-group">
                                 <div class="controls">
                                     <?php
-                                    echo $form->labelEx(
+                                    echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'complement',
                                         array(
-                                            'class' => 'control-label'
+                                            'class' => 't-field-select__label--required'
                                         )
                                     ); ?>
                                 </div>
@@ -782,11 +782,11 @@
                             </div>
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'neighborhood',
                                         array(
-                                            'class' => 'control-label'
+                                            'class' => 't-field-select__label--required'
                                         )
                                     ); ?>
                                 </div>
@@ -810,11 +810,11 @@
                             <div class="control-group">
                                 <div class="controls">
                                     <?php
-                                    echo $form->labelEx(
+                                    echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'edcenso_uf_fk',
                                         array(
-                                            'class' => 'control-label'
+                                            'class' => 't-field-select__label--required'
                                         )
                                     ); ?>
                                 </div>
@@ -834,10 +834,10 @@
                             </div>
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'edcenso_city_fk',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -859,10 +859,10 @@
                             </div>
                             <div class="control-group hide-responsive" id="location-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'diff_location',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -888,10 +888,10 @@
                             </div>
                             <div class="control-group" id="zone-select">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorDocumentsAndAddress,
                                         'area_of_residence',
-                                        array('class' => 'control-label required')
+                                        array('class' => 't-field-select__label--required required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -917,10 +917,10 @@
                             <div class="separator"></div>
                             <div class="control-group">
                                 <div class="controls">
-                                    <?php echo $form->labelEx(
+                                    <?php echo $form->label(
                                         $modelInstructorVariableData,
                                         'scholarity',
-                                        array('class' => 'control-label')
+                                        array('class' => 't-field-select__label--required')
                                     ); ?>
                                 </div>
                                 <div class="controls">
@@ -941,7 +941,7 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <label class="control-label">Pos-Graduação</label>
+                                    <label class="t-field-select__label--required">Pos-Graduação</label>
                                 </div>
                                 <div class="controls">
                                     <label class="checkbox">
@@ -995,7 +995,7 @@
 
                             <div class="control-group">
                                 <div class="controls">
-                                    <label class="control-label">Outros Cursos</label>
+                                    <label class="t-field-select__label--required">Outros Cursos</label>
                                 </div>
                                 <div class="controls">
                                     <label class="checkbox">
@@ -1269,11 +1269,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_situation_1',
                                                                     array(
-                                                                        'class' => 'control-label required indicator'
+                                                                        'class' => 't-field-text__label--required required indicator'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1288,11 +1288,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_formation_1',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1323,7 +1323,7 @@
                                                                     'default',
                                                                     'Area'
                                                                 ), 'high_education_course_area1', array(
-                                                                    'class' => 'control-label'
+                                                                    'class' => 't-field-select__label--required'
                                                                 ));
                                                                 ?>
                                                             </div>
@@ -1357,11 +1357,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_course_code_1_fk',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1387,11 +1387,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_initial_year_1',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1416,11 +1416,11 @@
                                                         </div>
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx(
+                                                                <?php echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_final_year_1',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1489,10 +1489,10 @@
 
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx(
+                                                                <?php echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_institution_code_1_fk',
-                                                                    array('class' => 'control-label required indicator')
+                                                                    array('class' => 't-field-select__label--required required indicator')
                                                                 ); ?>
 
                                                             </div>
@@ -1511,10 +1511,10 @@
                                                         <div class="separator"></div>
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx(
+                                                                <?php echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_situation_2',
-                                                                    array('class' => 'control-label required indicator')
+                                                                    array('class' => 't-field-select__label--required required indicator')
                                                                 ); ?>
                                                             </div>
                                                             <div class="controls">
@@ -1539,11 +1539,11 @@
 
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx(
+                                                                <?php echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_formation_2',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 ); ?>
                                                             </div>
@@ -1563,7 +1563,7 @@
 
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo CHtml::label(Yii::t('default', 'Area'), 'high_education_course_area2', array('class' => 'control-label')); ?>
+                                                                <?php echo CHtml::label(Yii::t('default', 'Area'), 'high_education_course_area2', array('class' => 't-field-select__label--required')); ?>
                                                             </div>
                                                             <div class="controls">
                                                                 <?php echo CHtml::DropDownList(
@@ -1589,11 +1589,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_course_code_2_fk',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1623,7 +1623,7 @@
 
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx($modelInstructorVariableData, 'high_education_initial_year_2', array('class' => 'control-label')); ?>
+                                                                <?php echo $form->label($modelInstructorVariableData, 'high_education_initial_year_2', array('class' => 't-field-select__label--required')); ?>
                                                             </div>
                                                             <div class="controls">
                                                                 <?php
@@ -1647,7 +1647,7 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx($modelInstructorVariableData, 'high_education_final_year_2', array('class' => 'control-label'));
+                                                                echo $form->label($modelInstructorVariableData, 'high_education_final_year_2', array('class' => 't-field-select__label--required'));
                                                                 ?>
                                                             </div>
                                                             <div class="controls">
@@ -1670,11 +1670,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_institution_code_2_fk',
                                                                     array(
-                                                                        'class' => 'control-label required indicator'
+                                                                        'class' => 't-field-select__label--required required indicator'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1708,11 +1708,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_situation_3',
                                                                     array(
-                                                                        'class' => 'control-label required indicator'
+                                                                        'class' => 't-field-select__label--required required indicator'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1744,11 +1744,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_formation_3',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1775,7 +1775,7 @@
                                                                     'default',
                                                                     'Area'
                                                                 ), 'high_education_course_area3', array(
-                                                                    'class' => 'control-label'
+                                                                    'class' => 't-field-select__label--required'
                                                                 ));
                                                                 ?>
                                                             </div>
@@ -1805,11 +1805,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_course_code_3_fk',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1841,11 +1841,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_initial_year_3',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1872,11 +1872,11 @@
 
                                                         <div class="control-group">
                                                             <div class="controls">
-                                                                <?php echo $form->labelEx(
+                                                                <?php echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_final_year_3',
                                                                     array(
-                                                                        'class' => 'control-label'
+                                                                        'class' => 't-field-select__label--required'
                                                                     )
                                                                 );
                                                                 ?>
@@ -1903,11 +1903,11 @@
                                                         <div class="control-group">
                                                             <div class="controls">
                                                                 <?php
-                                                                echo $form->labelEx(
+                                                                echo $form->label(
                                                                     $modelInstructorVariableData,
                                                                     'high_education_institution_code_3_fk',
                                                                     array(
-                                                                        'class' => 'control-label required indicator'
+                                                                        'class' => 't-field-select__label--required required indicator'
                                                                     )
                                                                 );
                                                                 ?>
diff --git a/themes/default/views/student/_form.php b/themes/default/views/student/_form.php
index 298630428..0da6d8c0b 100755
--- a/themes/default/views/student/_form.php
+++ b/themes/default/views/student/_form.php
@@ -276,9 +276,9 @@
                         <!-- Nacionalidade  -->
                         <div class="column clearleft is-two-fifths">
                             <div class="t-field-select" id="nationality-select">
-                                <?php echo $form->label($modelStudentIdentification, 'nationality', array('class' => 't-field-select__label--required')); ?>
-                                <?php
-                                echo $form->dropDownList(
+                                <?= $form->label($modelStudentIdentification, 'nationality', array('class' => 't-field-select__label--required')); ?>
+                                <?=
+                                 $form->dropDownList(
                                     $modelStudentIdentification,
                                     'nationality',
                                     array(null => "Selecione a nacionalidade", "1" => "Brasileira", "2" => "Brasileira: Nascido no exterior ou Naturalizado", "3" => "Estrangeira"),