diff --git a/components/ActionButtonColumn.php b/components/ActionButtonColumn.php
new file mode 100644
index 0000000..1cebdc2
--- /dev/null
+++ b/components/ActionButtonColumn.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace app\components;
+
+use rmrevin\yii\fontawesome\FA;
+use Yii;
+use yii\grid\ActionColumn;
+use yii\helpers\Html;
+
+/**
+ * ActionButtonGroupColumn is a ActionColumn for the [[GridView]] widget that displays buttons for viewing and manipulating the items
+ * grouped into div.btn-group
+ *
+ * To add an ActionButtonGroupColumn to the gridview, add it to the [[GridView::columns|columns]] configuration as follows:
+ *
+ * ```php
+ * 'columns' => [
+ *     // ...
+ *     [
+ *         'class' => ActionButtonGroupColumn::className(),
+ *         // you may configure additional properties here
+ *     ],
+ * ]
+ * ```
+ *
+ * @author Alex Solomaha <cyanofresh@gmail.com>
+ */
+class ActionButtonColumn extends ActionColumn
+{
+    public $contentOptions = [
+        'class' => 'action-column',
+    ];
+
+    protected function initDefaultButtons()
+    {
+        if (!isset($this->buttons['view'])) {
+            $this->buttons['view'] = function ($url, $model, $key) {
+                return Html::a(FA::i('eye'), $url, array_merge([
+                    'title' => Yii::t('yii', 'View'),
+                    'class' => 'btn btn-ar btn-default btn-xs',
+                ], $this->buttonOptions));
+            };
+        }
+        if (!isset($this->buttons['update'])) {
+            $this->buttons['update'] = function ($url, $model, $key) {
+                return Html::a(FA::i('pencil'), $url, array_merge([
+                    'title' => Yii::t('yii', 'Update'),
+                    'class' => 'btn btn-ar btn-primary btn-xs',
+                ], $this->buttonOptions));
+            };
+        }
+        if (!isset($this->buttons['delete'])) {
+            $this->buttons['delete'] = function ($url, $model, $key) {
+                return Html::a(FA::i('trash'), $url, array_merge([
+                    'title' => Yii::t('yii', 'Delete'),
+                    'class' => 'btn btn-ar btn-danger btn-xs',
+                    'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
+                    'data-method' => 'post',
+                ], $this->buttonOptions));
+            };
+        }
+    }
+}
diff --git a/config/main.php b/config/main.php
index 0f7fbec..e503cec 100644
--- a/config/main.php
+++ b/config/main.php
@@ -5,6 +5,7 @@ $params = require(__DIR__ . '/params.php');
 return [
     'id' => 'basic',
     'name' => 'SmartHome',
+    'sourceLanguage' => 'ru',
     'language' => 'ru',
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
@@ -67,6 +68,11 @@ return [
             ],
         ],
     ],
+    'modules' => [
+        'admin' => [
+            'class' => 'app\modules\admin\Module',
+        ],
+    ],
     'params' => $params,
     'defaultRoute' => ['panel/index'],
 ];
diff --git a/modules/admin/Module.php b/modules/admin/Module.php
new file mode 100644
index 0000000..2eeba75
--- /dev/null
+++ b/modules/admin/Module.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\modules\admin;
+
+use Yii;
+
+/**
+ * admin module definition class
+ */
+class Module extends \yii\base\Module
+{
+    /**
+     * @inheritdoc
+     */
+    public $controllerNamespace = 'app\modules\admin\controllers';
+
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+
+        Yii::$app->view->params['breadcrumbs'][] = ['label' => 'Админпанель', 'url' => ['/admin/default/index']];
+    }
+}
diff --git a/controllers/BoardController.php b/modules/admin/controllers/BoardController.php
similarity index 98%
rename from controllers/BoardController.php
rename to modules/admin/controllers/BoardController.php
index eb3f44e..a5e14f3 100644
--- a/controllers/BoardController.php
+++ b/modules/admin/controllers/BoardController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\modules\admin\controllers;
 
 use Yii;
 use app\models\Board;
