diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index f780610..b41973e 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -15,7 +15,6 @@ $this->title = 'My Yii Application';
     </div>
 
     <div class="body-content">
-
         <div class="row">
             <div class="col-lg-4">
                 <h2>Heading</h2>
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index ec9cc06..9903776 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -16,6 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
     <p>Please fill out the following fields to login:</p>
 
     <div class="row">
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit. Alias aperiam aspernatur esse hic inventore iusto labore perspiciatis! Aliquam eligendi illum incidunt ipsum laboriosam nam, nostrum, odit possimus saepe unde voluptate!
         <div class="col-lg-5">
             <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
 
@@ -33,3 +34,4 @@ $this->params['breadcrumbs'][] = $this->title;
         </div>
     </div>
 </div>
+
diff --git a/common/config/params.php b/common/config/params.php
index 4ec9ba6..75bdbf8 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,4 +3,5 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
+
 ];
diff --git a/common/models/Language.php b/common/models/Language.php
index c9bc423..9446b20 100644
--- a/common/models/Language.php
+++ b/common/models/Language.php
@@ -34,7 +34,7 @@ class Language extends \yii\db\ActiveRecord
         self::$current = ($language === null) ? self::getDefaultLang() : $language;
         // задаем
         Yii::$app->language = self::$current->lang_code;
-        Yii::$app->lang_id = self::$current->language_id;
+        Yii::$app->params['lang_id'] = self::$current->language_id;
     }
     
     //Получения объекта языка по умолчанию
diff --git a/common/models/Menu.php b/common/models/Menu.php
index 7586f4b..930e209 100644
--- a/common/models/Menu.php
+++ b/common/models/Menu.php
@@ -30,7 +30,7 @@ class Menu extends \yii\db\ActiveRecord
                     AND `menu_location`.menu_location_name = "'.$location_name.'"  
                 INNER JOIN `termin` ON `termin`.termin_id = `menu`.termin_id
                 INNER JOIN `termin_lang` ON `termin_lang`.termin_id = `menu`.termin_id
-                    AND `termin_lang`.lang_id = '.yii::$app->lang_id.' 
+                    AND `termin_lang`.lang_id = '.yii::$app->params['lang_id.'].'
                 INNER JOIN `template` ON `template`.template_id = `termin_lang`.template_id 
             ORDER BY `menu`.level ASC, `menu`.sortorder ASC
         ')->queryAll();
@@ -41,7 +41,7 @@ class Menu extends \yii\db\ActiveRecord
             ->join(
                 'INNER JOIN', 
                 '`termin_lang`.termin_id = `menu`.termin_id', 
-                ['lang_id' => yii::$app->lang_id])
+                ['lang_id' => yii::$app->params['lang_id']])
             ->all();
 */
     }
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index a31eabd..087b960 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -261,11 +261,7 @@ class SiteController extends Controller
             'model' => $model,
         ]);
     }
-<<<<<<< 64aac2e6acdbc009a3b87da32cede2c5c6d7b17d
 
-=======
-    
->>>>>>> aa2b5a028dc8d6406f78928a067b2c853625fb95
     public function actionOptions() {
         $option_model = new Options();
         $option_list = $option_model->find()->where(1)->all();
@@ -316,9 +312,5 @@ class SiteController extends Controller
     	} else {
     		return $this->render('index');
     	}
-<<<<<<< 64aac2e6acdbc009a3b87da32cede2c5c6d7b17d
-
-=======
->>>>>>> aa2b5a028dc8d6406f78928a067b2c853625fb95
     }
 }
--
libgit2 0.21.4