diff --git a/frontend/views/accounts/_job_form.php b/frontend/views/accounts/_job_form.php
index 0c6dd5b..29560f4 100755
--- a/frontend/views/accounts/_job_form.php
+++ b/frontend/views/accounts/_job_form.php
@@ -11,34 +11,65 @@ $model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
 $form = ActiveForm::begin ();
 ?>
 <div class='ajax-loaded'><div class='prev_job_inputs'>
-        <?= $form->field ($model, '[' . $index . ']name')
-            ->label ('Название')
-            ->textInput ();
-        ?>
-        <?= $form->field ($model, '[' . $index . ']link')
-            ->label ('Ссылка на компанию на сайте МФП')
-            ->textInput ();
-        ?>
-        <?= $form->field ($model, '[' . $index . ']date_start')
-            ->label ('Дата начала работы')
-            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-        ?>
-        <?= $form->field ($model, '[' . $index . ']date_end')
-            ->label ('Дата окончания работы')
-            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
-        ?>
-        <?= $form->field ($model, '[' . $index . ']position')
-            ->label ('Должность')
-            ->textInput ();
-        ?>
-        <?= $form->field ($model, '[' . $index . ']total_count')
-            ->label ('Количество проектов, в которых принимали участие')
-            ->input ('number');
-        ?>
-        <?= $form->field ($model, '[' . $index . ']complete_count')
-            ->label ('из них реализовано')
-            ->input ('number');
-        ?>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($model, '[' . $index . ']name')
+                    ->label ('Название')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($model, '[' . $index . ']link')
+                    ->label ('Ссылка на компанию на сайте МФП')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field ($model, '[' . $index . ']date_start')
+                    ->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 ($model, '[' . $index . ']date_end')
+                    ->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 ($model, '[' . $index . ']position')
+                    ->label ('Должность')
+                    ->textInput (['class'=> 'custom-input-2']);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper admin-quantity-project">
+            <div class="input-blocks">
+                <?= $form->field ($model, '[' . $index . ']total_count')
+                    ->label ('Количество проектов, в которых принимали участие')
+                    ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
+                ?>
+
+                <div class="fix-quantity-project">
+                    <?= $form->field ($model, '[' . $index . ']complete_count')
+                        ->label ('из них реализовано')
+                        ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
+                    ?>
+                </div>
+            </div>
+        </div>
+
         <?= Html::button('', ['class' => 'remove_job_button']);?>
     </div></div>
 <?php $form->end (); ?>
diff --git a/frontend/views/accounts/employment.php b/frontend/views/accounts/employment.php
index 4e57484..5631355 100755
--- a/frontend/views/accounts/employment.php
+++ b/frontend/views/accounts/employment.php
@@ -15,9 +15,9 @@ $this->params['breadcrumbs'][] = $this->title;
 $form = ActiveForm::begin ();
 $current = array_shift ($job);
 ?>
-<div class="current_job_container">
+<div class="current_job_container style">
     <div class="login-left-column-title-two style">Текущее место работы:</div>
-    <div class="current_job_inputs">
+    <div class="current_job_inputs first_current_job_inputs border-general style">
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
                 <?= $form->field ($current, '[0]name')
@@ -49,47 +49,57 @@ $current = array_shift ($job);
             <div class="input-blocks">
                 <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
                     ->label ('Дата начала работы')
