diff --git a/common/widgets/views/courses_field.php b/common/widgets/views/courses_field.php
index 813fb22..eb1d586 100644
--- a/common/widgets/views/courses_field.php
+++ b/common/widgets/views/courses_field.php
@@ -10,6 +10,7 @@
 
     <div class="field_list">
     <?php $t = 0;
+    $label = 0; // add this var
         for($i = 1; $i <= count($model); $i++):
             $row = $i;
 
@@ -19,8 +20,14 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input type="text" placeholder="Курсы, тренинги" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][0][name]"/>
-            <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]"/>
+            <div class="input-blocks">
+                <input id="cours-name-<?= ++$label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][0][name]"/>
+                <label for="cours-name-<?= $label ?>">Название</label>
+            </div>
+            <div class="input-blocks">
+                <input id="cours-year-<?= ++$label  ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[courses][<?= $row ?>][1][year]"/>
+                <label for="cours-year-<?= $label ?>">год</label>
+            </div>
             <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
@@ -30,6 +37,7 @@
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
+    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
     $ (document)
         .ready (
             function ()
@@ -43,8 +51,14 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Курсы, тренинги" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
-                                            '<input type="number" class="form-control" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
+                                            '<div class="input-blocks">'+
+                                            '<input id="cours-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<label for="cours-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
+                                            '</div>'+
+                                            '<div class="input-blocks">'+
+                                            '<input id="cours-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[courses][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
+                                            '<label for="cours-year-' + start_label_<?=$this->context->id?>  +'">год</label>'+
+                                            '</div>'+
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
                             block.append (sub_block);
diff --git a/common/widgets/views/development_field.php b/common/widgets/views/development_field.php
index be4adc2..fece48c 100644
--- a/common/widgets/views/development_field.php
+++ b/common/widgets/views/development_field.php
@@ -8,6 +8,7 @@
 
     <div class="field_list">
     <?php $t = 0;
+    $label = 0; // add this var
         for($i = 1; $i <= count($model); $i++):
             $row = $i;
 
@@ -17,9 +18,15 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input type="text" placeholder="Название" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][0][name]"/>
-            <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]"/>
-            <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
+            <div class="input-blocks">
+                <input id="dev-name-<?= ++$label  ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][0][name]"/>
+                <label for="dev-name-<?= $label ?>">Название</label>
+            </div>
+             <div class="input-blocks">
+                <input id="dev-year-<?= ++$label  ?>" type="number" class="form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[development][<?= $row ?>][1][year]"/>
+                <label for="dev-year-<?= $label ?>">год</label>
+            </div>
+                 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
         <?php endfor; ?>
@@ -29,6 +36,7 @@
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
+    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
     $ (document)
         .ready (
             function ()
@@ -42,8 +50,14 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
-                                            '<input type="number" class="form-control" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
+                                            '<div class="input-blocks">'+
+                                            '<input id="dev-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="Телефон" class="form-control custom-input-2" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<label for="dev-name-' + start_label_<?=$this->context->id?> +'">Название</label>'+
+                                            '</div>'+
+                                            '<div class="input-blocks">'+
+                                             '<input id="dev-year-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[development][' + start_i_<?=$this->context->id?>++ + '][1][year]" />' +
+                                            '<label for="dev-year-' + start_label_<?=$this->context->id?> +'">год</label>'+
+                                            '</div>'+
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
                             console.log (block);
diff --git a/common/widgets/views/education_field.php b/common/widgets/views/education_field.php
index 6a7ddb3..d93dc54 100755
--- a/common/widgets/views/education_field.php
+++ b/common/widgets/views/education_field.php
@@ -21,22 +21,25 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input id="edu-name-<?= ++$label  ?>" type="text" placeholder="Название" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
-            <label for="edu-name-<?= $label ?>"></label>
-
-            <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
-            <label for="edu-to-<?= $label ?>"></label>
-
-            <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
-            <label for="edu-out-<?= $label ?>"></label>
-
+            <div class="input-blocks">
+                <input id="edu-name-<?= ++$label  ?>" type="text" placeholder="Название" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
+                <label for="edu-name-<?= $label ?>">Название ВУЗа</label>
+             </div>
+            <div class="input-blocks">
+                <input id="edu-to-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
+                <label for="edu-to-<?= $label ?>">год начала</label>
+            </div>
+            <div class="input-blocks">
+                <input id="edu-out-<?= ++$label ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
+                <label for="edu-out-<?= $label ?>">год окончания</label>
+            </div>
             <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
         <?php endfor; ?>
 
     </div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>">добавить еще</p>
 </fieldset>
 
 <script>
@@ -55,12 +58,18 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][0][name]" />' +
-                                            '<label for="edu-name-' + start_label_<?=$this->context->id?> +'"></label>'+
-                                            '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?> + '][1][year_from]" />' +
-                                            '<label for="edu-to-' + start_label_<?=$this->context->id?>  +'"></label>'+
+                                            '<div class="input-blocks">'+
+                                            '<input id="edu-name-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<label for="edu-name-' + start_label_<?=$this->context->id?> +'">Название ВУЗа</label>'+
+                                            '</div>'+
+                                            '<div class="input-blocks">'+
+                                            '<input id="edu-to-' + ++start_label_<?=$this->context->id?> +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
+                                            '<label for="edu-to-' + start_label_<?=$this->context->id?>  +'">год начала</label>'+
+                                            '</div>'+
+                                            '<div class="input-blocks">'+
                                             '<input id="edu-out-' + ++start_label_<?=$this->context->id?>  +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