diff --git a/modules/settings/controllers/DefaultController.php b/modules/admin/controllers/DefaultController.php
similarity index 73%
rename from modules/settings/controllers/DefaultController.php
rename to modules/admin/controllers/DefaultController.php
index 82720a5..69af8fd 100644
--- a/modules/settings/controllers/DefaultController.php
+++ b/modules/admin/controllers/DefaultController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace app\modules\settings\controllers;
+namespace app\modules\admin\controllers;
 
 use yii\web\Controller;
 
 /**
- * Default controller for the `settings` module
+ * Default controller for the `admin` module
  */
 class DefaultController extends Controller
 {
diff --git a/controllers/HistoryController.php b/modules/admin/controllers/HistoryController.php
similarity index 98%
rename from controllers/HistoryController.php
rename to modules/admin/controllers/HistoryController.php
index 7950548..bcceb94 100644
--- a/controllers/HistoryController.php
+++ b/modules/admin/controllers/HistoryController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\modules\admin\controllers;
 
 use Yii;
 use app\models\History;
diff --git a/controllers/ItemController.php b/modules/admin/controllers/ItemController.php
similarity index 98%
rename from controllers/ItemController.php
rename to modules/admin/controllers/ItemController.php
index b686b82..7a54c18 100644
--- a/controllers/ItemController.php
+++ b/modules/admin/controllers/ItemController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\modules\admin\controllers;
 
 use Yii;
 use app\models\Item;
diff --git a/controllers/RoomController.php b/modules/admin/controllers/RoomController.php
similarity index 98%
rename from controllers/RoomController.php
rename to modules/admin/controllers/RoomController.php
index b7ae5ce..1cf0711 100644
--- a/controllers/RoomController.php
+++ b/modules/admin/controllers/RoomController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\modules\admin\controllers;
 
 use Yii;
 use app\models\Room;
diff --git a/controllers/UserController.php b/modules/admin/controllers/UserController.php
similarity index 98%
rename from controllers/UserController.php
rename to modules/admin/controllers/UserController.php
index 6d4fd20..4f44272 100644
--- a/controllers/UserController.php
+++ b/modules/admin/controllers/UserController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\controllers;
+namespace app\modules\admin\controllers;
 
 use Yii;
 use app\models\User;
diff --git a/views/board/_form.php b/modules/admin/views/board/_form.php
similarity index 100%
rename from views/board/_form.php
rename to modules/admin/views/board/_form.php
diff --git a/views/board/create.php b/modules/admin/views/board/create.php
similarity index 100%
rename from views/board/create.php
rename to modules/admin/views/board/create.php
diff --git a/views/board/index.php b/modules/admin/views/board/index.php
similarity index 94%
rename from views/board/index.php
rename to modules/admin/views/board/index.php
index 149a237..152b661 100644
--- a/views/board/index.php
+++ b/modules/admin/views/board/index.php
@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 }
             ],
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'app\components\ActionButtonColumn'],
         ],
     ]); ?>
     <?php Pjax::end(); ?>
diff --git a/views/board/update.php b/modules/admin/views/board/update.php
similarity index 100%
rename from views/board/update.php
rename to modules/admin/views/board/update.php
diff --git a/views/board/view.php b/modules/admin/views/board/view.php
similarity index 100%
rename from views/board/view.php
rename to modules/admin/views/board/view.php
diff --git a/modules/settings/views/default/index.php b/modules/admin/views/default/index.php
similarity index 91%
rename from modules/settings/views/default/index.php
rename to modules/admin/views/default/index.php
index 22b5d4b..6f35b82 100644
--- a/modules/settings/views/default/index.php
+++ b/modules/admin/views/default/index.php
@@ -1,4 +1,4 @@
-<div class="settings-default-index">
+<div class="admin-default-index">
     <h1><?= $this->context->action->uniqueId ?></h1>
     <p>
         This is the view content for action "<?= $this->context->action->id ?>".
diff --git a/views/history/_form.php b/modules/admin/views/history/_form.php
similarity index 100%
rename from views/history/_form.php
rename to modules/admin/views/history/_form.php
diff --git a/views/history/create.php b/modules/admin/views/history/create.php
similarity index 100%
rename from views/history/create.php
rename to modules/admin/views/history/create.php
diff --git a/views/history/index.php b/modules/admin/views/history/index.php
similarity index 90%
rename from views/history/index.php
rename to modules/admin/views/history/index.php
index a672ac1..563546e 100644
--- a/views/history/index.php
+++ b/modules/admin/views/history/index.php
@@ -26,10 +26,10 @@ $this->params['breadcrumbs'][] = $this->title;
         'columns' => [
             'id',
             'item_id',
-            'commited_at',
+            'commited_at:datetime',
             'value',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'app\components\ActionButtonColumn'],
         ],
     ]); ?>
     <?php Pjax::end(); ?>
diff --git a/views/history/update.php b/modules/admin/views/history/update.php
similarity index 100%
rename from views/history/update.php
rename to modules/admin/views/history/update.php
diff --git a/views/history/view.php b/modules/admin/views/history/view.php
similarity index 100%
rename from views/history/view.php
rename to modules/admin/views/history/view.php
diff --git a/views/item/_form.php b/modules/admin/views/item/_form.php
similarity index 100%
rename from views/item/_form.php
rename to modules/admin/views/item/_form.php
diff --git a/views/item/create.php b/modules/admin/views/item/create.php
similarity index 100%
rename from views/item/create.php
rename to modules/admin/views/item/create.php
diff --git a/views/item/index.php b/modules/admin/views/item/index.php
similarity index 95%
rename from views/item/index.php
rename to modules/admin/views/item/index.php
index 9a45b45..0636094 100644
--- a/views/item/index.php
+++ b/modules/admin/views/item/index.php
@@ -44,7 +44,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 },
             ],
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'app\components\ActionButtonColumn'],
         ],
     ]); ?>
     <?php Pjax::end(); ?>