-                    ->widget (DatePicker::className (), ['options' => ['class' => 'testclass'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
+                    ->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-wrapper admin-quantity-project">
             <div class="input-blocks">
                 <?= $form->field ($current, '[0]total_count')
                     ->label ('Количество проектов, в которых принимали участие')
-                    ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                    ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
                 ?>
+                <div class="fix-quantity-project">
+                    <?= $form->field ($current, '[0]complete_count')
+                        ->label ('из них реализовано')
+                        ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
+                    ?>
+                </div>
             </div>
+
+
+
         </div>
 
+    </div>
+    <div class="current_job_inputs border-general style">
         <div class="input-blocks-wrapper">
             <div class="input-blocks">
-                <?= $form->field ($current, '[0]complete_count')
-                    ->label ('из них реализовано')
-                    ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                <?= $form->field ($current, '[0]date_start')
+                    ->label ('Когда начали заниматься проектированием')
+                    ->textInput (['class'=> 'custom-input-2']);
                 ?>
             </div>
         </div>
-
     </div>
 </div>
-<div class="prev_job_container">
-    <p>Предыдущие места работы</p>
+<div class="prev_job_container style">
+    <div class="login-left-column-title-two previous-employment-wr style">Предыдущие места работы</div>
     <?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) .']name')
+                            ->label ('Название')
+                            ->textInput (['class'=> 'custom-input-2']);
+                        ?>
+                    </div>
+                </div>
 
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
@@ -102,7 +112,7 @@ $current = array_shift ($job);
 
                 <div class="input-blocks-wrapper">
                     <div class="input-blocks">
-                        <?= $form->field ($current, '[0]date_start', ['options' => ['class' => 'test2class']])
+                        <?= $form->field ($current, '[0]date_start')
                             ->label ('Дата начала работы')
                             ->widget (DatePicker::className (), ['options' => ['class' => 'custom-input-2'], 'language' => 'ru', 'dateFormat' => 'dd-MM-yyyy', 'clientOptions' => ['changeYear' => true, 'yearRange' => 'c-20:c', 'changeMonth' => true]]);
                         ?>
@@ -113,7 +123,7 @@ $current = array_shift ($job);
                     <div class="input-blocks">
                         <?= $form->field ($job_model, '['. ($index + 1) .']date_end')
                             ->label ('Дата окончания работы')
-                            ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                            ->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>
@@ -127,32 +137,40 @@ $current = array_shift ($job);
                     </div>
                 </div>
 
-                <div class="input-blocks-wrapper">
+                <div class="input-blocks-wrapper admin-quantity-project">
                     <div class="input-blocks">
                         <?= $form->field ($job_model, '['. ($index + 1) .']total_count')
                             ->label ('Количество проектов, в которых принимали участие')
-                            ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
                         ?>
-                    </div>
-                </div>
-
-                <div class="input-blocks-wrapper">
-                    <div class="input-blocks">
+                        <div class="fix-quantity-project">
                         <?= $form->field ($job_model, '['. ($index + 1) .']complete_count')
                             ->label ('из них реализовано')
-                            ->textInput (['class'=> 'custom-input-2','type'=>'number']);
+                            ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']);
                         ?>
                     </div>
+                    </div>
                 </div>
-                <?= Html::button('Удалить', ['class' => 'remove_job_button']) ?>
-            </div>
+                <?= Html::button('', ['class' => 'remove_job_button']) ?>
+    </div>
             <?php } ?>
 
-        </div>
+</div>
+
+<div class="add-field-employment fix_add-field-employment style">
+    <?=
+     Html::button('добавить еще место работы', ['id' => 'add_job_button', 'class' => 'btn']);
+    ?>
+</div>
+
+
+<div class="input-blocks-wrapper">
+    <div class="admin-save-btn skills-save-btn  style">
+        <?= Html::submitButton('Сохранить',['class'=>'input-blocks-wrapper button']) ?>
+    </div>
+</div>
         <?php
-        echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
-        echo Html::submitButton('Обновить');
-        $form->end ();
+             $form->end ();
         ?>
 <script>
     $(function() {
@@ -164,16 +182,34 @@ $current = array_shift ($job);
             var lastindex;
             if(result != null) {
                 lastindex = result[1];
+                console.log('111111111')
             } else {
                 lastindex = 1;
+                $('.prev_job_container').removeClass('none-job-inputs')
+                $('.add-field-employment').removeClass('none-job-inputs')
             }
             $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
                 $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
                 $(data).filter('script').appendTo('body');
             });
+
         });
         $(document).on('click', '.remove_job_button', function() {
-            $(this).parents('.prev_job_inputs').remove();
+            $(this).parents('.prev_job_inputs').remove()
+            var prevEmploy =  $('.prev_job_inputs').length
+            if(prevEmploy<1){
+                $('.prev_job_container').addClass('none-job-inputs')
+                $('.add-field-employment').addClass('none-job-inputs')
+            }
         });
     });
 </script>
+
+<script>
+//    $(document).ready(function(){
+//      var prevEmploy =  $('.prev_job_inputs').length
+//        if(prevEmploy<1){
+//            $('.prev_job_container').addClass
+//        }
+//    })
+</script>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 2323753..7340258 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -5504,4 +5504,4 @@ a.blog-new-link:hover{text-decoration: underline !important;}
     display: block;
     border: none;
     outline: none;
-}
+}
\ No newline at end of file
--
libgit2 0.21.4