-                                            '<label for="edu-out-' + start_label_<?=$this->context->id?> +'"></label>'+
+                                            '<label for="edu-out-' + start_label_<?=$this->context->id?> +'">год окончания</label>'+
+                                            '</div>'+
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
                             console.log (block);
diff --git a/frontend/views/accounts/add-skills.php b/frontend/views/accounts/add-skills.php
index cd91726..06e1930 100755
--- a/frontend/views/accounts/add-skills.php
+++ b/frontend/views/accounts/add-skills.php
@@ -17,7 +17,7 @@ use \common\widgets\MultiLangForm;
     $form = ActiveForm::begin();
 ?>
 <div class="skills-admin-wrapper style">
-    <div class="input-blocks-wrapper">
+    <div class="input-blocks-wrapper skills-programs">
         <div class="input-blocks">
             <?= FieldEditor::widget (
                 [
@@ -27,39 +27,39 @@ use \common\widgets\MultiLangForm;
         </div>
     </div>
 
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
+    <div class="input-blocks-wrapper skills-add-wr education-skills">
+
             <?= FieldEditor::widget (
                 [
                     'template' => 'education', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
                 ]
             ); ?>
-        </div>
+
     </div>
 
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
+    <div class="input-blocks-wrapper  skills-add-wr education-skills">
+
             <?= FieldEditor::widget (
                 [
                     'template' => 'development', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
                 ]
             ); ?>
-        </div>
+
     </div>
 
-    <div class="input-blocks-wrapper">
-        <div class="input-blocks">
+    <div class="input-blocks-wrapper  skills-add-wr education-skills">
+
             <?= FieldEditor::widget (
                 [
                     'template' => 'courses', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
                 ]
             ); ?>
-        </div>
+
     </div>
 
     <div class="input-blocks-wrapper">
-        <div class="input-blocks">
-            <?= Html::submitButton('Обновить') ?>
+        <div class="admin-save-btn skills-save-btn  style">
+            <?= Html::submitButton('Сохранить',['class'=>'input-blocks-wrapper button']) ?>
         </div>
     </div>
 </div>
diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php
index 9b01c95..d358fc2 100755
--- a/frontend/views/accounts/employment.php
+++ b/frontend/views/accounts/employment.php
@@ -1,92 +1,170 @@
 <?php
-    /**
-     * @var Job[] $job
-     */
-    use common\models\Job;
-    use yii\helpers\Html;
-    use yii\jui\DatePicker;
-    use yii\widgets\ActiveForm;
-
-    $this->title = 'Трудовой стаж';
-    $this->params['breadcrumbs'][] = $this->title;
+/**
+ * @var Job[] $job
+ */
+use common\models\Job;
+use yii\helpers\Html;
+use yii\jui\DatePicker;
+use yii\widgets\ActiveForm;
+
+$this->title = 'Трудовой стаж';
+$this->params['breadcrumbs'][] = $this->title;
 ?>
-    <h1><?= $this->title ?></h1>
+<div class="login-left-column-title"><?= $this->title ?></div>
 <?php
-    $form = ActiveForm::begin ();
-    $current = array_shift ($job);
+$form = ActiveForm::begin ();
+$current = array_shift ($job);
 ?>
-    <div class="current_job_container">
-        <p>Текущее место работы:</p>
-        <div class="current_job_inputs">
-            <?php
-                echo $form->field ($current, '[0]name')
-                          ->label ('Название')
-                          ->textInput ();
-                echo $form->field ($current, '[0]link')
-                          ->label ('Ссылка на компанию на сайте МФП')
-                          ->textInput ();
-                echo $form->field ($current, '[0]date_start')
-                          ->label ('Дата начала работы')
-                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-                echo $form->field ($current, '[0]position')
-                          ->label ('Должность')
-                          ->textInput ();
-                echo $form->field ($current, '[0]total_count')
-                          ->label ('Количество проектов, в которых принимали участие')
-                          ->input ('number');
-                echo $form->field ($current, '[0]complete_count')
-                          ->label ('из них реализовано')
-                          ->input ('number');
-            ?>
+<div class="current_job_container">
+    <div class="login-left-column-title-two style">Текущее место работы:</div>
+    <div class="current_job_inputs">
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]name')
+                    ->label ('Название')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]link')
+                    ->label ('Ссылка на компанию на сайте МФП')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]position')
+                    ->label ('Должность')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]date_start')
+                    ->label ('Дата начала работы')
+                    ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                ?>
+            </div>
         </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]total_count')
