diff --git a/site/plugins/admin/languages/en.yaml b/site/plugins/admin/languages/en.yaml
index 5090a4e0..f1705080 100755
--- a/site/plugins/admin/languages/en.yaml
+++ b/site/plugins/admin/languages/en.yaml
@@ -120,6 +120,10 @@ admin_system_settings_system_entries_error404_content: "Error404 entry content"
 admin_system_settings_system_entries_error404_template: "Error404 entry template"
 admin_system_settings_heading: "Settings"
 admin_system_settings_site: "Site"
+admin_system_settings_general: "General"
+admin_system_settings_error_404_page: "Error 404 page"
+admin_system_settings_debuggig: "Debugging"
+admin_system_settings_cache: "Cache"
 admin_system_settings_site_author_email: "Author email"
 admin_system_settings_site_author_name: "Author name"
 admin_system_settings_site_description: "Site description"
@@ -206,3 +210,7 @@ admin_fieldsets_error_name_empty_input: "Name has to be an alphanumeric value (f
 admin_fieldsets_error_title_empty_input: "Title has to be an alphanumeric value (from 1 chars)"
 admin_templates_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
 admin_snippets_error_name_empty_input: "Name has to be an alphanumeric value (from 1 chars)"
+admin_system_settings_system_cache_enabled_false: "Off"
+admin_system_settings_system_cache_enabled_true: "On"
+admin_system_settings_system_errors_enabled_false: "Off"
+admin_system_settings_system_errors_enabled_true: "On"
diff --git a/site/plugins/admin/languages/ru.yaml b/site/plugins/admin/languages/ru.yaml
index 720eb7c4..9a328695 100755
--- a/site/plugins/admin/languages/ru.yaml
+++ b/site/plugins/admin/languages/ru.yaml
@@ -166,6 +166,10 @@ admin_system: "Система"
 admin_system_clear_cache: "Очистить кеш"
 admin_system_settings_heading: "Настройки системы управления"
 admin_system_settings_site: "Сайт"
+admin_system_settings_general: "Основные"
+admin_system_settings_error_404_page: "Страница ошибки 404"
+admin_system_settings_debuggig: "Дебаггинг"
+admin_system_settings_cache: "Кеш"
 admin_system_settings_site_author_email: "Емейл автора"
 admin_system_settings_site_author_name: "Имя автора"
 admin_system_settings_site_description: "Краткое описание сайта"
@@ -206,3 +210,7 @@ admin_fieldsets_error_name_empty_input: "Имя должно быть букве
 admin_fieldsets_error_title_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)"
 admin_templates_error_name_empty_input: "Имя должно быть буквенно-цифровым значением (от 1-го символа)"
 admin_snippets_error_name_empty_input: "Название должно быть буквенно-цифровым значением (от 1-го символа)"
+admin_system_settings_system_cache_enabled_false: "Выключен"
+admin_system_settings_system_cache_enabled_true: "Включен"
+admin_system_settings_system_errors_enabled_false: "Выключено"
+admin_system_settings_system_errors_enabled_true: "Включено"
diff --git a/site/plugins/admin/views/templates/system/settings/list.php b/site/plugins/admin/views/templates/system/settings/list.php
index 94104218..15159020 100644
--- a/site/plugins/admin/views/templates/system/settings/list.php
+++ b/site/plugins/admin/views/templates/system/settings/list.php
@@ -32,6 +32,12 @@ Themes::view('admin/views/partials/content-start')->display();
 <?= Form::hidden('token', Token::generate()) ?>
 <?= Form::hidden('action', 'save-form') ?>
 <div class="row">
+
+    <div class="col-md-12">
+        <h3 class="h3"><?=  __('admin_system_settings_site'); ?></h3>
+        <hr>
+    </div>
+
     <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('title', __('admin_system_settings_site_title'), ['for' => 'systemSettingsSiteTitle']) ?>
@@ -39,12 +45,14 @@ Themes::view('admin/views/partials/content-start')->display();
         </div>
         <div class="form-group">
             <?= Form::label('description', __('admin_system_settings_site_description'), ['for' => 'systemSettingsSiteDescription']) ?>
-            <?= Form::textarea('description', $settings['description'], ['class' => 'form-control margin-hard-bottom', 'id' => 'systemSettingsSiteDescription']) ?>
+            <?= Form::input('description', $settings['description'], ['class' => 'form-control margin-hard-bottom', 'id' => 'systemSettingsSiteDescription']) ?>
         </div>
         <div class="form-group">
             <?= Form::label('keywords', __('admin_system_settings_site_keywords'), ['for' => 'systemSettingsSiteKeywords']) ?>
             <?= Form::input('keywords', $settings['keywords'], ['class' => 'form-control', 'id' => 'systemSettingsSiteKeywords', 'required']) ?>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('robots', __('admin_system_settings_site_robots'), ['for' => 'systemSettingsSiteRobots']) ?>
             <?= Form::input('robots', $settings['robots'], ['class' => 'form-control', 'id' => 'systemSettingsSiteRobots', 'required']) ?>
