diff --git a/common/models/Cities.php b/common/models/Cities.php
new file mode 100644
index 0000000..613e8e9
--- /dev/null
+++ b/common/models/Cities.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "cities".
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $is_active
+ * @property integer $parent
+ */
+class Cities extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'cities';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['is_active', 'parent'], 'integer'],
+            [['name'], 'string', 'max' => 255],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'name' => 'Name',
+            'is_active' => 'Is Active',
+            'parent' => 'Parent',
+        ];
+    }
+}
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index a488c50..6c5924b 100755
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -38,7 +38,7 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
-        'backend\assets\FileUploadAsset'
+        'backend\assets\FileUploadAsset',
     ];
     public $jsOptions = array(
         'position' => \yii\web\View::POS_HEAD
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 49634ae..bb12a84 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -47,7 +47,6 @@ return [
             'showScriptName' => false,
                 'rules' => [
                     'landing/<view:[\w-]+>' => 'landing/view',
-                    'site/city/<query:[\d]+>' => 'site/city',
                 ]
         ],
     ],
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 0429521..a8c69e1 100755
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -1,6 +1,7 @@
 <?php
 namespace frontend\controllers;
 
+use common\models\Cities;
 use common\models\Specialization;
 use common\models\UserInfo;
 use Yii;
@@ -49,21 +50,23 @@ class SiteController extends Controller
 
 
 
-    public function actionCity($query){
-            \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
-            $out = ['results' => ['id' => '', 'text' => '']];
-            if (!is_null($query)) {
-                $query = new Query();
-                $query->select('id, name AS text')
-                    ->from('city')
-                    ->where(['like', 'name', $query])
-                    ->limit(20);
-                $command = $query->createCommand();
-                $data = $command->queryAll();
-                $out['results'] = array_values($data);
-            }
-
-            return $out;
+    public function actionCity($q = null, $id = null) {
+        \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+        $out = ['results' => ['id' => '', 'text' => '']];
+        if (!is_null($q)) {
+            $query = new Query;
+            $query->select('id, name AS text')
+                ->from('cities')
+                ->where(['like', 'name', $q])
+                ->limit(20);
+            $command = $query->createCommand();
+            $data = $command->queryAll();
+            $out['results'] = array_values($data);
+        }
+        elseif ($id > 0) {
+            $out['results'] = ['id' => $id, 'text' => Cities::find($id)->name];
+        }
+        return $out;
     }
 
 
diff --git a/frontend/models/SignupForm.php b/frontend/models/SignupForm.php
index 774cd75..3b49ebe 100755
--- a/frontend/models/SignupForm.php
+++ b/frontend/models/SignupForm.php
@@ -17,6 +17,7 @@ class SignupForm extends Model
     public $lastname;
     public $verifyCode;
     public $location;
+    public $type;
 
     /**
      * @inheritdoc
@@ -39,6 +40,8 @@ class SignupForm extends Model
 
             ['verifyCode', 'captcha'],
 
+            ['type', 'integer'],
+
             ['password', 'required'],
             ['password', 'string', 'min' => 6],
         ];
diff --git a/frontend/views/site/registration.php b/frontend/views/site/registration.php
index d189a14..885dc2a 100644
--- a/frontend/views/site/registration.php
+++ b/frontend/views/site/registration.php
@@ -5,7 +5,9 @@
  */
     use yii\captcha\Captcha;
     use yii\widgets\ActiveForm;
-    $this->registerJsFile('/js/selectize.js');
+    use kartik\select2\Select2;
+    use yii\web\JsExpression;
+
 ?>
 <div class="section-box content">
     <div class="section-box registration">
@@ -48,18 +50,26 @@
                             <div class="who-you-are-title style">Кто Вы</div>
                             <div class="who-you-are-form-wr style">
                                 <div class="who-you-are-form">
-                                    <div class="check-radio-wr">
 
-                                        <div class="custom-form-buttons">
-                                            <input class="custom-radio" id="custom-radio-1" name="group-1" checked="checked" type="radio">
-                                            <label for="custom-radio-1"><span></span>Частное лицо copy</label>
-                                        </div>
 
-                                        <div class="custom-form-buttons">
-                                            <input class="custom-radio" id="custom-radio-2" name="group-1" type="radio">
-                                            <label for="custom-radio-2"><span></span>Компания</label>
-                                        </div>
-                                    </div>
+
+                                    <?= $form->field ($model, 'type',['options'=> ['class'=>'check-radio-wr']])
+                                        ->label (false)
+                                        ->radioList (
+                                            [1 => 'Частное лицо', 2 => 'Компания'],
+                                            [
+                                                'item' => function($index, $label, $name, $checked, $value) {
+                                                    $return = '<div class="custom-form-buttons">';
+                                                    $return .= '<input class="custom-radio" id="custom-radio-'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" >';
+                                                    $return .= '<label for="custom-radio-'.$value.'" ><span></span>' . $label .'</label>';
+                                                    $return .= '</div>';
+                                                    return $return;
+                                                }
+                                            ]
+                                        );
+                                    ?>
+
+
                                     <div class="check-radio-wr">
                                         <div class="custom-form-buttons">
                                             <input class="custom-check" id="custom-check-1" type="checkbox" checked>
@@ -75,36 +85,36 @@
 
                                     <div class="input-blocks-wrapper">
                                         <div class="input-blocks">
-                                            <label for="input-txt-4">Имя</label>
-                                            <input class="custom-input-2" id="input-txt-4" type="text">
+                                            <?= $form->field($model, 'firstname')->textInput(['class'=>'custom-input-2'])?>
                                         </div>
                                     </div>
                                     <div class="input-blocks-wrapper">
                                         <div class="input-blocks">
-                                            <label for="input-txt-5">Фамилия</label>
-                                            <input class="custom-input-2" id="input-txt-5" type="text">
-                                        </div>
-                                    </div>
-                                    <div class="input-blocks-wrapper city" >
-
-                                        <div class="control-group">
-                                            <div id="btnClear" style=""></div>
-
-                                            <label for="select-beast-w">Город</label>
-                                            <select id="select-beast-w" placeholder="">
-                                                <option value="">Выберите город</option>
-                                                <option value="4">Киев</option>
-                                                <option value="1">Одесса</option>
-                                                <option value="3">Харьков</option>
-                                                <option value="2">Днепр</option>
-                                                <option value="6">Чернигов</option>
-                                                <option value="8">Черкасы</option>
-                                                <option value="9">Черкасы</option>
-                                                <option value="5">Черкасы</option>
-                                            </select>
+                                            <?= $form->field($model, 'lastname')->textInput(['class'=>'custom-input-2'])?>
                                         </div>
                                     </div>
 
+                                    <?=
+                                        $form->field($model, 'location')->widget(Select2::classname(), [
+                                        'options' => ['placeholder' => 'Search for a city ...'],
+                                        'pluginOptions' => [
+                                            'allowClear' => true,
+                                            'minimumInputLength' => 3,
+                                            'ajax' => [
+                                                'url' => \yii\helpers\Url::to(['site/city']),
+                                                '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; }'),
+                                        ],
+                                    ]);
+                                    ?>
+
+
+
+
                                     <div class="input-blocks-wrapper city-two">
                                         <div class="input-blocks">
                                             <label for="input-txt-7">Город не в списке</label>
--
libgit2 0.21.4