+                    ->label ('Количество проектов, в которых принимали участие')
+                    ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($current, '[0]complete_count')
+                    ->label ('из них реализовано')
+                    ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                ?>
+            </div>
+        </div>
+
     </div>
-    <div class="prev_job_container">
-        <p>Предыдущие места работы</p>
+</div>
+<div class="prev_job_container">
+    <p>Предыдущие места работы</p>
+    <?php
+    foreach ($job as $index => $job_model)
+    {
+    ?>
+
+    <div class='prev_job_inputs'>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($job_model, '['. ($index + 1) .']name')
+                    ->label ('Название')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+</div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($job_model, '['. ($index + 1) .']link')
+                            ->label ('Ссылка на компанию на сайте МФП')
+                            ->textInput (['class'=> 'custom-input-2']);
+                        ?>
+                    </div>
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
+                            ->label ('Дата начала работы')
+                            ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
+                        ?>
+                    </div>
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($job_model, '['. ($index + 1) .']date_end')
+                            ->label ('Дата окончания работы')
+                            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                        ?>
+                    </div>
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($job_model, '['. ($index + 1) .']position')
+                            ->label ('Должность')
+                            ->textInput (['class'=> 'custom-input-2']);
+                        ?>
+                    </div>
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($job_model, '['. ($index + 1) .']total_count')
+                            ->label ('Количество проектов, в которых принимали участие')
+                            ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                        ?>
+                    </div>
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <div class="input-blocks">
+                        <?= $form->field ($job_model, '['. ($index + 1) .']complete_count')
+                            ->label ('из них реализовано')
+                            ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                        ?>
+                    </div>
+                </div>
+
+            </div>
+            <?php } ?>
+
+        </div>
         <?php
-            foreach ($job as $index => $job_model)
-            {
-                echo "<div class='prev_job_inputs'>";
-                echo $form->field ($job_model, '['. ($index + 1) .']name')
-                          ->label ('Название')
-                          ->textInput ();
-                echo $form->field ($job_model, '['. ($index + 1) .']link')
-                          ->label ('Ссылка на компанию на сайте МФП')
-                          ->textInput ();
-                echo $form->field ($job_model, '['. ($index + 1) .']date_start')
-                          ->label ('Дата начала работы')
-                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-                echo $form->field ($job_model, '['. ($index + 1) .']date_end')
-                          ->label ('Дата окончания работы')
-                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-                echo $form->field ($job_model, '['. ($index + 1) .']position')
-                          ->label ('Должность')
-                          ->textInput ();
-                echo $form->field ($job_model, '['. ($index + 1) .']total_count')
-                          ->label ('Количество проектов, в которых принимали участие')
-                          ->input ('number');
-                echo $form->field ($job_model, '['. ($index + 1) .']complete_count')
-                          ->label ('из них реализовано')
-                          ->input ('number');
-                echo "</div>";
-            }
+        echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
+        echo Html::submitButton('Обновить');
+        $form->end ();
         ?>
-    </div>
-<?php
-    echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
-    echo Html::submitButton('Обновить');
-    $form->end ();
-?>
-<script>
-    $(function() {
-        var regexp = /^[\w]+\[(\d+)\].*$/;
-        $(document).on('click', '#add_job_button', function() {
-            var inputs = $('.prev_job_inputs').last();
-            var name = $(inputs).find('input, textarea').first().attr('name');
-            var lastindex = regexp.exec(name)[1];
-            $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
-                $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
-                $(data).filter('script').appendTo('body');
+        <script>
+            $(function() {
+                var regexp = /^[\w]+\[(\d+)\].*$/;
+                $(document).on('click', '#add_job_button', function() {
+                    var inputs = $('.prev_job_inputs').last();
+                    var name = $(inputs).find('input, textarea').first().attr('name');
+                    var lastindex = regexp.exec(name)[1];
+                    $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
+                        $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
+                        $(data).filter('script').appendTo('body');
+                    });
+                });
             });
-        });
-    });
-</script>
+        </script>
diff --git a/frontend/views/accounts/setting.php b/frontend/views/accounts/setting.php
index bc0675f..ed60f9d 100755
--- a/frontend/views/accounts/setting.php
+++ b/frontend/views/accounts/setting.php
@@ -12,7 +12,7 @@
     $this->params['breadcrumbs'][] = $this->title;
 ?>
 