@@ -58,6 +66,13 @@ Themes::view('admin/views/partials/content-start')->display();
             <?= Form::input('author[email]', $settings['author']['email'], ['class' => 'form-control', 'id' => 'systemSettingsSiteAuthorEmail', 'required']) ?>
         </div>
     </div>
+
+    <div class="col-md-12">
+        <br>
+        <h3 class="h3"><?=  __('admin_system_settings_general'); ?></h3>
+        <hr>
+    </div>
+
     <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('timezone', __('admin_system_settings_system_timezone'), ['for' => 'systemSettingsSystemTimezone']) ?>
@@ -71,6 +86,8 @@ Themes::view('admin/views/partials/content-start')->display();
             <?= Form::label('charset', __('admin_system_settings_system_charset'), ['for' => 'systemSettingsSystemCharset']) ?>
             <?= Form::input('charset', $settings['charset'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCharset', 'required']) ?>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('theme', __('admin_system_settings_system_theme'), ['for' => 'systemSettingsSystemTheme']) ?>
             <?= Form::input('theme', $settings['theme'], ['class' => 'form-control', 'id' => 'systemSettingsSystemTheme', 'required']) ?>
@@ -83,6 +100,15 @@ Themes::view('admin/views/partials/content-start')->display();
             <?= Form::label('entries[main]', __('admin_system_settings_system_entries_main'), ['for' => 'systemSettingsSystemEntriesMain']) ?>
             <?= Form::input('entries[main]', $settings['entries']['main'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesMain', 'required']) ?>
         </div>
+    </div>
+
+    <div class="col-md-12">
+        <br>
+        <h3 class="h3"><?=  __('admin_system_settings_error_404_page'); ?></h3>
+        <hr>
+    </div>
+
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('entries[error404][title]', __('admin_system_settings_system_entries_error404_title'), ['for' => 'systemSettingsSystemEntriesError404Title']) ?>
             <?= Form::input('entries[error404][title]', $settings['entries']['error404']['title'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Title', 'required']) ?>
@@ -91,6 +117,8 @@ Themes::view('admin/views/partials/content-start')->display();
             <?= Form::label('entries[error404][description]', __('admin_system_settings_system_entries_error404_description'), ['for' => 'systemSettingsSystemEntriesError404Description']) ?>
             <?= Form::input('entries[error404][description]', $settings['entries']['error404']['description'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Description', 'required']) ?>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('entries[error404][content]', __('admin_system_settings_system_entries_error404_content'), ['for' => 'systemSettingsSystemEntriesError404Content']) ?>
             <?= Form::input('entries[error404][content]', $settings['entries']['error404']['content'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Content', 'required']) ?>
@@ -99,18 +127,39 @@ Themes::view('admin/views/partials/content-start')->display();
             <?= Form::label('entries[error404][template]', __('admin_system_settings_system_entries_error404_template'), ['for' => 'systemSettingsSystemEntriesError404Template']) ?>
             <?= Form::input('entries[error404][template]', $settings['entries']['error404']['template'], ['class' => 'form-control', 'id' => 'systemSettingsSystemEntriesError404Template', 'required']) ?>
         </div>
+    </div>
+
+    <div class="col-md-12">
+        <br>
+        <h3 class="h3"><?=  __('admin_system_settings_debuggig'); ?></h3>
+        <hr>
+    </div>
+
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('errors[display]', __('admin_system_settings_system_errors_display'), ['for' => 'systemSettingsSystemErrorsDisplay']) ?>
-            <?= Form::select('errors[display]', [0 => 'false', 1 => 'true'], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?>
+            <?= Form::select('errors[display]', [0 => __('admin_system_settings_system_errors_enabled_false'), 1 => __('admin_system_settings_system_errors_enabled_true')], $settings['errors']['display'], ['class' => 'form-control', 'id' => 'systemSettingsSystemErrorsDisplay', 'required']) ?>
         </div>
+    </div>
+
+
+    <div class="col-md-12">
+        <br>
+        <h3 class="h3"><?=  __('admin_system_settings_cache'); ?></h3>
+        <hr>
+    </div>
+
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('cache[enabled]', __('admin_system_settings_system_cache_enabled'), ['for' => 'systemSettingsSystemCacheEnabled']) ?>
-            <?= Form::select('cache[enabled]', [0 => 'false', 1 => 'true'], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?>
+            <?= Form::select('cache[enabled]', [0 => __('admin_system_settings_system_cache_enabled_false'), 1 => __('admin_system_settings_system_cache_enabled_true')], $settings['cache']['enabled'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheEnabled', 'required']) ?>
         </div>
         <div class="form-group">
             <?= Form::label('cache[prefix]', __('admin_system_settings_system_cache_prefix'), ['for' => 'systemSettingsSystemCachePrefix']) ?>
             <?= Form::input('cache[prefix]', $settings['cache']['prefix'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCachePrefix', 'required']) ?>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="form-group">
             <?= Form::label('cache[driver]', __('admin_system_settings_system_cache_driver'), ['for' => 'systemSettingsSystemCacheDriver']) ?>
             <?= Form::input('cache[driver]', $settings['cache']['driver'], ['class' => 'form-control', 'id' => 'systemSettingsSystemCacheDriver', 'required']) ?>