diff --git a/views/delivery/_form.php b/views/delivery/_form.php
index dd7773e..c4105f8 100755
--- a/views/delivery/_form.php
+++ b/views/delivery/_form.php
@@ -22,13 +22,13 @@
             'form'       => $form,
         ]
     ) ?>
-    
+
     <?= $form->field($model, 'sort')
              ->textInput() ?>
-    
+
     <?= $form->field($model, 'value')
              ->textInput() ?>
-    
+
     <?= $form->field($model, 'status')
              ->checkbox(
                  [
diff --git a/views/order/_form.php b/views/order/_form.php
index 8ac7643..01bd850 100755
--- a/views/order/_form.php
+++ b/views/order/_form.php
@@ -13,130 +13,142 @@
      * @var array                      $deliveries
      * @var array                      $payments
      * @var ActiveForm                 $form
+     * @var bool $isCreate
      */
 ?>
 
 <div class="order-form">
     
     <?php $form = ActiveForm::begin(); ?>
-    
+    <div class="x_panel">
+
+
     <?php
         //        if ($model->isNewRecord) {
         //            echo $form->field($model, 'user_id')
         //                      ->textInput();
         //        }
     ?>
-    
-    <?= $form->field($model, 'name')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'phone')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'email')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'city')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'address')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'comment')
-             ->textarea() ?>
-    
-    <?= $form->field($model, 'label_id')
-             ->dropDownList($labels) ?>
-    
-    <?= $form->field($model, 'delivery_id')
-             ->dropDownList($deliveries) ?>
-    
-    <?= $form->field($model, 'payment_id')
-             ->dropDownList($payments) ?>
-  
-  <div class="ln_solid"></div>
-  
-  <div class="order-product-container">
-    <div class="row">
-      <div class="col-md-8">
-          <?php
-              echo Select2::widget(
-                  [
-                      'name'          => 'add-to-order',
-                      'options'       => [
-                          'placeholder' => \Yii::t('order', 'Select product'),
-                      ],
-                      'pluginOptions' => [
-                          'allowClear'         => true,
-                          'minimumInputLength' => 3,
-                          'language'           => [
-                              'errorLoading' => new JsExpression(
-                                  "function() {return '" . \Yii::t('order', 'Waiting for results') . "'; }"
-                              ),
-                          ],
-                          'ajax'               => [
-                              'url'      => Url::to([ 'product-list' ]),
-                              'dataType' => 'json',
-                              'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
-                          ],
-                          'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
-                          'templateResult'     => new JsExpression('function(city) { return city.text; }'),
-                          'templateSelection'  => new JsExpression('function (city) { return city.text; }'),
-                      ],
-                      'id'            => 'add-to-order',
-                  ]
-              );
-          ?>
-      </div>
-      <div class="col-md-3">
-          <?php
-              echo Html::textInput(
-                  'count-to-order',
-                  null,
-                  [
-                      'class' => 'form-control',
-                      'id'    => 'count-to-order',
-                  ]
-              );
-          ?>
-      </div>
-      <div class="col-md-1">
-          <?php
-              echo Html::a(
-                  Html::icon(
-                      'plus-circle',
-                      [
-                          'prefix' => 'fa fa-',
-                      ]
-                  ),
-                  '#',
-                  [
-                      'class' => 'variant-to-order',
-                  ]
-              );
-          ?>
-      </div>
-    </div>
-    <div class="ln_solid"></div>
-    <div id="order-product-pjax" style="position: relative;">
-      <div class="row strong">
-        <div class="col-md-4">
-            <?php
-                echo Html::tag('strong', \Yii::t('order', 'Product'));
-            ?>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'name')
+                     ->textInput([ 'maxlength' => true ]) ?>
         </div>
-        <div class="col-md-4">
-            <?php
-                echo Html::tag('strong', \Yii::t('order', 'Price'));
-            ?>
+        <div class="wrapp-blocks-edit-page">
         </div>
-        <div class="col-md-4">
-            <?php
-                echo Html::tag('strong', \Yii::t('order', 'Count'));
-            ?>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'phone')
+                     ->textInput([ 'maxlength' => true ]) ?>
         </div>