-<h1><?= $this->title ?></h1>
+<div class="login-left-column-title"><?= $this->title ?></div>
 
 <?php
     if (\Yii::$app->session->hasFlash ('passwordupdate'))
@@ -27,18 +27,38 @@
         <?
     }
     $form = ActiveForm::begin ();
-    echo "<p>Сменить пароль:</p>";
-    echo $form->field ($user, 'old_password', ['template' => "{input}{label}\n{hint}\n{error}"])
-              ->label ('Старый пароль')
-              ->passwordInput (['value' => '']);
-    echo $form->field ($user, 'new_password', ['template' => "{input}{label}\n{hint}\n{error}"])
-              ->label ('Новый пароль')
-              ->passwordInput (['value' => '']);
-    echo $form->field ($user, 'password_reply', ['template' => "{input}{label}\n{hint}\n{error}"])
-              ->label ('Повторите пароль')
-              ->passwordInput (['value' => '']);
-    echo Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
-    $form->end ();
 ?>
+    <div class="login-left-column-title-two style">Сменить пароль:</div>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field ($user, 'old_password', ['template' => "{label}{input}\n{hint}\n{error}"])
+                      ->label ('Старый пароль')
+                      ->passwordInput (['value' => '','class'=>'custom-input-2']);
+        ?>
+    </div>
+</div>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field ($user, 'new_password', ['template' => "{label}{input}\n{hint}\n{error}"])
+                      ->label ('Новый пароль')
+                        ->passwordInput (['value' => '','class'=>'custom-input-2']);
+        ?>
+    </div>
+</div>
+<div class="input-blocks-wrapper">
+    <div class="input-blocks">
+        <?= $form->field ($user, 'password_reply', ['template' => "{label}{input}\n{hint}\n{error}"])
+                      ->label ('Повторите пароль')
+                      ->passwordInput (['value' => '','class'=>'custom-input-2']);
+        ?>
+    </div>
+</div>
+<div class="input-blocks-wrapper">
+    <div class="admin-save-btn skills-save-btn line-btn-fix style">
+        <?= Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
+            $form->end ();
+        ?>
+    </div>
+</div>
 
 
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 102b92c..03e58e3 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -5423,7 +5423,9 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     border-bottom: 1px dashed #0072bc;
     padding: 0;
     border-radius: 0;
-    line-height: 13px;
+    line-height: 10px;
+    margin-left: 193px;
+    margin-top: 7px;
 }
 .skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active{
     background: none;
@@ -5447,11 +5449,47 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 .skills-admin-wrapper .glyphicon {
     position: absolute;
     top: 50%;
-    margin-top: -7px;
-    right: -18px;
+    margin-top: -3px;
+    left: 311px;
 }
+
+.education-skills .glyphicon {top: 13px; margin-top: 0; margin-left: 105px}
 .custom-input-2.custom-input-2-date {
     width: 60px;
     padding: 0;
     padding-left: 12px;
-}
\ No newline at end of file
+}
+.skills-admin-wrapper .input-blocks label{
+    float: left;
+    height: 29px;
+    line-height: 29px;
+    cursor: pointer;
+    margin-top: 5px;
+    margin-left: 11px;
+}
+.skills-admin-wrapper .input-blocks input {float: left}
+.skills-admin-wrapper .form-group{position: relative; float: left}
+.skills-add-wr .input-blocks{
+    width: 100%;
+}
+
+.skills-add-wr .form-group{margin-top: 20px}
+.skills-add-wr .form-group:first-child{margin-top: 5px}
+
+.skills-add-wr .form-group:first-child .input-blocks{margin-top: 5px}
+.skills-add-wr .form-group .input-blocks{margin-top: 5px}
+.skills-add-wr .form-group:first-child .input-blocks:first-child{margin-top: 0}
+.skills-programs .input-blocks input {margin-top: 10px}
+.skills-programs .input-blocks .form-group:first-child input {margin-top: 5px}
+.skills-save-btn {
+    border-top: 1px solid #dbdbdb;
+    padding-top: 28px;
+    margin-top: 19px;
+}
+.login-left-column-title-two {
+    font-size: 18px;
+    margin-top: 28px;
+}
+.line-btn-fix button{line-height: normal !important;}
+a.blog-new-link{font-size: 18px !important; color: inherit !important; text-decoration: none!important;}
+a.blog-new-link:hover{text-decoration: underline !important;}
\ No newline at end of file
--
libgit2 0.21.4