diff --git a/views/item/update.php b/modules/admin/views/item/update.php
similarity index 100%
rename from views/item/update.php
rename to modules/admin/views/item/update.php
diff --git a/views/item/view.php b/modules/admin/views/item/view.php
similarity index 100%
rename from views/item/view.php
rename to modules/admin/views/item/view.php
diff --git a/views/room/_form.php b/modules/admin/views/room/_form.php
similarity index 100%
rename from views/room/_form.php
rename to modules/admin/views/room/_form.php
diff --git a/views/room/create.php b/modules/admin/views/room/create.php
similarity index 100%
rename from views/room/create.php
rename to modules/admin/views/room/create.php
diff --git a/views/room/index.php b/modules/admin/views/room/index.php
similarity index 93%
rename from views/room/index.php
rename to modules/admin/views/room/index.php
index 8b8d5dc..9d3e63f 100644
--- a/views/room/index.php
+++ b/modules/admin/views/room/index.php
@@ -28,7 +28,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'name',
             'bg',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'app\components\ActionButtonColumn'],
         ],
     ]); ?>
     <?php Pjax::end(); ?>
diff --git a/views/room/update.php b/modules/admin/views/room/update.php
similarity index 100%
rename from views/room/update.php
rename to modules/admin/views/room/update.php
diff --git a/views/room/view.php b/modules/admin/views/room/view.php
similarity index 100%
rename from views/room/view.php
rename to modules/admin/views/room/view.php
diff --git a/views/user/_form.php b/modules/admin/views/user/_form.php
similarity index 100%
rename from views/user/_form.php
rename to modules/admin/views/user/_form.php
diff --git a/views/user/create.php b/modules/admin/views/user/create.php
similarity index 100%
rename from views/user/create.php
rename to modules/admin/views/user/create.php
diff --git a/views/user/index.php b/modules/admin/views/user/index.php
similarity index 89%
rename from views/user/index.php
rename to modules/admin/views/user/index.php
index af11fc1..76a9c9d 100644
--- a/views/user/index.php
+++ b/modules/admin/views/user/index.php
@@ -32,10 +32,8 @@ $this->params['breadcrumbs'][] = $this->title;
                     return $model->getStatusLabel();
                 },
             ],
-            'created_at:datetime',
-            'updated_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'app\components\ActionButtonColumn'],
         ],
     ]); ?>
 </div>
diff --git a/views/user/update.php b/modules/admin/views/user/update.php
similarity index 100%
rename from views/user/update.php
rename to modules/admin/views/user/update.php
diff --git a/views/user/view.php b/modules/admin/views/user/view.php
similarity index 100%
rename from views/user/view.php
rename to modules/admin/views/user/view.php
diff --git a/modules/settings/Module.php b/modules/settings/Module.php
deleted file mode 100644
index d62c8ff..0000000
--- a/modules/settings/Module.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace app\modules\settings;
-
-/**
- * settings module definition class
- */
-class Module extends \yii\base\Module
-{
-    /**
-     * @inheritdoc
-     */
-    public $controllerNamespace = 'app\modules\settings\controllers';
-
-    /**
-     * @inheritdoc
-     */
-    public function init()
-    {
-        parent::init();
-
-        // custom initialization code goes here
-    }
-}
diff --git a/views/layouts/_left.php b/views/layouts/_left.php
index 8fcfae0..4be9574 100644
--- a/views/layouts/_left.php
+++ b/views/layouts/_left.php
@@ -22,11 +22,11 @@
                     ['label' => 'Панель Управления', 'icon' => 'fa fa-sliders', 'url' => ['/panel/index']],
 
                     ['label' => 'Настройки', 'options' => ['class' => 'header']],
-                    ['label' => 'Элементы', 'icon' => 'fa fa-cubes', 'url' => ['/item/index']],
-                    ['label' => 'Комнаты', 'icon' => 'fa fa-folder-open', 'url' => ['/room/index']],
-//                    ['label' => 'История', 'icon' => 'fa fa-bar-chart', 'url' => ['/history/index']],
-                    ['label' => 'Платы', 'icon' => 'fa fa-cogs', 'url' => ['/board/index']],
-                    ['label' => 'Пользователи', 'icon' => 'fa fa-users', 'url' => ['/user/index']],
+                    ['label' => 'Элементы', 'icon' => 'fa fa-cubes', 'url' => ['/admin/item/index']],
+                    ['label' => 'Комнаты', 'icon' => 'fa fa-folder-open', 'url' => ['/admin/room/index']],
+                    ['label' => 'История', 'icon' => 'fa fa-bar-chart', 'url' => ['/admin/history/index']],
+                    ['label' => 'Платы', 'icon' => 'fa fa-cogs', 'url' => ['/admin/board/index']],
+                    ['label' => 'Пользователи', 'icon' => 'fa fa-users', 'url' => ['/admin/user/index']],
 
                     ['label' => 'Yii2', 'options' => ['class' => 'header'], 'visible' => YII_DEBUG],
                     ['label' => 'Gii', 'icon' => 'fa fa-file-code-o', 'url' => ['/gii'], 'visible' => YII_DEBUG],