-      </div>
-      <div id="product-rows">
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'email')
+                     ->textInput([ 'maxlength' => true ]) ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'city')
+                     ->textInput([ 'maxlength' => true ]) ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'address')
+                     ->textInput([ 'maxlength' => true ]) ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'comment')
+                     ->textarea() ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'label_id')
+                     ->dropDownList($labels) ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'delivery_id')
+                     ->dropDownList($deliveries) ?>
+        </div>
+        <div class="wrapp-blocks-edit-page">
+            <?= $form->field($model, 'payment_id')
+                     ->dropDownList($payments) ?>
+        </div>
+    </div>
+
+    <div class="x_panel">
+        <div class="order-product-container wrapp-blocks-edit-page">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="row">
+                <div class="col-md-9">
+                    <label>Добавить еще товар</label>
+                    <?php
+                    echo Select2::widget(
+                        [
+                            'name'          => 'add-to-order',
+                            'options'       => [
+                                'placeholder' => \Yii::t('order', 'Select product'),
+                            ],
+                            'pluginOptions' => [
+                                'allowClear'         => true,
+                                'minimumInputLength' => 3,
+                                'language'           => [
+                                    'errorLoading' => new JsExpression(
+                                        "function() {return '" . \Yii::t('order', 'Waiting for results') . "'; }"
+                                    ),
+                                ],
+                                'ajax'               => [
+                                    'url'      => Url::to([ 'product-list' ]),
+                                    'dataType' => 'json',
+                                    'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
+                                ],
+                                'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
+                                'templateResult'     => new JsExpression('function(city) { return city.text; }'),
+                                'templateSelection'  => new JsExpression('function (city) { return city.text; }'),
+                            ],
+                            'id'            => 'add-to-order',
+                        ]
+                    );
+                    ?>
+                </div>
+                <div class="col-md-2">
+                    <?php
+                    $idInput = 'count-to-order';
+                    echo '<label for="'.$idInput.'">КОЛ-ВО</label>';
+                    echo Html::textInput(
+                        'count-to-order',
+                        1,
+                        [
+                            'class' => 'form-control',
+                            'id'    => $idInput,
+                        ]
+                    );
+                    ?>
+                </div>
+                <a class="variant-to-order  btn btn-success add-goods-order" href="#">
+                    <i class="fa fa-plus"></i>
+                </a>
+            </div>
+        </div>
+    </div>
+
+    <div id="order-product-pjax" class="row">
+        <div class="col-xs-12 order-goods-th"<?=$isCreate ? ' style="display: none;"' : ''?>>
+            <div class="row">
+                <div class="col-md-7">
+                    <?php
+                    echo Html::tag('label', \Yii::t('order', 'Product'));
+                    ?>
+                </div>
+                <div class="col-md-2">
+                    <?php
+                    echo Html::tag('label', \Yii::t('order', 'Price'));
+                    ?>
+                </div>
+                <div class="col-md-2">
+                    <?php
+                    echo Html::tag('label', \Yii::t('order', 'Count'));
+                    ?>
+                </div>
+            </div>
+        </div>
+
+
+      <div id="product-rows" class="col-xs-12">
           <?php
               if (!$model->isNewRecord) {
                   $sum = 0;
@@ -158,20 +170,21 @@
           ?>
 
       </div>
-        <?php if (!$model->isNewRecord) {
-            echo( " <div class='sum_all'>Всего <p>" . $sum . "</p></div>" );
-        } ?>
+        <?php
+            echo( " <div class='sum_all col-xs-12'>Итого: <strong>" . $sum . "</strong></div>" );
+         ?>
     </div>
   </div>
-  
-  <div class="ln_solid"></div>
-  
-  <div class="form-group">
-      <?= Html::submitButton(
-          $model->isNewRecord ? Yii::t('order', 'Create') : Yii::t('order', 'Update'),
-          [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
-      ) ?>
-  </div>
+    </div>
+
+
+
+    <div class="style buttons-page-wr">
+        <?= Html::submitButton(
+            $model->isNewRecord ? Yii::t('order', 'Create') : Yii::t('order', 'Update'),
+            [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-success' ]
+        ) ?>
+    </div>
     
     <?php ActiveForm::end(); ?>
 
diff --git a/views/order/_order_product.php b/views/order/_order_product.php
index 16094ef..e4c103b 100644
--- a/views/order/_order_product.php
+++ b/views/order/_order_product.php
@@ -18,38 +18,24 @@
 ?>
 
 <div class="row row-order-product" data-price="<?= $price ?>">
-  <div class="col-md-4">
+  <div class="row-order-product-title col-md-7">
       <?php
           echo $form->field($orderProduct, "[$index]variant_id")
                     ->hiddenInput()
                     ->label(false);
-          echo $variant->product->lang->title . '(' . $variant->sku . ')';
+          echo $variant->product->lang->title . '<span class="sku"> (sku - ' . $variant->sku . ')</span>';
       ?>
   </div>
-  <div class="col-md-4">
+  <div class="row-order-product-price col-md-2">
       <?php echo $price; ?>
   </div>
-  <div class="col-md-3">
+  <div class="row-order-product-num col-md-2">
       <?php
           echo $form->field($orderProduct, "[$index]count")
                     ->textInput([ 'class' => 'count' ])
                     ->label(false);
       ?>
   </div>
-  <div class="col-md-1">
-      <?php
-          echo Html::a(
-              Html::icon(
-                  'trash-o',
-                  [
-                      'prefix' => 'fa fa-',
-                  ]
-              ),
-              '#',
-              [
-                  'class' => 'remove-order-product',
-              ]
-          )
-      ?>
-  </div>
+    <a href="#" class="btn-danger btn btn-danger btn remove-order-product"></a>
+    <div class="col-xs-12 row-order-product-line"><div></div></div>
 </div>
diff --git a/views/order/create.php b/views/order/create.php
index cea9462..e873b78 100755
--- a/views/order/create.php
+++ b/views/order/create.php
@@ -26,8 +26,10 @@
             ]
         );
     ?>
-  <h1><?= Html::encode($this->title) ?></h1>
-    
+
+    <?php
+    $xPanel::end();
+    ?>
     <?= $this->render(
         '_form',
         [
@@ -35,10 +37,9 @@
             'labels'     => $labels,
             'payments'   => $payments,
             'deliveries' => $deliveries,
+            'isCreate' => true
         ]
     ) ?>
     
-    <?php
-        $xPanel::end();
-    ?>
+
 </div>
diff --git a/views/order/update.php b/views/order/update.php
index eec182e..bc037f6 100755
--- a/views/order/update.php
+++ b/views/order/update.php
@@ -39,6 +39,9 @@
             ]
         );
     ?>
+    <?php
+    $xPanel::end();
+    ?>
     
     <?= $this->render(
         '_form',
@@ -47,10 +50,9 @@
             'labels'     => $labels,
             'payments'   => $payments,
             'deliveries' => $deliveries,
+            'isCreate' => false,
         ]
     ) ?>
     
-    <?php
-        $xPanel::end();
-    ?>
+
 </div>
diff --git a/web/js/order.js b/web/js/order.js
index dbc5dd4..7e60da9 100755
--- a/web/js/order.js
+++ b/web/js/order.js
@@ -20,7 +20,14 @@ $(function() {
                 .children('p')
                 .text(total_price);
         });
-
+    $('#count-to-order').keypress(function(e) {
+        if (!(e.which==8 ||(e.which>47 && e.which<58))) return false;
+    });
+    $('#count-to-order').change(function(e) {
+        if ($(this).val() <= 0) {
+            $(this).val('1')
+        }
+    });
     $(document)
         .on('click', '.variant-to-order', function(e) {
             e.preventDefault();
@@ -28,10 +35,18 @@ $(function() {
             var count = $('#count-to-order');
             var order = $(this)
                 .data('id');
-            if (id.val() && count.val()) {
+            if (id.val() ) {
+                if(count.val()<=0) {
+                    var newCountVal = count.val();
+                } else {
+                    var newCountVal = 1;
+                }
+
+                $('.order-goods-th').css({display:'block'});
+
                 $.post('/admin/order/add-to-order', {
                     id: id.val(),
-                    count: count.val(),
+                    count: newCountVal,
                     order: order
                 }, function(data) {
                     if (data.success) {
@@ -43,7 +58,7 @@ $(function() {
                             .html(parseInt(sum) + parseInt(data.price));
                         $('#product-rows')
                             .append(data.row);
-
+                        $('#add-to-order').select2("val", "");
                     }
 
                 });
--
libgit2 0.21.4