From 618ad89e1565f488d412fc7bf1cfe586871ac6b1 Mon Sep 17 00:00:00 2001
From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
Date: Tue, 9 Jul 2024 23:08:08 +0100
Subject: [PATCH] Code refactor

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
---
 config/system.php                             |  12 +-
 package-lock.json                             |  28 ++--
 package.json                                  |   2 +-
 public/js/app.js.LICENSE.txt                  |   4 +-
 resources/css/widgets/table.css               |  62 ++++++--
 resources/js/formwidgets/recordeditor.js      |  99 ------------
 resources/js/partials/request.js              |  19 +--
 resources/js/widgets/daterangepicker.js       |  27 +++-
 resources/js/widgets/lists.js                 |  14 +-
 resources/js/widgets/mediamanager.js          |  12 +-
 resources/lang/en/system.php                  |  15 +-
 resources/models/system/extension.php         |   4 +-
 resources/models/system/language.php          |  12 +-
 resources/scss/components/_alert.scss         |  18 +++
 resources/scss/components/_buttons.scss       |  14 +-
 resources/scss/components/_cards.scss         |   6 +-
 resources/scss/components/_dropdown.scss      |   4 +
 resources/scss/components/_forms.scss         |  16 +-
 resources/scss/components/_layout.scss        |  21 +--
 resources/scss/components/_loader.scss        |  16 +-
 resources/scss/components/_mainmenu.scss      |  26 +--
 resources/scss/components/_sidenav.scss       |  58 ++-----
 resources/scss/components/_tables.scss        |  42 +----
 resources/scss/components/_toolbar.scss       |   9 +-
 resources/scss/helpers/_variables.scss        |  23 +--
 resources/scss/utilities/_utilities.scss      |  12 ++
 resources/scss/vendor/_choices.scss           |   6 +-
 .../views/admin/_components/aside.blade.php   | 114 ++++++--------
 .../admin/_components/forms/error.blade.php   |   0
 .../admin/_components/forms/form.blade.php    |  15 --
 .../admin/_components/forms/help.blade.php    |   0
 .../admin/_components/forms/label.blade.php   |   3 -
 .../admin/_components/forms/select.blade.php  |  34 ----
 .../views/admin/_components/header.blade.php  |  36 +++--
 .../admin/_components/modal/close.blade.php   |   1 -
 .../admin/_components/modal/content.blade.php |  19 ---
 .../admin/_components/modal/form.blade.php    |  27 ----
 .../admin/_components/modal/index.blade.php   |  25 ---
 .../admin/_components/modal/loading.blade.php |  14 --
 .../views/admin/_layouts/default.blade.php    |  57 ++++---
 .../views/admin/_partials/flash.blade.php     |   6 +-
 .../form/toolbar_save_button.blade.php        |   2 +-
 .../widget_toolbar.blade.php                  |   4 +-
 .../_partials/widgets/filter/filter.blade.php |  92 +++++------
 .../widgets/filter/filter_scopes.blade.php    |   2 +-
 .../widgets/filter/scope_date.blade.php       |   2 +-
 .../widgets/filter/scope_daterange.blade.php  |   2 +-
 .../widgets/filter/scope_select.blade.php     |   6 +-
 .../widgets/filter/scope_selectlist.blade.php |   6 +-
 .../widgets/filter/scope_switch.blade.php     |   2 +-
 .../widgets/lists/list_actions.blade.php      |  14 +-
 .../widgets/lists/list_body.blade.php         |   9 +-
 .../widgets/lists/list_head.blade.php         |  85 +++++-----
 .../widgets/lists/list_pagination.blade.php   |   6 +-
 .../widgets/lists/list_setup_form.blade.php   |  54 ++++---
 .../widgets/searchbox/searchbox.blade.php     |  36 +++--
 .../widgets/toolbar/button_dropdown.blade.php |  27 ++--
 .../widgets/toolbar/toolbar.blade.php         |   2 +-
 resources/views/admin/create.blade.php        |  31 ++--
 resources/views/admin/edit.blade.php          |  31 ++--
 resources/views/admin/index.blade.php         |  23 ++-
 resources/views/admin/preview.blade.php       |  31 ++--
 .../mediamanager/folder_tree.blade.php        |   2 +-
 .../widgets/mediamanager/list_grid.blade.php  |   2 +-
 .../mediamanager/mediamanager.blade.php       |   8 +-
 .../widgets/mediamanager/popup.blade.php      |   2 +-
 resources/views/main/themes/delete.blade.php  |  89 ++++++-----
 resources/views/main/themes/index.blade.php   |   4 +-
 .../system/_mail/layouts/default.blade.php    |   2 +-
 .../_partials/extensions/lists/list.blade.php |  26 +--
 .../languages/translationseditor.blade.php    |  20 ++-
 .../_partials/updates/carte_info.blade.php    |   8 +-
 .../views/system/extensions/delete.blade.php  | 126 ++++++++-------
 .../views/system/extensions/edit.blade.php    |  33 ++--
 .../views/system/extensions/index.blade.php   |  22 ++-
 .../views/system/languages/index.blade.php    |  30 ++++
 .../views/system/settings/edit.blade.php      |  33 ++--
 .../views/system/settings/index.blade.php     |   2 +-
 .../views/system/systemlogs/index.blade.php   |  37 +++--
 .../views/system/updates/index.blade.php      |  38 +++--
 src/Admin/FormWidgets/Connector.php           |   1 -
 src/Admin/FormWidgets/RecordEditor.php        |   1 -
 src/Admin/Http/Actions/FormController.php     |   7 +-
 src/Admin/Http/Controllers/Statuses.php       |   1 +
 .../Providers/MenuItemServiceProvider.php     |  39 ++---
 src/Admin/Traits/HasChartDatasets.php         |  13 +-
 src/Admin/Widgets/Filter.php                  |   2 +-
 src/Admin/Widgets/Form.php                    |   3 +-
 src/Admin/Widgets/Lists.php                   |   8 +-
 src/Admin/Widgets/Toolbar.php                 |   4 +-
 src/Flame/Pagic/Cache/FileSystem.php          |   2 +-
 src/Flame/Pagic/Parsers/FileParser.php        |   2 +-
 src/Main/Classes/ThemeManager.php             |  16 +-
 src/Main/Http/Controllers/Themes.php          |  15 +-
 src/System/Classes/HubManager.php             |  21 ++-
 src/System/Classes/LanguageManager.php        | 132 ++++++++++++----
 .../Console/Commands/LanguageInstall.php      |  13 +-
 src/System/Http/Controllers/Languages.php     | 148 +++++++-----------
 src/System/Http/Controllers/SystemLogs.php    |   2 +-
 src/System/Models/Language.php                |  10 +-
 src/System/Models/Settings.php                |  19 ++-
 src/System/Providers/FormServiceProvider.php  |   9 ++
 src/System/Traits/ManagesUpdates.php          |   2 +-
 tests/src/Admin/Classes/NavigationTest.php    |   2 -
 .../src/Admin/DashboardWidgets/ChartsTest.php |   2 +-
 tests/src/Admin/FormWidgets/ConnectorTest.php |   1 -
 .../Admin/FormWidgets/RecordEditorTest.php    |   1 -
 tests/src/Admin/Widgets/FilterTest.php        |   2 +-
 tests/src/Admin/Widgets/ListsTest.php         |   1 -
 109 files changed, 1184 insertions(+), 1178 deletions(-)
 delete mode 100644 resources/js/formwidgets/recordeditor.js
 delete mode 100644 resources/views/admin/_components/forms/error.blade.php
 delete mode 100644 resources/views/admin/_components/forms/form.blade.php
 delete mode 100644 resources/views/admin/_components/forms/help.blade.php
 delete mode 100644 resources/views/admin/_components/forms/label.blade.php
 delete mode 100644 resources/views/admin/_components/forms/select.blade.php
 delete mode 100644 resources/views/admin/_components/modal/close.blade.php
 delete mode 100644 resources/views/admin/_components/modal/content.blade.php
 delete mode 100644 resources/views/admin/_components/modal/form.blade.php
 delete mode 100644 resources/views/admin/_components/modal/index.blade.php
 delete mode 100644 resources/views/admin/_components/modal/loading.blade.php
 create mode 100644 resources/views/system/languages/index.blade.php

diff --git a/config/system.php b/config/system.php
index 8b7bfb2d..835c0a81 100644
--- a/config/system.php
+++ b/config/system.php
@@ -38,7 +38,7 @@
     |
     */
 
-    'defaultTheme' => 'tastyigniter-orange',
+    'defaultTheme' => 'igniter-orange',
 
     /*
     |--------------------------------------------------------------------------
@@ -183,4 +183,14 @@
         'igniter.reservation',
         'igniter.user',
     ],
+
+    /*
+    | --------------------------------------------------------------------------
+    | Updates Endpoint
+    | --------------------------------------------------------------------------
+    |
+    | Specifies the URL to the TastyIgniter updates API endpoint.
+    |
+    */
+    'updatesEndpoint' => 'https://api.tastyigniter.com/v2',
 ];
diff --git a/package-lock.json b/package-lock.json
index df4d153f..bc1713bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
         "@popperjs/core": "^2.10.2",
         "alpinejs": "^3.1.1",
         "animate.css": "^4.1.1",
-        "bootstrap": "^5.1.3",
+        "bootstrap": "^5.3.3",
         "bootstrap-table": "^1.19.1",
         "chart.js": "^3.7.1",
         "chartjs-adapter-moment": "^1.0.0",
@@ -1964,9 +1964,9 @@
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -3027,9 +3027,9 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
-      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "funding": [
         {
           "type": "github",
@@ -3041,7 +3041,7 @@
         }
       ],
       "peerDependencies": {
-        "@popperjs/core": "^2.11.6"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/bootstrap-table": {
@@ -11468,9 +11468,9 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
     },
     "@swc/helpers": {
       "version": "0.2.14",
@@ -12395,9 +12395,9 @@
       }
     },
     "bootstrap": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz",
-      "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "requires": {}
     },
     "bootstrap-table": {
diff --git a/package.json b/package.json
index 9b9a6a1e..e32fdddd 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@popperjs/core": "^2.10.2",
     "alpinejs": "^3.1.1",
     "animate.css": "^4.1.1",
-    "bootstrap": "^5.1.3",
+    "bootstrap": "^5.3.3",
     "bootstrap-table": "^1.19.1",
     "chart.js": "^3.7.1",
     "chartjs-adapter-moment": "^1.0.0",
diff --git a/public/js/app.js.LICENSE.txt b/public/js/app.js.LICENSE.txt
index 99f6a4bf..767718e0 100644
--- a/public/js/app.js.LICENSE.txt
+++ b/public/js/app.js.LICENSE.txt
@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v5.2.3 (https://getbootstrap.com/)
-  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 
diff --git a/resources/css/widgets/table.css b/resources/css/widgets/table.css
index 3a6269a3..73635f1e 100644
--- a/resources/css/widgets/table.css
+++ b/resources/css/widgets/table.css
@@ -1,14 +1,33 @@
-.fixed-table-container .bs-checkbox, .fixed-table-container .no-records-found { text-align: center }
+.fixed-table-container .bs-checkbox, .fixed-table-container .no-records-found {
+    text-align: center
+}
+
 /*.fixed-table-body thead th .th-inner, .table td, .table th { box-sizing: border-box }*/
 /*.bootstrap-table .table { margin-bottom: 0 !important; border-bottom: 1px solid #DDD; border-collapse: collapse !important; border-radius: 1px }*/
 /*.bootstrap-table .table:not(.table-condensed), .bootstrap-table .table:not(.table-condensed) > tbody > tr > td, .bootstrap-table .table:not(.table-condensed) > tbody > tr > th, .bootstrap-table .table:not(.table-condensed) > tfoot > tr > td, .bootstrap-table .table:not(.table-condensed) > tfoot > tr > th, .bootstrap-table .table:not(.table-condensed) > thead > tr > td { padding: 8px }*/
 /*.bootstrap-table .table.table-no-bordered > tbody > tr > td, .bootstrap-table .table.table-no-bordered > thead > tr > th { border-right: 2px solid transparent }*/
 /*.bootstrap-table .table.table-no-bordered > tbody > tr > td:last-child { border-right: none }*/
-.fixed-table-container { position: relative; clear: both; border: 1px solid #E3E6EE; border-radius: 4px; -webkit-border-radius: 4px; -moz-border-radius: 4px }
+.fixed-table-container {
+    position: relative;
+    clear: both;
+    border: 1px solid #E3E6EE;
+    border-radius: 4px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px
+}
+
 /*.fixed-table-container.table-no-bordered { border: 1px solid transparent }*/
 /*.fixed-table-footer, .fixed-table-header { overflow: hidden }*/
-.fixed-table-footer { border-top: 1px solid #E3E6EE }
-.fixed-table-body { overflow-x: auto; overflow-y: auto; height: 100% }
+.fixed-table-footer {
+    border-top: 1px solid #E3E6EE
+}
+
+.fixed-table-body {
+    overflow-x: auto;
+    overflow-y: auto;
+    height: 100%
+}
+
 /*.fixed-table-container table { width: 100% }*/
 /*.fixed-table-container thead th { height: 0; padding: 0; margin: 0; border-left: 1px solid #E3E6EE }*/
 /*.fixed-table-container thead th:focus { outline: transparent solid 0 }*/
@@ -25,9 +44,19 @@
 /*.fixed-table-container tbody .selected td { background-color: #F5F5F5 }*/
 /*.fixed-table-container .bs-checkbox .th-inner { padding: 8px 0 }*/
 /*.fixed-table-container input[type=radio], .fixed-table-container input[type=checkbox] { margin: 0 auto !important }*/
-.fixed-table-pagination .pagination-detail, .fixed-table-pagination div.pagination { margin-top: 15px; margin-bottom: 15px }
-.fixed-table-pagination div.pagination .pagination { margin: 0 }
-.fixed-table-pagination .page-list .btn-group .btn { padding: 6px 15px }
+.fixed-table-pagination .pagination-detail, .fixed-table-pagination div.pagination {
+    margin-top: 15px;
+    margin-bottom: 15px
+}
+
+.fixed-table-pagination div.pagination .pagination {
+    margin: 0
+}
+
+.fixed-table-pagination .page-list .btn-group .btn {
+    padding: 6px 15px
+}
+
 /*.fixed-table-pagination .pagination a { padding: 6px 12px; line-height: 1.428571429 }*/
 /*.fixed-table-pagination .pagination-info { line-height: 34px; margin-right: 5px }*/
 /*.fixed-table-pagination .btn-group { position: relative; display: inline-block; vertical-align: middle }*/
@@ -38,7 +67,18 @@
 /*.fixed-table-toolbar .columns label { display: block; padding: 3px 20px; clear: both; font-weight: 400; line-height: 1.428571429 }*/
 /*.fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search { position: relative; margin-top: 10px; margin-bottom: 10px; line-height: 34px }*/
 /*.fixed-table-pagination li.disabled a { pointer-events: none; cursor: default }*/
-.fixed-table-loading { display: none; position: absolute; top: 42px; right: 0; bottom: 0; left: 0; z-index: 99; background-color: #FFF; text-align: center }
+.fixed-table-loading {
+    display: none;
+    position: absolute;
+    top: 42px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    background-color: #FFF;
+    text-align: center
+}
+
 /*.fixed-table-body .card-view .title { font-weight: 700; display: inline-block; min-width: 30%; text-align: left !important }*/
 /*.table td, .table th { vertical-align: middle }*/
 /*.fixed-table-toolbar .dropdown-menu { text-align: left; max-height: 300px; overflow: auto }*/
@@ -56,5 +96,9 @@
 /*.fixed-table-pagination:after, .fixed-table-toolbar:after { content: ""; display: block; clear: both }*/
 
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
-  background: var(--bs-gray-200);
+    background: var(--bs-gray-200);
+}
+
+.bootstrap-table .fixed-table-container.fixed-height .table thead th {
+    background-color: transparent;
 }
diff --git a/resources/js/formwidgets/recordeditor.js b/resources/js/formwidgets/recordeditor.js
deleted file mode 100644
index bd90f602..00000000
--- a/resources/js/formwidgets/recordeditor.js
+++ /dev/null
@@ -1,99 +0,0 @@
-+function ($) {
-    "use strict";
-
-    var RecordEditor = function (element, options) {
-        this.$el = $(element)
-        this.options = options
-
-        this.$assignRecordEl = this.$el.find('[data-control="assign-record"]')
-        this.$createRecordEl = this.$el.find('[data-control="create-record"]')
-        this.$editRecordEl = this.$el.find('[data-control="edit-record"]')
-        this.$deleteRecordEl = this.$el.find('[data-control="delete-record"]')
-
-        this.init()
-    }
-
-    RecordEditor.prototype.constructor = RecordEditor
-
-    RecordEditor.prototype.init = function () {
-        this.$createRecordEl.on('click', $.proxy(this.onClickFormButton, this))
-        this.$editRecordEl.on('click', $.proxy(this.onClickFormButton, this))
-        this.$deleteRecordEl.on('click', $.proxy(this.onClickDeleteButton, this))
-        this.$assignRecordEl.on('click', $.proxy(this.onClickAssignButton, this))
-    }
-
-    // EVENT HANDLERS
-    // ============================
-
-    RecordEditor.prototype.onClickFormButton = function (event) {
-        var $button = $(event.currentTarget),
-            isCreateContext = $button.data('control') === 'create-record'
-
-        new $.ti.recordEditor.modal({
-            alias: this.options.alias,
-            recordId: isCreateContext ? null : $button.data('recordId'),
-            onSave: function () {
-                this.hide()
-            }
-        })
-    }
-
-    RecordEditor.prototype.onClickDeleteButton = function (event) {
-        var handler = this.options.alias+'::onDeleteRecord',
-            $button = $(event.currentTarget),
-            confirmMsg = $button.data('confirmMessage')
-
-        $.request(handler, {
-            data: {recordId: $button.data('recordId')},
-            confirm: confirmMsg
-        })
-    }
-
-    RecordEditor.prototype.onClickAssignButton = function (event) {
-        var handler = this.options.alias+'::onAssignRecord',
-            $button = $(event.currentTarget)
-
-        $button.request(handler, {
-            data: {recordId: $button.data('recordId')}
-        })
-    }
-
-    RecordEditor.DEFAULTS = {
-        alias: undefined,
-    }
-
-    // FormTable PLUGIN DEFINITION
-    // ============================
-
-    var old = $.fn.recordEditor
-
-    $.fn.recordEditor = function (option) {
-        var args = Array.prototype.slice.call(arguments, 1), result
-        this.each(function () {
-            var $this = $(this)
-            var data = $this.data('ti.recordEditor')
-            var options = $.extend({}, RecordEditor.DEFAULTS, $this.data(), typeof option == 'object' && option)
-            if (!data) $this.data('ti.recordEditor', (data = new RecordEditor(this, options)))
-            if (typeof option == 'string') result = data[option].apply(data, args)
-            if (typeof result != 'undefined') return false
-        })
-
-        return result ? result : this
-    }
-
-    $.fn.recordEditor.Constructor = RecordEditor
-
-    // RecordEditor NO CONFLICT
-    // =================
-
-    $.fn.recordEditor.noConflict = function () {
-        $.fn.recordEditor = old
-        return this
-    }
-
-    // RecordEditor DATA-API
-    // ===============
-    $(document).render(function () {
-        $('[data-control="record-editor"]').recordEditor()
-    })
-}(window.jQuery);
diff --git a/resources/js/partials/request.js b/resources/js/partials/request.js
index 7aa6bd87..bfa22153 100644
--- a/resources/js/partials/request.js
+++ b/resources/js/partials/request.js
@@ -106,8 +106,8 @@ if (window.jQuery.request !== undefined)
                 success: function (data, textStatus, jqXHR) {
                     // Stop beforeUpdate() OR data-request-before-update returns false
                     if (self.options.beforeUpdate.apply(self, [data, textStatus, jqXHR]) === false) return
-                    if (options.fireBeforeUpdate && eval('(function($el, context, data, textStatus, jqXHR) {' +
-                        options.fireBeforeUpdate + '}.call($el.get(0), $el, context, data, textStatus, jqXHR))') === false) return
+                    if (options.fireBeforeUpdate && eval('(function($el, context, data, textStatus, jqXHR) {'+
+                        options.fireBeforeUpdate+'}.call($el.get(0), $el, context, data, textStatus, jqXHR))') === false) return
 
                     // Trigger 'ajaxBeforeUpdate' on the form, stop if event.preventDefault() is called
                     var _event = jQuery.Event('ajaxBeforeUpdate')
@@ -125,7 +125,7 @@ if (window.jQuery.request !== undefined)
 
                     updatePromise.done(function () {
                         $triggerEl.trigger('ajaxSuccess', [context, data, textStatus, jqXHR])
-                        options.fireSuccess && eval('(function($el, context, data, textStatus, jqXHR) {' + options.fireSuccess + '}.call($el.get(0), $el, context, data, textStatus, jqXHR))')
+                        options.fireSuccess && eval('(function($el, context, data, textStatus, jqXHR) {'+options.fireSuccess+'}.call($el.get(0), $el, context, data, textStatus, jqXHR))')
                     })
 
                     return updatePromise
@@ -158,7 +158,7 @@ if (window.jQuery.request !== undefined)
                         if (_event.isDefaultPrevented()) return
 
                         // Stop here if the data-request-error attribute returns false
-                        if (options.fireError && eval('(function($el, context, textStatus, jqXHR) {' + options.fireError + '}.call($el.get(0), $el, context, textStatus, jqXHR))') === false)
+                        if (options.fireError && eval('(function($el, context, textStatus, jqXHR) {'+options.fireError+'}.call($el.get(0), $el, context, textStatus, jqXHR))') === false)
                             return
 
                         requestOptions.handleErrorMessage(errorMsg)
@@ -169,7 +169,7 @@ if (window.jQuery.request !== undefined)
                 },
                 complete: function (data, textStatus, jqXHR) {
                     $triggerEl.trigger('ajaxComplete', [context, data, textStatus, jqXHR])
-                    options.fireComplete && eval('(function($el, context, data, textStatus, jqXHR) {' + options.fireComplete + '}.call($el.get(0), $el, context, data, textStatus, jqXHR))')
+                    options.fireComplete && eval('(function($el, context, data, textStatus, jqXHR) {'+options.fireComplete+'}.call($el.get(0), $el, context, data, textStatus, jqXHR))')
                 },
 
                 // Custom function, requests confirmation from the user
@@ -211,7 +211,7 @@ if (window.jQuery.request !== undefined)
                     $.each(fields, function focusErrorField(fieldName, fieldMessages) {
                         fieldName = fieldName.replace(/\.(\w+)/g, '[$1]')
 
-                        var fieldElement = $form.find('[name="' + fieldName + '"], [name="' + fieldName + '[]"], [name$="[' + fieldName + ']"], [name$="[' + fieldName + '][]"]').filter(':enabled').first()
+                        var fieldElement = $form.find('[name="'+fieldName+'"], [name="'+fieldName+'[]"], [name$="['+fieldName+']"], [name$="['+fieldName+'][]"]').filter(':enabled').first()
                         if (fieldElement.length > 0) {
 
                             var _event = jQuery.Event('ajaxInvalidField')
@@ -237,6 +237,7 @@ if (window.jQuery.request !== undefined)
                         try {
                             dataArray = jQuery.type(data) === 'object' ? data : jQuery.parseJSON(data)
                         } catch (e) {
+                            console.error('JSON parse error', e)
                         }
 
                         for (var partial in dataArray) {
@@ -406,9 +407,9 @@ if (window.jQuery.request !== undefined)
         if (typeof value == 'object') return value
 
         try {
-            return JSON.parse(JSON.stringify(eval("({" + value + "})")))
+            return JSON.parse(JSON.stringify(eval("({"+value+"})")))
         } catch (e) {
-            throw new Error('Error parsing the ' + name + ' attribute value. ' + e)
+            throw new Error('Error parsing the '+name+' attribute value. '+e)
         }
     }
 
@@ -428,7 +429,7 @@ if (window.jQuery.request !== undefined)
         for (let errorKey in errorBag) {
             const errors = errorBag[errorKey]
             for (let error in errors) {
-                formattedErrorMessage += errors[error] + '<br>'
+                formattedErrorMessage += errors[error]+'<br>'
             }
         }
         return formattedErrorMessage.slice(0, -4)
diff --git a/resources/js/widgets/daterangepicker.js b/resources/js/widgets/daterangepicker.js
index 16d5c27d..74f4eb0d 100644
--- a/resources/js/widgets/daterangepicker.js
+++ b/resources/js/widgets/daterangepicker.js
@@ -57,27 +57,40 @@
     }
 
     DateRangePickerControl.prototype.onDateSelected = function (start, end, label, initialize) {
-        var format = this.options.timePicker ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
+        var format = this.options.timePicker ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD',
+            inputChanged
 
         if (!this.options.singleDatePicker) {
-            this.$el.find('[data-datepicker-range-start]').val(start.isValid() ? start.format(format) : '');
-            this.$el.find('[data-datepicker-range-end]').val(end.isValid() ? end.format(format) : '');
+            var $startInput = this.$el.find('[data-datepicker-range-start]'),
+                $endInput = this.$el.find('[data-datepicker-range-end]'),
+                startValue = $startInput.val(),
+                endValue = $endInput.val()
+
+            $startInput.val(start.isValid() ? start.format(format) : '');
+            $endInput.val(end.isValid() ? end.format(format) : '');
+
+            inputChanged = startValue != $startInput.val() || endValue != $endInput.val()
         } else {
-            this.$el.find('[data-datepicker-input]').val(start.format(format));
+            var $dateInput = this.$el.find('[data-datepicker-input]'),
+                dateValue = $dateInput.val()
+
+            $dateInput.val(start.format(format));
+
+            inputChanged = dateValue != $dateInput.val();
         }
 
-        if (!initialize) this.$el.closest('form').submit();
+        if (!initialize && inputChanged) this.$el.closest('form').submit();
     }
 
     DateRangePickerControl.prototype.onShowCalendar = function (event, daterangepicker) {
         var valueChanged = false;
 
-        if (! daterangepicker.startDate.isValid()) {
+        if (!daterangepicker.startDate.isValid()) {
             daterangepicker.setStartDate(moment().startOf('day'));
             valueChanged = true;
         }
 
-        if (! daterangepicker.endDate.isValid()) {
+        if (!daterangepicker.endDate.isValid()) {
             daterangepicker.setEndDate(moment().endOf('day'));
             valueChanged = true;
         }
diff --git a/resources/js/widgets/lists.js b/resources/js/widgets/lists.js
index f6d2e606..9938f230 100644
--- a/resources/js/widgets/lists.js
+++ b/resources/js/widgets/lists.js
@@ -1,15 +1,9 @@
-// List Filter State Toggle
-// Uses user cookie value to show/hide list filter bar
+// Submit list filter form on select change
 $(function () {
-    $(document).on('click', '[data-toggle="list-filter"]', function () {
-        var $button = $(this),
-            $dropdownButton = $($button.data('target'))
-
-        $button.toggleClass('active')
-        $dropdownButton.attr('data-bs-offset', "-50," + Math.abs($button.closest('thead').offset().top - $('#toolbar').height() - $('.navbar-top').height() - 20))
-        $dropdownButton.click()
+    $(document).on('change', '.filter-scope select, .filter-scope input[type="checkbox"]', function (event) {
+        $(event.currentTarget).closest('form').submit()
     })
-});
+})
 
 $(function ($) {
     // List setup form sortables
diff --git a/resources/js/widgets/mediamanager.js b/resources/js/widgets/mediamanager.js
index 3ba407e9..76aa8a72 100644
--- a/resources/js/widgets/mediamanager.js
+++ b/resources/js/widgets/mediamanager.js
@@ -69,18 +69,8 @@
         if (!this.$el)
             return;
 
-        var windowHeight = window.innerHeight,
-            listTopOffset = this.$el.find('[data-control="media-list"]').get(0).offsetTop,
-            statusbarHeight = this.$el.find('[data-control="media-statusbar"]').outerHeight() || 0,
-            modalHeaderHeight = this.$el.closest('.modal').find('.modal-header').outerHeight() || 0
-
-        var listHeight = Math.max(0, windowHeight-listTopOffset-parseInt(modalHeaderHeight)-parseInt(statusbarHeight))
-
-        if (listHeight < 1)
-            return
-
         $('.media-list-container', this.$mediaListElement)
-            .css('height', listHeight)
+            .css('height', '67vh')
             .css('overflow-y', 'scroll')
     }
 
diff --git a/resources/lang/en/system.php b/resources/lang/en/system.php
index 9c2a5e1c..c109b4b8 100644
--- a/resources/lang/en/system.php
+++ b/resources/lang/en/system.php
@@ -154,15 +154,16 @@
         'text_tab_edit_file' => 'Edit Translations',
         'text_filter_search' => 'Search by name.',
         'text_filter_file' => 'View all groups',
-        'text_filter_translations' => 'Filter translations.',
+        'text_filter_translations' => 'Search translations by key or text',
         'text_empty' => 'There are no languages available.',
         'text_empty_translations' => 'There are no translations available.',
         'text_files' => 'files',
-        'text_locale_strings' => 'Locale Strings (%s%% translated, %s strings)',
+        'text_locale_strings' => 'Total: %s, translated: %s (%s%%), untranslated %s',
         'text_current_build' => 'Current build: %s',
         'text_title_update_available' => 'New translation strings are available for (%s).',
         'text_update_available' => 'Only the translation strings that haven’t been modified will be updated.',
         'text_no_update_available' => '(%s) is up to date',
+        'text_publish_translations' => 'Publish translations',
 
         'column_code' => 'Code',
         'column_status' => 'Status',
@@ -174,17 +175,20 @@
         'label_check_updates' => 'Check for updates',
 
         'button_browse' => '<i class="fa fa-globe"></i>&nbsp;&nbsp;Browse more languages&nbsp;&nbsp;<i class="fa fa-external-link-alt"></i>',
-        'button_check' => '<i class="fa fa-refresh"></i>&nbsp;&nbsp;Check for updates',
-        'button_apply_update' => 'Apply updates',
+        'button_apply_update' => '<i class="fa fa-cloud-download"></i>&nbsp;&nbsp;Download new translated strings',
+        'button_import_translations' => 'Import translations',
+        'button_publish_translations' => 'Publish translations',
 
         'help_language' => 'Use a full locale code (e.g. “fr_FR”) instead of just a generic language code (e.g. “fr”), must be same as the locale directory.',
         'help_locale_strings' => 'Make sure NOT to translate placeholders like <b>%s</b> or <b>:name</b>. Leave them as is.',
+        'help_publish_translations' => 'If you want your translations included in the core or extension release, please upload them to the <a href="%s" target="_blank">Crowdin project.</a> They will be reviewed by the Core Team or the Extension Author.',
 
         'alert_set_default' => 'Language set as default',
-        'alert_save_changes' => 'Your changes will be lost if you don\'t save them before editing another language file.',
         'alert_update_complete' => '%s: Translation strings for (%s) have been updated.',
         'alert_update_failed' => '%s: Failed to update translation strings for (%s).',
         'alert_update_progress' => '%s: Pulling translation strings for (%s)...',
+        'alert_language_not_found' => 'Language not found',
+        'alert_publish_success' => 'Translations published successfully',
 
         'translations' => [
 
@@ -361,6 +365,7 @@
         'text_tab_desc_general' => 'Configure your restaurant name, email, logo and geolocation settings',
         'text_tab_desc_site' => 'Configure your site default country, language, currency and timezone settings.',
         'text_tab_desc_mail' => 'Settings for sending out emails',
+        'text_tab_desc_status' => 'Manage your order and reservation statuses.',
         'text_tab_desc_server' => 'Manage advanced system settings such as enabling/disabling maintenance.',
         'text_tab_desc_language' => 'Manage languages available on your site.',
         'text_tab_desc_currency' => 'Manage currencies available on your site.',
diff --git a/resources/models/system/extension.php b/resources/models/system/extension.php
index 449729ec..c23b5fe7 100644
--- a/resources/models/system/extension.php
+++ b/resources/models/system/extension.php
@@ -26,7 +26,7 @@
 $config['list']['columns'] = [
     'install' => [
         'type' => 'button',
-        'iconCssClass' => 'fas fa-check',
+        'iconCssClass' => 'fas fa-fw fa-check',
         'attributes' => [
             'class' => 'btn btn-light text-success mr-3 shadow-none',
             'data-request' => 'onInstall',
@@ -35,7 +35,7 @@
     ],
     'uninstall' => [
         'type' => 'button',
-        'iconCssClass' => 'fas fa-xmark',
+        'iconCssClass' => 'fas fa-fw fa-xmark',
         'attributes' => [
             'class' => 'btn btn-light text-danger mr-3 shadow-none',
             'data-request' => 'onUninstall',
diff --git a/resources/models/system/language.php b/resources/models/system/language.php
index dd188cc2..4ac83252 100644
--- a/resources/models/system/language.php
+++ b/resources/models/system/language.php
@@ -150,11 +150,11 @@
 $config['form']['tabs'] = [
     'defaultTab' => 'lang:igniter::system.languages.text_tab_general',
     'fields' => [
-        '_file' => [
+        '_group' => [
             'tab' => 'lang:igniter::system.languages.text_tab_files',
             'type' => 'select',
             'context' => 'edit',
-            'options' => [],
+            'options' => 'getGroupOptions',
             'span' => 'none',
             'placeholder' => 'igniter::system.languages.text_filter_file',
             'cssClass' => 'col-md-4',
@@ -174,17 +174,17 @@
                 'data-request' => 'onSubmitFilter',
             ],
         ],
-        '_string_filter' => [
+        '_filter' => [
             'tab' => 'lang:igniter::system.languages.text_tab_files',
             'type' => 'radiotoggle',
             'context' => 'edit',
             'span' => 'none',
             'cssClass' => 'col-md-4',
-            'default' => 'all',
+            'default' => 'changed',
             'options' => [
                 'all' => 'All',
-                'unchanged' => 'Unchanged',
-                'changed' => 'Changed',
+                'changed' => 'Translated',
+                'unchanged' => 'Untranslated',
             ],
             'attributes' => [
                 'data-control' => 'string-filter',
diff --git a/resources/scss/components/_alert.scss b/resources/scss/components/_alert.scss
index 3f907993..2aa5912d 100644
--- a/resources/scss/components/_alert.scss
+++ b/resources/scss/components/_alert.scss
@@ -1,6 +1,7 @@
 #notification {
   display: none;
 }
+
 body.swal2-toast-shown {
   .swal2-container {
     &.swal2-bottom-start {
@@ -23,6 +24,23 @@ body:not(.swal2-toast-shown) {
 
   &.swal2-toast {
     padding: 0.6em 1em;
+    border-bottom: 2px solid transparent;
+
+    &.swal2-icon-error, &.swal2-icon-danger {
+      border-bottom-color: var(--bs-danger);
+    }
+
+    &.swal2-icon-success {
+      border-bottom-color: var(--bs-success);
+    }
+
+    &.swal2-icon-info {
+      border-bottom-color: var(--bs-info);
+    }
+
+    &.swal2-icon-warning {
+      border-bottom-color: var(--bs-warning);
+    }
 
     .swal2-icon {
       width: 1.5em;
diff --git a/resources/scss/components/_buttons.scss b/resources/scss/components/_buttons.scss
index bbd9a254..2339477f 100644
--- a/resources/scss/components/_buttons.scss
+++ b/resources/scss/components/_buttons.scss
@@ -24,13 +24,6 @@
   }
 }
 
-.btn-light:not(:disabled):not(.disabled):active,
-.btn-light:not(:disabled):not(.disabled).active,
-.show > .btn-light.dropdown-toggle {
-  background-color: $gray-400;
-  border-color: $gray-400;
-}
-
 .btn-primary,
 .btn-success,
 .btn-danger {
@@ -42,3 +35,10 @@
     color: $white !important;
   }
 }
+
+.btn-light:not(:disabled):not(.disabled):active,
+.btn-light:not(:disabled):not(.disabled).active,
+.show > .btn-light.dropdown-toggle {
+  background-color: $gray-400;
+  border-color: $gray-400;
+}
diff --git a/resources/scss/components/_cards.scss b/resources/scss/components/_cards.scss
index 998658f6..7522e379 100644
--- a/resources/scss/components/_cards.scss
+++ b/resources/scss/components/_cards.scss
@@ -1,6 +1,10 @@
 .card-hover {
+  &.shadow-sm {
+    box-shadow: none !important;
+  }
+
   &:hover,
   &:focus {
-    background-color: lighten($gray-200, 2.5%);
+    border: 1px solid $primary;
   }
 }
diff --git a/resources/scss/components/_dropdown.scss b/resources/scss/components/_dropdown.scss
index 589f5a8c..ce3812be 100644
--- a/resources/scss/components/_dropdown.scss
+++ b/resources/scss/components/_dropdown.scss
@@ -1,3 +1,7 @@
 .dropdown-item {
   border-radius: $border-radius;
+
+  &.active {
+    font-weight: $font-weight-bold;
+  }
 }
diff --git a/resources/scss/components/_forms.scss b/resources/scss/components/_forms.scss
index fe07be05..a29d62de 100644
--- a/resources/scss/components/_forms.scss
+++ b/resources/scss/components/_forms.scss
@@ -95,20 +95,22 @@
 //
 .form-nav {
   &.nav-tabs {
+    padding: $form-nav-padding;
+
     .nav-link {
       border: 0 none;
-      font-weight: $font-weight-semibold;
-      padding: $form-nav-link-padding-y $form-nav-link-padding-x;
-    }
-
-    .nav-link.active {
-      background-color: transparent;
-      color: $primary;
       font-weight: $font-weight-bold;
+      padding: $form-nav-link-padding-y $form-nav-link-padding-x;
     }
 
     .nav-link:hover,
     .nav-link:focus {
+      background-color: $dropdown-link-hover-bg;
+      border-radius: $input-border-radius;
+    }
+
+    .nav-link.active {
+      background-color: transparent;
       color: $primary;
     }
   }
diff --git a/resources/scss/components/_layout.scss b/resources/scss/components/_layout.scss
index 1c122aeb..214bb281 100644
--- a/resources/scss/components/_layout.scss
+++ b/resources/scss/components/_layout.scss
@@ -1,10 +1,7 @@
 .page-wrapper {
-  overflow-y: auto;
-  position: absolute;
-  top: $page-top;
-  bottom: $page-bottom;
-  left: $page-margin-left;
-  right: 0;
+  background-color: $gray-100;
+  display: flex;
+  flex-direction: column;
 
   > .content {
     margin: 0;
@@ -15,9 +12,15 @@
   }
 }
 
-@include media-breakpoint-down(sm) {
-  .page-wrapper {
-    left: 0;
+@include media-breakpoint-up(lg) {
+  .page-container {
+    .sidebar {
+      width: 14rem !important;
+    }
+
+    .page-wrapper {
+      flex: 1 1 0%;
+    }
   }
 }
 
diff --git a/resources/scss/components/_loader.scss b/resources/scss/components/_loader.scss
index a99de18f..d318c1bf 100644
--- a/resources/scss/components/_loader.scss
+++ b/resources/scss/components/_loader.scss
@@ -9,20 +9,13 @@
   text-align: left;
   font-size: 16px;
   z-index: $zindex-fixed;
-
-  //> span {
-  //  position: absolute;
-  //  top: 50%;
-  //  margin-top: -20px;
-  //  left: 0;
-  //  display: block;
-  //}
 }
 
 .progress-indicator-container {
-  position: relative;
-  min-height: 42px;
-
+  &.in-progress {
+    position: relative;
+  }
+  
   .progress-indicator {
     background: transparent;
     border-radius: $border-radius;
@@ -152,6 +145,7 @@ html.cssanimations {
     display: none;
   }
 }
+
 .ti-loading {
   &.spinner-border {
     opacity: .5;
diff --git a/resources/scss/components/_mainmenu.scss b/resources/scss/components/_mainmenu.scss
index 18973c95..efdd722d 100644
--- a/resources/scss/components/_mainmenu.scss
+++ b/resources/scss/components/_mainmenu.scss
@@ -1,5 +1,5 @@
 .navbar-top {
-  background-color: $body-bg;
+  background-color: $sidenav-bg;
   padding: 0;
 
   &.navbar-expand {
@@ -15,7 +15,7 @@
 
         &:hover,
         &:focus {
-          background-color: $gray-300;
+          background-color: $sidenav-hover-bg;
           border-radius: $input-border-radius;
         }
 
@@ -102,7 +102,7 @@
 
     .dropdown-item {
       .fa {
-        margin-right: 14px;
+        margin-right: 5px;
       }
     }
 
@@ -203,22 +203,7 @@
     &.navbar-expand {
       margin-left: 0;
 
-      .navbar {
-        border-bottom: $border-width solid $gray-800;
-        background-color: $gray-900;
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        z-index: 1030;
-        padding: 0;
-      }
-
       .navbar-nav {
-        .nav-link,
-        > li.nav-item.show > a .fa {
-          color: $white;
-        }
 
         > li.dropdown.show > a::after {
           bottom: -1px;
@@ -255,8 +240,3 @@
   }
 }
 
-@include media-breakpoint-down(sm) {
-  .page-title {
-    display: none;
-  }
-}
diff --git a/resources/scss/components/_sidenav.scss b/resources/scss/components/_sidenav.scss
index 49105191..f1ba3f85 100644
--- a/resources/scss/components/_sidenav.scss
+++ b/resources/scss/components/_sidenav.scss
@@ -1,39 +1,14 @@
 .sidebar {
   background-color: $sidenav-bg;
-  position: fixed;
-  top: $page-top;
-  bottom: 0;
-  width: $page-margin-left;
 }
 
 .nav-sidebar {
-  overflow-x: hidden;
-  overflow-y: scroll;
-  table-layout: fixed;
-  position: relative;
-  display: block;
-  height: 100%;
-  bottom: 0;
-  left: 0;
-  right: 0;
 
   &::-webkit-scrollbar {
     display: none;
   }
 
-  > .nav {
-    @include flex-direction(column);
-    width: $page-margin-left;
-    padding-bottom: 35px;
-    padding-right: 13px;
-    padding-left: 5px;
-  }
-
   .nav {
-    .nav-item {
-      width: 100%;
-    }
-
     > li > a {
       display: block;
       font-weight: $font-weight-semibold;
@@ -45,17 +20,20 @@
       }
 
       .fa {
-        color: $nav-link-color;
+        color: $sidenav-icon-color;
       }
     }
 
     li.active > a,
     .nav li.active > a,
     .nav li > a.active {
-      background-color: $sidenav-hover-bg;
       font-weight: $font-weight-bold;
       border-radius: $input-border-radius;
       color: var(--bs-nav-link-hover-color);
+
+      .fa {
+        color: var(--bs-nav-link-hover-color);
+      }
     }
 
     .nav {
@@ -64,7 +42,7 @@
       }
 
       a {
-        padding-left: 48px;
+        padding-left: 42px;
         text-transform: none;
         font-weight: $font-weight-semibold;
       }
@@ -91,7 +69,7 @@
       border-width: 1px 0 0 1px;
       border-style: solid;
       border-color: initial;
-      right: 0.5em;
+      right: 1em;
       -webkit-transform: rotate(-45deg) translate(0, -50%);
       transform: rotate(-45deg) translate(0, -50%);
       -webkit-transform-origin: top;
@@ -101,30 +79,12 @@
     }
   }
 
-  .active > .has-arrow::after,
+  .active > .has-arrow[aria-expanded="true"]::after,
   .has-arrow[aria-expanded="true"]::after {
     -webkit-transform: rotate(-135deg) translate(0, -50%);
     transform: rotate(-135deg) translate(0, -50%);
   }
 }
 
-@include media-breakpoint-down(sm) {
-  .navbar-brand {
-    display: none;
-  }
-  .sidebar {
-    width: 100%;
-
-    &:not(.show) {
-      height: 0;
-    }
-  }
-  .nav-sidebar {
-    display: none;
-    position: relative;
-
-    &.show {
-      display: block;
-    }
-  }
+@include media-breakpoint-up(md) {
 }
diff --git a/resources/scss/components/_tables.scss b/resources/scss/components/_tables.scss
index 6d3ebf06..29a4b638 100644
--- a/resources/scss/components/_tables.scss
+++ b/resources/scss/components/_tables.scss
@@ -5,21 +5,15 @@
 
   .sort-col {
     cursor: pointer;
-    color: $table-hover-color;
+    color: lighten($body-color, 25%);
     text-decoration: none;
 
     .fa {
-      color: var(--bs-gray-500);
-    }
-
-    &:hover,
-    .active {
-      color: $body-color;
+      color: lighten($body-color, 65%);
     }
 
     &:hover .fa,
-    &:hover,
-    .active {
+    &.active .fa {
       color: $body-color;
     }
 
@@ -37,16 +31,6 @@
   }
 }
 
-.table-striped {
-  thead th {
-    background-color: $table-head-bg;
-  }
-
-  tbody tr {
-    background-color: $table-head-bg;
-  }
-}
-
 .table-muted .text-muted {
   filter: alpha(opacity=80);
   opacity: 0.8;
@@ -62,9 +46,9 @@
 }
 
 .table > thead > tr > th {
-  font-size: $font-size-sm;
+  font-weight: 500;
   line-height: 2;
-  color: $table-hover-color;
+  color: lighten($body-color, 25%);
   padding: .25rem;
 }
 
@@ -75,10 +59,6 @@
 
 .list-table {
   .table {
-    thead {
-      position: relative;
-    }
-
     th:first-child,
     td:first-child {
       padding-left: $page-padding-x;
@@ -93,18 +73,6 @@
   }
 
   .bulk-actions {
-    background: $white;
-    border-radius: $border-radius;
-    position: absolute;
-    top: 1px;
-    left: 0;
-    right: 0;
-    z-index: 10;
-
-    td {
-      border-bottom: 0;
-    }
-
     .btn-select-all {
       &.active {
         font-weight: $font-weight-bold;
diff --git a/resources/scss/components/_toolbar.scss b/resources/scss/components/_toolbar.scss
index b12c8ed8..c97e0d44 100644
--- a/resources/scss/components/_toolbar.scss
+++ b/resources/scss/components/_toolbar.scss
@@ -2,7 +2,6 @@
   .toolbar-action {
     clear: both;
     width: 100%;
-    padding: 0 $page-padding-x $page-padding-x;
   }
 
   @include media-breakpoint-down(sm) {
@@ -15,12 +14,8 @@
 }
 
 .toolbar-action {
-  > .btn {
-    margin-left: 5px;
-    margin-right: 5px;
-  }
-
-  .btn {
+  .btn + .btn {
+    margin-left: .5rem;
     outline: 0 none;
 
     &:first-child {
diff --git a/resources/scss/helpers/_variables.scss b/resources/scss/helpers/_variables.scss
index bda6f78c..b4b2a980 100644
--- a/resources/scss/helpers/_variables.scss
+++ b/resources/scss/helpers/_variables.scss
@@ -44,7 +44,7 @@ $icon-font-path: '../fonts/';
 $fa-font-path: $icon-font-path+'FontAwesome';
 // Body
 //
-$body-bg: $gray-200 !default;
+$body-bg: $white !default;
 $body-color: $gray-800 !default;
 
 $link-hover-decoration: none !default;
@@ -84,6 +84,7 @@ $table-hover-bg: $gray-200 !default;
 // Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
 $input-spacer: 6px !default;
 $input-font-size: $font-size-base !default;
+$input-line-height: 1.8 !default;
 //
 // Buttons
 //
@@ -109,7 +110,8 @@ $input-height-border: 3px !default;
 $form-check-input-width: 1.25em;
 $form-fields-padding: 1.25rem .725rem !default;
 $form-fields-padding-x: 20px !default;
-$form-nav-link-padding-y: .75rem !default;
+$form-nav-padding: 0.25rem !default;
+$form-nav-link-padding-y: .375rem !default;
 $form-nav-link-padding-x: 1rem !default;
 $form-label-font-size: 0.825rem !default;
 $custom-control-indicator-border-color: $gray-200 !default;
@@ -121,10 +123,6 @@ $nav-tabs-border-radius: .625rem !default;
 $nav-link-font-size: $input-font-size !default;
 $nav-link-color: lighten($dark, 35%) !default;
 $nav-link-hover-color: $body-color !default;
-// Dropdowns
-//
-// Dropdown menu container and contents.
-$dropdown-padding-x: .5rem !default;
 
 // Cards
 $card-border-color: $gray-300 !default;
@@ -137,14 +135,17 @@ $accordion-button-active-bg: transparent !default;
 $accordion-button-active-color: inherit !default;
 
 // Dropdowns
+$dropdown-padding-x: .5rem !default;
 $dropdown-border-color: rgba($black, .15) !default;
 $dropdown-divider-bg: $gray-200 !default;
 
 $dropdown-link-color: $gray-900 !default;
-$dropdown-link-hover-bg: $gray-200 !default;
+$dropdown-link-hover-bg: $gray-100 !default;
 
 $dropdown-link-disabled-color: $gray-600 !default;
 
+$dropdown-link-active-color: $primary !default;
+$dropdown-link-active-bg: transparent !default;
 $dropdown-header-color: $gray-600 !default;
 
 // Alert
@@ -171,8 +172,8 @@ $badge-color: inherit !default;
 //
 // Page
 //
-$page-padding-x: 20px !default;
-$page-padding-y: 30px !default;
+$page-padding-x: 15px !default;
+$page-padding-y: 25px !default;
 $page-top: 0 !default;
 $page-bottom: 0 !default;
 $page-margin-left: 230px !default;
@@ -189,8 +190,8 @@ $mainmenu-padding-y: 1rem !default;
 // Side nav
 //
 $sidenav-bg: lighten($body-bg, 6%) !default;
-$sidenav-hover-bg: lighten($body-bg, 4%) !default;
-$sidenav-icon-color: lighten($dark, 30%) !default;
+$sidenav-hover-bg: $dropdown-link-hover-bg !default;
+$sidenav-icon-color: lighten($dark, 50%) !default;
 $sidenav-font-size: 15px !default;
 $sidenav-submenu-font-size: $font-size-base !default;
 $sidenav-line-height: 42px !default;
diff --git a/resources/scss/utilities/_utilities.scss b/resources/scss/utilities/_utilities.scss
index 85d267e3..2f71d9ae 100644
--- a/resources/scss/utilities/_utilities.scss
+++ b/resources/scss/utilities/_utilities.scss
@@ -198,3 +198,15 @@ a[data-request] {
 .rounded-hover:hover, .rounded-hover:focus {
   border-radius: var(--bs-border-radius) !important;
 }
+
+.modal-header, .modal-footer {
+  background-color: $light-bg-subtle;
+}
+
+.modal-header {
+  border-bottom: 1px solid $light;
+}
+
+.modal-footer {
+  border-top: 1px solid $light;
+}
diff --git a/resources/scss/vendor/_choices.scss b/resources/scss/vendor/_choices.scss
index b95fdf91..d7078f53 100644
--- a/resources/scss/vendor/_choices.scss
+++ b/resources/scss/vendor/_choices.scss
@@ -68,4 +68,8 @@
 .choices[data-type*="text"] .choices__button {
   background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiIGhlaWdodD0iMjEiIHZpZXdCb3g9IjAgMCAyMSAyMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGZpbGw9IiMwYzBjMTAiPjxwYXRoIGQ9Ik0yLjU5Mi4wNDRsMTguMzY0IDE4LjM2NC0yLjU0OCAyLjU0OEwuMDQ0IDIuNTkyeiIvPjxwYXRoIGQ9Ik0wIDE4LjM2NEwxOC4zNjQgMGwyLjU0OCAyLjU0OEwyLjU0OCAyMC45MTJ6Ii8+PC9nPjwvc3ZnPg==');
   border-color: $gray-400;
-}
\ No newline at end of file
+}
+
+.choices.is-disabled .choices__inner, .choices.is-disabled .choices__input {
+  background-color: $input-disabled-bg;
+}
diff --git a/resources/views/admin/_components/aside.blade.php b/resources/views/admin/_components/aside.blade.php
index e28cb4b4..d1db9fe5 100644
--- a/resources/views/admin/_components/aside.blade.php
+++ b/resources/views/admin/_components/aside.blade.php
@@ -1,70 +1,56 @@
 @props(['navItems'])
 @if(AdminAuth::isLogged())
-    <aside {{ $attributes->merge(['class' => 'sidebar border-right', 'role' => 'navigation'])}}>
-        <div class="navbar-brand p-3 mb-3">
-            <a class="logo" href="{{ admin_url('dashboard') }}">
-                <img
-                    class="logo-svg"
-                    src="{{$site_logo !== 'no_photo.png' ? media_url($site_logo) : asset('vendor/igniter/images/favicon.svg')}}"
-                    alt="{{$site_name}}"
-                />
-            </a>
-        </div>
-        <div class="">
-            {{ $slot }}
-        </div>
-        <div id="navSidebar" class="nav-sidebar">
-            <x-igniter.admin::nav
-                id="side-nav-menu"
-                class="nav flex-column"
-            >
-                @foreach($navItems as $code => $item)
-                    @if(isset($item['child']) && empty($item['child']))
-                        @continue;
-                    @endif
-                    <x-igniter.admin::nav.item
-                        :code="$code"
-                        class="nav-item"
+    <div {{ $attributes->merge(['id' => 'navSidebar', 'class' => 'nav-sidebar w-100', 'role' => 'navigation'])}}>
+        <x-igniter.admin::nav
+            id="side-nav-menu"
+            class="nav flex-column"
+        >
+            @foreach($navItems as $code => $item)
+                @if(isset($item['child']) && empty($item['child']))
+                    @continue;
+                @endif
+                @php($isActive = (bool)AdminMenu::isActiveNavItem($code))
+                <x-igniter.admin::nav.item
+                    :code="$code"
+                    class="nav-item"
+                >
+                    <x-igniter.admin::nav.item-link
+                        :hasChildTarget="!empty($item['child']) ? '#'.$code.'-'.$loop->index : ''"
+                        class="nav-link mb-1 {{ !empty($item['child']) ? 'has-arrow' : '' }} {{ $item['class'] ?? '' }}"
+                        href="{{ $item['href'] ?? '#' }}"
+                        target="{{ $item['target'] ?? '_self' }}"
+                        aria-expanded="{{ $isActive ? 'true' : 'false' }}"
                     >
-                        <x-igniter.admin::nav.item-link
-                            :hasChildTarget="!empty($item['child']) ? '#'.$code.'-'.$loop->index : ''"
-                            class="nav-link mb-1 {{ !empty($item['child']) ? 'has-arrow' : '' }} {{ $item['class'] ?? '' }}"
-                            href="{{ $item['href'] ?? '#' }}"
-                            target="{{ $item['target'] ?? '_self' }}"
-                        >
-                            <i class="fa {{ $item['icon'] }} fa-fw"></i><span>{{ $item['title'] }}</span>
-                        </x-igniter.admin::nav.item-link>
+                        <i class="fa {{ $item['icon'] }} fa-fw"></i><span>{{ $item['title'] }}</span>
+                    </x-igniter.admin::nav.item-link>
 
-                        @if($children = array_get($item, 'child', []))
-                            @php($isActive = (bool)AdminMenu::isActiveNavItem($code))
-                            <x-igniter.admin::nav
-                                id="{{ $code }}-{{ $loop->index }}"
-                                class="nav collapse {{ $isActive ? ' show' : '' }}"
-                                aria-expanded="{{ $isActive ? 'true' : 'false' }}"
-                                data-bs-parent="#side-nav-menu"
-                            >
-                                @foreach($children as $childCode => $childItem)
-                                    @if(isset($childItem['child']) && empty($childItem['child']))
-                                        @continue;
-                                    @endif
-                                    <x-igniter.admin::nav.item
-                                        :code="$childCode"
-                                        class="nav-item w-100"
+                    @if($children = array_get($item, 'child', []))
+                        <x-igniter.admin::nav
+                            id="{{ $code }}-{{ $loop->index }}"
+                            class="nav collapse {{ $isActive ? ' show' : '' }}"
+                            data-bs-parent="#side-nav-menu"
+                        >
+                            @foreach($children as $childCode => $childItem)
+                                @if(isset($childItem['child']) && empty($childItem['child']))
+                                    @continue;
+                                @endif
+                                <x-igniter.admin::nav.item
+                                    :code="$childCode"
+                                    class="nav-item w-100"
+                                >
+                                    <x-igniter.admin::nav.item-link
+                                        class="nav-link mb-1 {{ $childItem['class'] ?? '' }}"
+                                        href="{{ $childItem['href'] ?? '#' }}"
+                                        target="{{ $childItem['target'] ?? '_self' }}"
                                     >
-                                        <x-igniter.admin::nav.item-link
-                                            class="nav-link mb-1 {{ $childItem['class'] ?? '' }}"
-                                            href="{{ $childItem['href'] ?? '#' }}"
-                                            target="{{ $childItem['target'] ?? '_self' }}"
-                                        >
-                                            <span>{{ $childItem['title'] }}</span>
-                                        </x-igniter.admin::nav.item-link>
-                                    </x-igniter.admin::nav.item>
-                                @endforeach
-                            </x-igniter.admin::nav>
-                        @endif
-                    </x-igniter.admin::nav.item>
-              @endforeach
-            </x-igniter.admin::nav>
-        </div>
-    </aside>
+                                        <span>{{ $childItem['title'] }}</span>
+                                    </x-igniter.admin::nav.item-link>
+                                </x-igniter.admin::nav.item>
+                            @endforeach
+                        </x-igniter.admin::nav>
+                    @endif
+                </x-igniter.admin::nav.item>
+            @endforeach
+        </x-igniter.admin::nav>
+    </div>
 @endif
diff --git a/resources/views/admin/_components/forms/error.blade.php b/resources/views/admin/_components/forms/error.blade.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/views/admin/_components/forms/form.blade.php b/resources/views/admin/_components/forms/form.blade.php
deleted file mode 100644
index 0827b514..00000000
--- a/resources/views/admin/_components/forms/form.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@props([
-    'method' => 'POST',
-    'hasFiles' => false,
-])
-<form
-    method="{{ $method }}"
-    action="{{ $action ?? current_url() }}"
-    {!! $hasFiles ? 'enctype="multipart/form-data"' : '' !!}
-    {{ $attributes }}
->
-    @csrf
-    @method($method)
-
-    {{ $slot }}
-</form>
diff --git a/resources/views/admin/_components/forms/help.blade.php b/resources/views/admin/_components/forms/help.blade.php
deleted file mode 100644
index e69de29b..00000000
diff --git a/resources/views/admin/_components/forms/label.blade.php b/resources/views/admin/_components/forms/label.blade.php
deleted file mode 100644
index e70e9596..00000000
--- a/resources/views/admin/_components/forms/label.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<label {{ $attributes->class(['control-label']) }}>
-    {{ $label ?? $slot }}
-</label>
diff --git a/resources/views/admin/_components/forms/select.blade.php b/resources/views/admin/_components/forms/select.blade.php
deleted file mode 100644
index c0bdc8a7..00000000
--- a/resources/views/admin/_components/forms/select.blade.php
+++ /dev/null
@@ -1,34 +0,0 @@
-@props([
-    'label' => null,
-    'placeholder' => null,
-    'options' => [],
-    'size' => null,
-    'help' => null,
-])
-
-@php
-    $key = $attributes->get('name', '');
-    $id = $attributes->get('id', '');
-@endphp
-<div class="mb-3">
-    <x-forms.label :label="$label" :for="$id"/>
-
-    <select {{ $attributes->class([
-        'form-select',
-        'form-select-' . $size => $size,
-        'is-invalid' => $errors->has($key),
-    ])->merge([
-        'id' => $id
-    ]) }}>
-        @isset($placeholder)
-            <option value="">{{ $placeholder }}</option>
-        @endisset
-
-        @foreach($options as $value => $label)
-            <option value="{{ $value }}">{{ $label }}</option>
-        @endforeach
-    </select>
-
-    <x-forms.error :key="$key"/>
-    <x-forms.help :label="$help"/>
-</div>
diff --git a/resources/views/admin/_components/header.blade.php b/resources/views/admin/_components/header.blade.php
index 27f81e56..dba6477f 100644
--- a/resources/views/admin/_components/header.blade.php
+++ b/resources/views/admin/_components/header.blade.php
@@ -1,24 +1,30 @@
 @if(AdminAuth::isLogged())
-    <nav {{ $attributes->merge(['class' => 'navbar navbar-top navbar-expand'])}}>
+    <header {{ $attributes->merge(['class' => 'navbar navbar-top navbar-expand border-bottom'])}}>
         <div class="container-fluid">
-            @if($previousUrl = AdminMenu::getPreviousUrl())
-                <a
-                    class="btn shadow-none border-none pe-0"
-                    href="{{$previousUrl}}"
-                ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
-            @endif
-            <h4 class="page-title px-2 mb-0">
-                <span>{!! Template::getHeading() !!}</span>
-            </h4>
-            <div class="navbar navbar-right py-2 pe-lg-0">
+            <div class="navbar-brand d-flex">
                 <button
-                    type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navSidebar"
-                    aria-controls="navSidebar" aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="fa fa-bars"></span>
+                    class="nav-link px-3 ms-n2 d-lg-none"
+                    type="button"
+                    data-bs-toggle="offcanvas"
+                    data-bs-target="#sidebarMenu"
+                    aria-controls="sidebarMenu"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation"
+                >
+                    <i class="fa fa-bars"></i>
                 </button>
+                <a class="logo" href="{{ admin_url('dashboard') }}">
+                    <img
+                        class="logo-svg"
+                        src="{{$site_logo !== 'no_photo.png' ? media_url($site_logo) : asset('vendor/igniter/images/favicon.svg')}}"
+                        alt="{{$site_name}}"
+                    />
+                </a>
+            </div>
 
+            <div class="navbar navbar-right py-2 pe-lg-0">
                 {{ $slot }}
             </div>
         </div>
-    </nav>
+    </header>
 @endif
diff --git a/resources/views/admin/_components/modal/close.blade.php b/resources/views/admin/_components/modal/close.blade.php
deleted file mode 100644
index e8576454..00000000
--- a/resources/views/admin/_components/modal/close.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
diff --git a/resources/views/admin/_components/modal/content.blade.php b/resources/views/admin/_components/modal/content.blade.php
deleted file mode 100644
index 51dcc360..00000000
--- a/resources/views/admin/_components/modal/content.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="modal-content">
-    @isset($title)
-        <div class="modal-header">
-            <h5 class="modal-title">{{ $title }}</h5>
-
-            <x-modal.close/>
-        </div>
-    @endisset
-
-    <div class="modal-body">
-        {{ $slot }}
-    </div>
-
-    @isset($footer)
-        <div class="modal-footer">
-            {{ $footer }}
-        </div>
-    @endisset
-</div>
diff --git a/resources/views/admin/_components/modal/form.blade.php b/resources/views/admin/_components/modal/form.blade.php
deleted file mode 100644
index ac29b159..00000000
--- a/resources/views/admin/_components/modal/form.blade.php
+++ /dev/null
@@ -1,27 +0,0 @@
-@props([
-    'label' => null,
-    'placeholder' => null,
-    'options' => [],
-    'size' => null,
-    'help' => null,
-])
-
-<x-forms.form>
-    @isset($title)
-        <div class="modal-header">
-            <h5 class="modal-title">{{ $title }}</h5>
-
-            <x-modal.close/>
-        </div>
-    @endisset
-
-    <div class="modal-body">
-        {{ $slot }}
-    </div>
-
-    @isset($footer)
-        <div class="modal-footer">
-            {{ $footer }}
-        </div>
-    @endisset
-</x-forms.form>
diff --git a/resources/views/admin/_components/modal/index.blade.php b/resources/views/admin/_components/modal/index.blade.php
deleted file mode 100644
index a6a22fe0..00000000
--- a/resources/views/admin/_components/modal/index.blade.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div
-    {{ $attributes->merge(['class' => 'modal fade', 'tabindex' => -1 , 'role'=> 'dialog', 'aria-hidden' => true]) }}
->
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            @isset($title)
-                <div class="modal-header">
-                    <h5 class="modal-title">{{ $title }}</h5>
-
-                    <x-modal.close/>
-                </div>
-            @endisset
-
-            <div class="modal-body">
-                {{ $slot }}
-            </div>
-
-            @isset($footer)
-                <div class="modal-footer">
-                    {{ $footer }}
-                </div>
-            @endisset
-        </div>
-    </div>
-</div>
diff --git a/resources/views/admin/_components/modal/loading.blade.php b/resources/views/admin/_components/modal/loading.blade.php
deleted file mode 100644
index 7325dbb2..00000000
--- a/resources/views/admin/_components/modal/loading.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div
-    {{ $attributes->merge(['class' => 'modal slideInDown fade', 'tabindex' => -1 , 'role'=> 'dialog', 'aria-hidden' => true]) }}
->
-    <div class="modal-dialog" role="document">
-        <div id="{{ $modalContentId }}" class="modal-content">
-            <div class="modal-body">
-                <div class="progress-indicator">
-                    <span class="spinner"><span class="ti-loading fa-3x fa-fw"></span></span>
-                    @lang('admin::lang.text_loading')
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/admin/_layouts/default.blade.php b/resources/views/admin/_layouts/default.blade.php
index 854c114f..3d88c8f4 100644
--- a/resources/views/admin/_layouts/default.blade.php
+++ b/resources/views/admin/_layouts/default.blade.php
@@ -6,7 +6,8 @@
     {{html(get_metas())}}
     <meta name="csrf-token" content="{{ csrf_token() }}">
     @if ($site_logo !== 'no_photo.png')
-        <link href="{{ media_thumb($site_logo, ['width' => 64, 'height' => 64]) }}" rel="shortcut icon" type="image/ico">
+        <link href="{{ media_thumb($site_logo, ['width' => 64, 'height' => 64]) }}" rel="shortcut icon"
+            type="image/ico">
     @else
         {{html(get_favicon())}}
     @endif
@@ -26,34 +27,44 @@
 </head>
 <body class="page {{ $this->bodyClass }}">
 {{Template::renderHook('startBody')}}
-<div class="h-100 w-100">
-    @if(AdminAuth::isLogged())
-        {{Template::renderHook('startSidebar')}}
-
-        <x-igniter.admin::aside :navItems="AdminMenu::getVisibleNavItems()" />
-
-        {{Template::renderHook('endSidebar')}}
-    @endif
-    <div class="page-wrapper">
-        {{Template::renderHook('startHeader')}}
-
+@if(AdminAuth::isLogged())
+    <x-igniter.admin::header>
+        {{html($this->widgets['mainmenu']->render())}}
+    </x-igniter.admin::header>
+@endif
+<div class="container-fluid p-0 h-100 w-100">
+    <div class="d-flex page-container h-100">
         @if(AdminAuth::isLogged())
-            <x-igniter.admin::header>
-                {{html($this->widgets['mainmenu']->render())}}
-            </x-igniter.admin::header>
+            <div class="sidebar border-right overflow-y-auto">
+                <div id="sidebarMenu" class="offcanvas-lg offcanvas-end px-2 py-3">
+                    <div class="offcanvas-header">
+                        <button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#sidebarMenu" aria-label="Close"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                        {{Template::renderHook('startSidebar')}}
+
+                        <x-igniter.admin::aside :navItems="AdminMenu::getVisibleNavItems()"/>
+
+                        {{Template::renderHook('endSidebar')}}
+                    </div>
+                </div>
+            </div>
         @endif
+        <div class="page-wrapper w-100 pb-5 overflow-y-auto">
+            {{Template::renderHook('startHeader')}}
 
-        {{Template::renderHook('endHeader')}}
+            {{Template::renderHook('endHeader')}}
 
-        <div class="page-content pt-4">
-            {{Template::getBlock('body')}}
-        </div>
-        <div id="notification">
-            {{Template::renderHook('startFlash')}}
+            <div class="page-content pb-5">
+                {{Template::getBlock('body')}}
+            </div>
+            <div id="notification">
+                {{Template::renderHook('startFlash')}}
 
-            {{html($this->makePartial('igniter.admin::flash'))}}
+                {{html($this->makePartial('igniter.admin::flash'))}}
 
-            {{Template::renderHook('endFlash')}}
+                {{Template::renderHook('endFlash')}}
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/admin/_partials/flash.blade.php b/resources/views/admin/_partials/flash.blade.php
index db0841c4..97e0da4c 100644
--- a/resources/views/admin/_partials/flash.blade.php
+++ b/resources/views/admin/_partials/flash.blade.php
@@ -3,7 +3,7 @@
         <div
             data-control="flash-overlay"
             data-title="{{ array_get($message, 'title') }}"
-            data-text="{{html(array_get($message, 'message'))}}"
+            data-html="{{html(array_get($message, 'message'))}}"
             data-level="{{ $message['level'] }}"
             data-close-on-click-outside="{{ $message['important'] ? 'false' : 'true' }}"
             data-close-on-esc="{{ $message['important'] ? 'false' : 'true' }}"
@@ -13,7 +13,7 @@
             @class(['alert alert-'.$message['level'], 'alert-important' => $message['important']])
             data-control="flash-message"
             data-level="{{ $message['level'] }}"
-            data-text="{{html(array_get($message, 'message'))}}"
+            data-html="{{html(array_get($message, 'message'))}}"
             data-allow-dismiss="{{ $message['important'] ? 'false' : 'true' }}"
             role="alert"
         ></div>
@@ -24,7 +24,7 @@
         class="alert alert-danger"
         data-control="flash-message"
         data-level="danger"
-        data-text='{!! htmlentities(implode('<br>', array_collapse($messages))) !!}'
+        data-html="{{html(implode('<br>', array_collapse($messages)))}}"
         data-allow-dismiss="false"
         role="alert"
     ></div>
diff --git a/resources/views/admin/_partials/form/toolbar_save_button.blade.php b/resources/views/admin/_partials/form/toolbar_save_button.blade.php
index d898c99b..a36809d9 100644
--- a/resources/views/admin/_partials/form/toolbar_save_button.blade.php
+++ b/resources/views/admin/_partials/form/toolbar_save_button.blade.php
@@ -4,7 +4,7 @@
     $eventHandler = $this->getEventHandler('onChooseSaveButtonAction');
 @endphp
 <div
-    class="btn-group"
+    class="btn-group me-2"
     data-control="form-save-actions"
 >
     <button
diff --git a/resources/views/admin/_partials/widgets/dashboardcontainer/widget_toolbar.blade.php b/resources/views/admin/_partials/widgets/dashboardcontainer/widget_toolbar.blade.php
index aa61ce71..a8dc44ee 100644
--- a/resources/views/admin/_partials/widgets/dashboardcontainer/widget_toolbar.blade.php
+++ b/resources/views/admin/_partials/widgets/dashboardcontainer/widget_toolbar.blade.php
@@ -20,7 +20,7 @@ class="modal slideInDown fade"
     </div>
 </div>
 @if($this->canManage || $this->canSetDefault)
-    <div class="toolbar-action pt-0">
+    <div class="toolbar-action d-flex justify-content-between p-3">
         @if($this->canManage)
             <div class="btn-group">
                 <button
@@ -71,7 +71,7 @@ class="btn btn-light text-reset pull-right"
             data-end-date="{{ $endDate }}"
         >
             <i class="fa fa-calendar"></i>&nbsp;&nbsp;
-            <span>{{$startDate->isoFormat($dateRangeFormat).' - '.$endDate->isoFormat($dateRangeFormat)}}</span>&nbsp;&nbsp;
+            <span class="d-none d-md-inline">{{$startDate->isoFormat($dateRangeFormat).' - '.$endDate->isoFormat($dateRangeFormat)}}</span>&nbsp;&nbsp;
             <i class="fa fa-caret-down"></i>
         </button>
     </div>
diff --git a/resources/views/admin/_partials/widgets/filter/filter.blade.php b/resources/views/admin/_partials/widgets/filter/filter.blade.php
index 6ae3ff08..b57ca07f 100644
--- a/resources/views/admin/_partials/widgets/filter/filter.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/filter.blade.php
@@ -1,57 +1,47 @@
-<div
-    class="list-filter {{ $cssClasses }}"
->
-    <div id="{{ $filterId }}" class="dropdown">
-        <button
-            id="{{ $filterId }}-button"
-            type="button"
-            class="btn btn-secondary dropdown-toggle position-absolute invisible end-0"
-            data-bs-toggle="dropdown"
-            data-bs-auto-close="false"
-            data-bs-reference=".list-table"
-            aria-expanded="false"
-        ></button>
+<div class="d-flex px-3 py-2">
+    @if($search)
+        <div class="filter-search flex-grow-1">{!! $search !!}</div>
+    @endif
+    @if(count($scopes))
         <div
-            id="{{ $filterId }}-dropdown-menu"
-            class="dropdown-menu dropdown-menu-end p-3 col-md-12 col-lg-3"
+            id="{{ $filterId }}"
+            class="list-filter ms-auto dropdown {{ $cssClasses }}"
         >
-            <form
-                id="{{ $filterId }}-form"
-                class="form-inline"
-                accept-charset="utf-8"
-                data-request="{{ $onSubmitHandler }}"
-                data-request-before-update="$('#{{ $filterId }}-button').dropdown('hide')"
-                role="form"
-                data-control="filter-form"
+            <button
+                id="{{ $filterId }}-button"
+                type="button"
+                class="btn btn-light dropdown-toggle bg-transparent border-none shadow-none"
+                data-bs-toggle="dropdown"
+                data-bs-auto-close="outside"
+                data-bs-reference=".list-table"
+                aria-expanded="false"
+            ><i class="fa fa-filter"></i></button>
+            <div
+                id="{{ $filterId }}-dropdown-menu"
+                class="dropdown-menu dropdown-menu-end p-3 mt-1"
+                style="min-width: 320px;"
             >
-                @csrf
-                <div class="d-flex flex-column">
-                    @if($search)
-                        <div class="col pb-sm-3">
-                            <div class="filter-search">{!! $search !!}</div>
-                        </div>
-                    @endif
+                <form
+                    id="{{ $filterId }}-form"
+                    accept-charset="utf-8"
+                    data-request="{{ $onSubmitHandler }}"
+                    role="form"
+                    data-control="filter-form"
+                >
+                    @csrf
+                    {!! $this->makePartial('filter/filter_scopes') !!}
 
-                    @if(count($scopes))
-                        {!! $this->makePartial('filter/filter_scopes') !!}
-                    @endif
-                </div>
-
-                <div class="d-flex justify-content-between">
-                    <button
-                        class="btn btn-primary"
-                        type="submit"
-                        data-attach-loading
-                    >@lang('igniter::admin.text_apply')</button>
-                    <button
-                        class="btn btn-link fw-bold text-decoration-none"
-                        type="button"
-                        data-request="{{ $onClearHandler }}"
-                        data-request-before-update="$('#{{ $filterId }}-button').dropdown('hide')"
-                        data-attach-loading
-                    >@lang('igniter::admin.text_clear')</button>
-                </div>
-            </form>
+                    <div class="text-end">
+                        <button
+                            class="btn btn-link p-0 fw-bold text-decoration-none"
+                            type="button"
+                            data-request="{{ $onClearHandler }}"
+                            data-request-before-update="$('#{{ $filterId }}-button').dropdown('hide')"
+                            data-attach-loading
+                        >@lang('igniter::admin.text_clear')</button>
+                    </div>
+                </form>
+            </div>
         </div>
-    </div>
+    @endif
 </div>
diff --git a/resources/views/admin/_partials/widgets/filter/filter_scopes.blade.php b/resources/views/admin/_partials/widgets/filter/filter_scopes.blade.php
index 114d0ed2..2f7f3d6a 100644
--- a/resources/views/admin/_partials/widgets/filter/filter_scopes.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/filter_scopes.blade.php
@@ -1,5 +1,5 @@
 @foreach($scopes as $scope)
-    <div class="col">
+    <div class="mb-3">
         {!! $this->renderScopeElement($scope) !!}
     </div>
 @endforeach
diff --git a/resources/views/admin/_partials/widgets/filter/scope_date.blade.php b/resources/views/admin/_partials/widgets/filter/scope_date.blade.php
index a8c80db1..893d802b 100644
--- a/resources/views/admin/_partials/widgets/filter/scope_date.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/scope_date.blade.php
@@ -1,5 +1,5 @@
 <div
-    class="filter-scope date form-group"
+    class="filter-scope date form-group mb-0"
 >
     <div class="input-group">
         <span class="input-group-text"><i class="fa fa-calendar"></i></span>
diff --git a/resources/views/admin/_partials/widgets/filter/scope_daterange.blade.php b/resources/views/admin/_partials/widgets/filter/scope_daterange.blade.php
index c09dff66..cd92eca7 100644
--- a/resources/views/admin/_partials/widgets/filter/scope_daterange.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/scope_daterange.blade.php
@@ -1,5 +1,5 @@
 <div
-    class="filter-scope daterange form-group"
+    class="filter-scope daterange form-group mb-0"
     data-control="daterangepicker"
     data-single-date-picker="false"
     data-opens="{{ array_get($scope->config, 'pickerPosition', 'left') }}"
diff --git a/resources/views/admin/_partials/widgets/filter/scope_select.blade.php b/resources/views/admin/_partials/widgets/filter/scope_select.blade.php
index 4d9227c8..ad521a34 100644
--- a/resources/views/admin/_partials/widgets/filter/scope_select.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/scope_select.blade.php
@@ -1,16 +1,16 @@
-<div class="filter-scope select form-group">
+<div class="filter-scope select form-group mb-0">
     <select
         name="{{ $this->getScopeName($scope) }}"
         data-control="selectlist"
-        @if($scope->label) data-placeholder="@lang($scope->label)" @endif
         {!! $scope->disabled ? 'disabled="disabled"' : '' !!}
     >
+        <option value="">@lang($scope->label ?: 'igniter::admin.text_please_select')</option>
         @php $options = $this->getSelectOptions($scope->scopeName) @endphp
         @foreach($options['available'] as $key => $value)
             <option
                 value="{{ $key }}"
                 {!! ($options['active'] == $key) ? 'selected="selected"' : '' !!}
-            >{{ (strpos($value, 'lang:') !== false) ? lang($value) : $value }}</option>
+            >@lang($value)</option>
         @endforeach
     </select>
 </div>
diff --git a/resources/views/admin/_partials/widgets/filter/scope_selectlist.blade.php b/resources/views/admin/_partials/widgets/filter/scope_selectlist.blade.php
index 97ff76aa..babb6b31 100644
--- a/resources/views/admin/_partials/widgets/filter/scope_selectlist.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/scope_selectlist.blade.php
@@ -4,15 +4,15 @@
     $options = $this->getSelectOptions($scope->scopeName);
     $enableFilter = (count($options['available']) > 20);
 @endphp
-<div class="filter-scope selectlist form-group">
+<div class="filter-scope selectlist form-group mb-0">
     <div class="control-selectlist w-100">
         <select
             name="{{ $this->getScopeName($scope).($selectMultiple ? '[]' : '') }}"
             data-control="selectlist"
-            @if($scope->label) data-placeholder="@lang($scope->label)" @endif
             {!! $scope->disabled ? 'disabled="disabled"' : '' !!}
             {!! $selectMultiple ? 'multiple="multiple"' : '' !!}
         >
+            <option value="">@lang($scope->label ?: 'igniter::admin.text_please_select')</option>
             @foreach($options['available'] as $key => $value)
                 @php
                     if (!is_array($options['active'])) $options['active'] = [$options['active']];
@@ -20,7 +20,7 @@
                 <option
                     value="{{ $key }}"
                     {!! in_array($key, $options['active']) ? 'selected="selected"' : '' !!}
-                >{{ (strpos($value, 'lang:') !== FALSE) ? lang($value) : $value }}</option>
+                >@lang($value)</option>
             @endforeach
         </select>
     </div>
diff --git a/resources/views/admin/_partials/widgets/filter/scope_switch.blade.php b/resources/views/admin/_partials/widgets/filter/scope_switch.blade.php
index 39309d72..a827681b 100644
--- a/resources/views/admin/_partials/widgets/filter/scope_switch.blade.php
+++ b/resources/views/admin/_partials/widgets/filter/scope_switch.blade.php
@@ -1,4 +1,4 @@
-<div class="filter-scope switch form-group">
+<div class="filter-scope switch form-group mb-0">
     <select
         name="{!! $this->getScopeName($scope) !!}"
         class="form-select"
diff --git a/resources/views/admin/_partials/widgets/lists/list_actions.blade.php b/resources/views/admin/_partials/widgets/lists/list_actions.blade.php
index a5c7e9c0..9dcbec27 100644
--- a/resources/views/admin/_partials/widgets/lists/list_actions.blade.php
+++ b/resources/views/admin/_partials/widgets/lists/list_actions.blade.php
@@ -4,17 +4,9 @@ class="bulk-actions hide"
         data-control="bulk-actions"
         data-action-total-records="{{ $records->total() }}"
     >
-        <td class="bulk-action pb-0 ">
-            <div class="form-check active">
-                <input
-                    type="checkbox" id="{{ 'checkboxAll-bulk-'.$listId }}"
-                    class="form-check-input" onclick="$('input[name*=\'checked\']').prop('checked', this.checked)"/>
-                <label class="form-check-label" for="{{ 'checkboxAll-bulk-'.$listId }}">&nbsp;</label>
-            </div>
-        </td>
-        <td class="w-100 pb-0 pt-1" colspan="999">
+        <th class="bg-warning-subtle" colspan="999">
             <div>
-                <div class="btn-counter btn py-1 text-nowrap shadow-none pe-none">
+                <div class="btn-counter btn fw-normal py-1 text-nowrap shadow-none pe-none">
                     <span data-action-counter>0</span> record(s) selected
                 </div>
                 <a
@@ -29,6 +21,6 @@ class="py-1 pl-0 btn-select-all btn btn-link hide"
                 @endforeach
             </div>
             <div id="{{$this->getId('bulk-action-modal-container')}}"></div>
-        </td>
+        </th>
     </tr>
 @endif
diff --git a/resources/views/admin/_partials/widgets/lists/list_body.blade.php b/resources/views/admin/_partials/widgets/lists/list_body.blade.php
index d1bfc759..bb76594b 100644
--- a/resources/views/admin/_partials/widgets/lists/list_body.blade.php
+++ b/resources/views/admin/_partials/widgets/lists/list_body.blade.php
@@ -34,18 +34,11 @@ class="form-check-input"
                 @continue($column->type == 'button')
                 <td
                     class="list-col-index-{{ $loop->index }} list-col-name-{{ $column->getName() }} list-col-type-{{ $column->type }} {{ $column->cssClass }}"
+                    @if($loop->last)colspan="4"@endif
                 >
                     {!! $this->getColumnValue($record, $column) !!}
                 </td>
             @endforeach
-
-            @if ($showFilter)
-                <td class="list-setup">&nbsp;</td>
-            @endif
-
-            @if ($showSetup)
-                <td class="list-setup">&nbsp;</td>
-            @endif
         </tr>
     @endforeach
 @else
diff --git a/resources/views/admin/_partials/widgets/lists/list_head.blade.php b/resources/views/admin/_partials/widgets/lists/list_head.blade.php
index c3208ba2..c176eefa 100644
--- a/resources/views/admin/_partials/widgets/lists/list_head.blade.php
+++ b/resources/views/admin/_partials/widgets/lists/list_head.blade.php
@@ -16,52 +16,47 @@ class="form-check-input" onclick="$('input[name*=\'checked\']').prop('checked',
         </th>
     @endif
 
-        @foreach($columns as $key => $column)
-            @if ($column->type == 'button')
-                <th class="list-action {{ $column->cssClass }} text-nowrap"></th>
-            @elseif ($showSorting && $column->sortable)
-                <th
-                    class="list-cell-name-{{ $column->getName() }} list-cell-type-{{ $column->type }} {{ $column->cssClass }} text-nowrap"
-                    @if ($column->width) style="width: {{ $column->width }}" @endif>
-                    <a
-                        class="sort-col"
-                        data-request="{{ $this->getEventHandler('onSort') }}"
-                        data-request-form="#lists-list-form"
-                        data-request-data="sort_by: '{{ $column->columnName }}'">
-                        <i class="fa fa-sort-{{ ($sortColumn == $column->columnName) ? strtoupper($sortDirection).' active' : 'ASC' }}"></i>&nbsp;
-                        {{ $this->getHeaderValue($column) }}
-                    </a>
-                </th>
-            @else
-                <th
-                    class="list-cell-name-{{ $column->getName() }} list-cell-type-{{ $column->type }} text-nowrap"
-                    @if ($column->width) style="width: {{ $column->width }}" @endif
-                >
-                    <span>{{ $this->getHeaderValue($column) }}</span>
-                </th>
-            @endif
-        @endforeach
-
-        @if ($showFilter)
-            <th class="list-setup">
-                <button
-                    type="button"
-                    class="btn btn-light btn-sm border-none shadow-none"
-                    data-toggle="list-filter"
-                    data-target="#filter-list-filter-button"
-                ><i class="fa fa-filter"></i></button>
+    @foreach($columns as $key => $column)
+        @if ($column->type == 'button')
+            <th class="list-action {{ $column->cssClass }} text-nowrap"></th>
+        @elseif ($showSorting && $column->sortable)
+            <th
+                @class([
+                    'list-cell-name-'.$column->getName(),
+                    'list-cell-type-'.$column->type,
+                    $column->cssClass,
+                    'text-nowrap',
+                ])
+                @if ($column->width) style="width: {{ $column->width }}" @endif>
+                <a
+                    @class(['sort-col', 'active' => $sortColumn == $column->columnName])
+                    data-request="{{ $this->getEventHandler('onSort') }}"
+                    data-request-form="#lists-list-form"
+                    data-request-data="sort_by: '{{ $column->columnName }}'">
+                    <i class="fa fa-sort-{{ ($sortColumn == $column->columnName) ? strtoupper($sortDirection) : 'ASC' }}"></i>&nbsp;
+                    {{ $this->getHeaderValue($column) }}
+                </a>
             </th>
-        @endif
-        @if ($showSetup)
-            <th class="list-setup">
-                <button
-                    type="button"
-                    class="btn btn-light btn-sm border-none shadow-none"
-                    title="@lang('igniter::admin.list.text_setup')"
-                    data-bs-toggle="modal"
-                    data-bs-target="#{{ $listId }}-setup-modal"
-                    data-request="{{ $this->getEventHandler('onLoadSetup') }}"
-                ><i class="fa fa-sliders"></i></button>
+        @else
+            <th
+                class="list-cell-name-{{ $column->getName() }} list-cell-type-{{ $column->type }} text-nowrap"
+                @if ($column->width) style="width: {{ $column->width }}" @endif
+            >
+                <span>{{ $this->getHeaderValue($column) }}</span>
             </th>
         @endif
+    @endforeach
+
+    @if ($showSetup)
+        <th class="list-setup">
+            <button
+                type="button"
+                class="btn btn-light btn-sm border-none shadow-none"
+                title="@lang('igniter::admin.list.text_setup')"
+                data-bs-toggle="modal"
+                data-bs-target="#{{ $listId }}-setup-modal"
+                data-request="{{ $this->getEventHandler('onLoadSetup') }}"
+            ><i class="fa fa-sliders"></i></button>
+        </th>
+    @endif
 </tr>
diff --git a/resources/views/admin/_partials/widgets/lists/list_pagination.blade.php b/resources/views/admin/_partials/widgets/lists/list_pagination.blade.php
index a580cbd1..9635010d 100644
--- a/resources/views/admin/_partials/widgets/lists/list_pagination.blade.php
+++ b/resources/views/admin/_partials/widgets/lists/list_pagination.blade.php
@@ -1,12 +1,12 @@
 @if ($showPagination)
-    <nav class="pagination-bar d-flex justify-content-end">
+    <div class="pagination-bar d-flex flex-column flex-md-row justify-content-end">
         @if ($showPageNumbers)
-            <div class="align-self-center">
+            <div class="align-self-center order-last order-md-first text-end w-100 p-2">
                 {{ sprintf(lang('igniter::admin.list.text_showing'), $records->firstItem() ?? 0, $records->lastItem() ?? 0, $records->total()) }}
             </div>
         @endif
         <div class="pl-3">
             {!! $records->render() !!}
         </div>
-    </nav>
+    </div>
 @endif
diff --git a/resources/views/admin/_partials/widgets/lists/list_setup_form.blade.php b/resources/views/admin/_partials/widgets/lists/list_setup_form.blade.php
index 7f3b70ad..c2d594a9 100644
--- a/resources/views/admin/_partials/widgets/lists/list_setup_form.blade.php
+++ b/resources/views/admin/_partials/widgets/lists/list_setup_form.blade.php
@@ -8,11 +8,8 @@
         <div class="modal-body">
             <div class="form-group">
                 <label class="form-label">@lang('igniter::admin.list.label_visible_columns')</label>
-                <div class="help-block">@lang('igniter::admin.list.help_visible_columns')</div>
-                <div
-                    id="lists-setup-sortable"
-                    class="list-group"
-                >
+                <div class="help-block mb-2">@lang('igniter::admin.list.help_visible_columns')</div>
+                <div>
                     @foreach($columns as $column)
                         @if ($column->type == 'button')
                             <input
@@ -27,34 +24,39 @@ class="list-group"
                                 name="column_order[]"
                                 value="{{ $column->columnName }}"
                             />
-                        @else
-                            <div class="list-group-item bg-transparent px-2">
-                                <div class="btn btn-handle shadow-none form-check-handle mr-2">
-                                    <i class="fa fa-arrows-alt-v text-muted"></i>
-                                </div>
-                                <div class="form-check form-check-inline">
-                                    <input
-                                        type="checkbox"
-                                        id="list-setup-{{ $column->columnName }}"
-                                        class="form-check-input"
-                                        name="visible_columns[]"
-                                        value="{{ $column->columnName }}"
-                                        {!! $column->invisible ? '' : 'checked="checked"' !!}
-                                    />
-                                    <label
-                                        class="form-check-label"
-                                        for="list-setup-{{ $column->columnName }}"
-                                    ><b>@lang($column->label)</b></label>
-                                </div>
-                            </div>
                         @endif
                     @endforeach
+                    <div class="list-group" id="lists-setup-sortable">
+                        @foreach($columns as $column)
+                            @if ($column->type !== 'button')
+                                <div class="list-group-item bg-transparent px-2">
+                                    <div class="btn btn-handle border-0 shadow-none form-check-handle mr-2">
+                                        <i class="fa fa-arrows-alt-v text-muted"></i>
+                                    </div>
+                                    <div class="form-check form-check-inline">
+                                        <input
+                                            type="checkbox"
+                                            id="list-setup-{{ $column->columnName }}"
+                                            class="form-check-input"
+                                            name="visible_columns[]"
+                                            value="{{ $column->columnName }}"
+                                            {!! $column->invisible ? '' : 'checked="checked"' !!}
+                                        />
+                                        <label
+                                            class="form-check-label"
+                                            for="list-setup-{{ $column->columnName }}"
+                                        ><b>@lang($column->label)</b></label>
+                                    </div>
+                                </div>
+                            @endif
+                        @endforeach
+                    </div>
                 </div>
             </div>
             @if ($this->showPagination)
                 <div class="form-group">
                     <label class="form-label">@lang('igniter::admin.list.label_page_limit')</label>
-                    <div class="help-block">@lang('igniter::admin.list.help_page_limit')</div>
+                    <div class="help-block mb-2">@lang('igniter::admin.list.help_page_limit')</div>
                     <div class="btn-group btn-group-toggle">
                         @foreach($perPageOptions as $optionValue)
                             <input
diff --git a/resources/views/admin/_partials/widgets/searchbox/searchbox.blade.php b/resources/views/admin/_partials/widgets/searchbox/searchbox.blade.php
index 08397776..48637a97 100644
--- a/resources/views/admin/_partials/widgets/searchbox/searchbox.blade.php
+++ b/resources/views/admin/_partials/widgets/searchbox/searchbox.blade.php
@@ -1,17 +1,19 @@
-<div class="input-group flex-fill">
-    <input
-        type="text"
-        name="{{ $searchBox->getName() }}"
-        class="form-control {{ $cssClasses }}"
-        value="{{ $value }}"
-        placeholder="{{ $placeholder }}"
-        autocomplete="off"
-    />
-    <button
-        class="btn btn-light"
-        type="submit"
-        data-request="{{ $searchBox->getEventHandler('onSubmit') }}"
-    >
-        <i class="fa fa-search"></i>
-    </button>
-</div>
+<form
+    id="{{ $searchBox->getId('form') }}"
+    accept-charset="utf-8"
+    data-request="{{ $searchBox->getEventHandler('onSubmit') }}"
+    role="form"
+>
+    @csrf
+    <div class="input-group flex-fill">
+        <span class="input-group-text bg-white border-end-0 pe-0"><i class="fa fa-search"></i></span>
+        <input
+            type="text"
+            name="{{ $searchBox->getName() }}"
+            class="form-control border-start-0 {{ $cssClasses }}"
+            value="{{ $value }}"
+            placeholder="{{ $placeholder }}"
+            autocomplete="off"
+        />
+    </div>
+</form>
diff --git a/resources/views/admin/_partials/widgets/toolbar/button_dropdown.blade.php b/resources/views/admin/_partials/widgets/toolbar/button_dropdown.blade.php
index 5ace28ac..d93eae7a 100644
--- a/resources/views/admin/_partials/widgets/toolbar/button_dropdown.blade.php
+++ b/resources/views/admin/_partials/widgets/toolbar/button_dropdown.blade.php
@@ -1,21 +1,24 @@
-<div class="btn-group">
-    <button
-        type="button"
-        tabindex="0"
-        {!! $button->getAttributes() !!}
-    >{!! $button->label ?: $button->name !!}</button>
-    @if($buttonMenuItems = $button->menuItems())
+@if($buttonMenuItems = $button->menuItems())
+    @php($selectedContext = $button->config['context'] ?? '')
+    <div class="btn-group">
         <button
             type="button"
-            class="{{ $button->cssClass }} dropdown-toggle dropdown-toggle-split"
+            class="{{ $button->cssClass }} dropdown-toggle"
             data-bs-toggle="dropdown"
+            data-bs-display="static"
             aria-haspopup="true"
             aria-expanded="false"
-        ><span class="sr-only">Toggle Dropdown</span></button>
+            tabindex="0"
+            {!! $button->getAttributes() !!}
+        >{!! $button->label ?: $button->name !!}</button>
         <div class="dropdown-menu">
-            @foreach($buttonMenuItems as $buttonObj)
+            @isset($button->config['header'])
+                <li><h6 class="dropdown-header px-2">@lang($button->config['header'])</h6></li>
+            @endisset
+            @foreach($buttonMenuItems as $name => $buttonObj)
+                @php($selectedContext === $name ? $buttonObj->config['class'] = ($buttonObj->config['class'] ?? '').' active px-2' : 'px-2')
                 {!! $this->renderButtonMarkup($buttonObj) !!}
             @endforeach
         </div>
-    @endif
-</div>
+    </div>
+@endif
diff --git a/resources/views/admin/_partials/widgets/toolbar/toolbar.blade.php b/resources/views/admin/_partials/widgets/toolbar/toolbar.blade.php
index a02dc6fe..5bf14313 100644
--- a/resources/views/admin/_partials/widgets/toolbar/toolbar.blade.php
+++ b/resources/views/admin/_partials/widgets/toolbar/toolbar.blade.php
@@ -3,7 +3,7 @@
     class="toolbar btn-toolbar {{ $cssClasses }}"
 >
     @if($availableButtons)
-        <div class="toolbar-action pt-0">
+        <div class="toolbar-action px-3 py-2">
             <div class="progress-indicator-container">
                 @foreach($availableButtons as $buttonObj)
                     {!! $this->renderButtonMarkup($buttonObj) !!}
diff --git a/resources/views/admin/create.blade.php b/resources/views/admin/create.blade.php
index 9fb380ec..183f19aa 100644
--- a/resources/views/admin/create.blade.php
+++ b/resources/views/admin/create.blade.php
@@ -1,15 +1,28 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open([
-        'id'     => 'edit-form',
-        'role'   => 'form',
-        'method' => 'POST',
-    ]) !!}
+    <div class="card shadow-sm mx-3">
+        {!! form_open([
+            'id'     => 'edit-form',
+            'role'   => 'form',
+            'method' => 'POST',
+        ]) !!}
 
-    {!! $this->renderFormToolbar() !!}
+        <div class="border-bottom">
+            {!! $this->renderFormToolbar() !!}
+        </div>
 
-    <div class="card shadow-sm mx-3">
         {!! $this->renderForm([], true) !!}
-    </div>
 
-    {!! form_close() !!}
+        {!! form_close() !!}
+    </div>
 </div>
diff --git a/resources/views/admin/edit.blade.php b/resources/views/admin/edit.blade.php
index e61629b8..513cafe5 100644
--- a/resources/views/admin/edit.blade.php
+++ b/resources/views/admin/edit.blade.php
@@ -1,15 +1,28 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open([
-        'id'     => 'edit-form',
-        'role'   => 'form',
-        'method' => 'PATCH',
-    ]) !!}
+    <div class="card shadow-sm mx-3">
+        {!! form_open([
+            'id'     => 'edit-form',
+            'role'   => 'form',
+            'method' => 'PATCH',
+        ]) !!}
 
-    {!! $this->renderFormToolbar() !!}
+        <div class="border-bottom">
+            {!! $this->renderFormToolbar() !!}
+        </div>
 
-    <div class="card shadow-sm mx-3">
         {!! $this->renderForm([], true) !!}
-    </div>
 
-    {!! form_close() !!}
+        {!! form_close() !!}
+    </div>
 </div>
diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php
index 8fe2fe07..79a4c221 100644
--- a/resources/views/admin/index.blade.php
+++ b/resources/views/admin/index.blade.php
@@ -1,7 +1,26 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! $this->renderListToolbar() !!}
     <div class="card shadow-sm mx-3">
-        {!! $this->renderListFilter() !!}
+        <div class="border-bottom">
+            <div class="row">
+                <div class="col-lg-9 pe-0">
+                    {!! $this->renderListToolbar() !!}
+                </div>
+                <div class="col-lg-3">
+                    {!! $this->renderListFilter() !!}
+                </div>
+            </div>
+        </div>
         {!! $this->renderList(null, true) !!}
     </div>
 </div>
diff --git a/resources/views/admin/preview.blade.php b/resources/views/admin/preview.blade.php
index 719f12c8..5e18d416 100644
--- a/resources/views/admin/preview.blade.php
+++ b/resources/views/admin/preview.blade.php
@@ -1,14 +1,27 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open([
-        'id'     => 'preview-form',
-        'role'   => 'form',
-    ]) !!}
+    <div class="card shadow-sm mx-3">
+        {!! form_open([
+            'id' => 'preview-form',
+            'role' => 'form',
+        ]) !!}
 
-    {!! $this->renderFormToolbar() !!}
+        <div class="border-bottom">
+            {!! $this->renderFormToolbar() !!}
+        </div>
 
-    <div class="card shadow-sm mx-3">
-        {!! $this->renderForm(['preview' => true]) !!}
-    </div>
+        {!! $this->renderForm(['preview' => true], true) !!}
 
-    {!! form_close() !!}
+        {!! form_close() !!}
+    </div>
 </div>
diff --git a/resources/views/main/_partials/widgets/mediamanager/folder_tree.blade.php b/resources/views/main/_partials/widgets/mediamanager/folder_tree.blade.php
index 304d32a1..7ae3f8c7 100644
--- a/resources/views/main/_partials/widgets/mediamanager/folder_tree.blade.php
+++ b/resources/views/main/_partials/widgets/mediamanager/folder_tree.blade.php
@@ -5,7 +5,7 @@ class="folder-tree px-2"
     <ul class="list-group list-group-flush">
         @foreach($folderList as $path)
             <div
-                class="list-group-item cursor-pointer p-0 py-1 link-underline link-default"
+                class="list-group-item cursor-pointer p-0 py-1 link-underline link-dark"
                 data-media-control="folder-tree-item"
                 data-path="{{ $path }}"
             >
diff --git a/resources/views/main/_partials/widgets/mediamanager/list_grid.blade.php b/resources/views/main/_partials/widgets/mediamanager/list_grid.blade.php
index da4f9c14..71add78c 100644
--- a/resources/views/main/_partials/widgets/mediamanager/list_grid.blade.php
+++ b/resources/views/main/_partials/widgets/mediamanager/list_grid.blade.php
@@ -25,7 +25,7 @@ class="media-thumb"
                     @else
                         <div class="media-icon">
                             <i class="fa fa-{{ $item->fileType }} fa-3x text-muted mb-2"></i>
-                            <span class="d-inline-block text-truncate mw-100">{{ $item->name }}</span>
+                            <span class="d-inline-block text-truncate w-100">{{ $item->name }}</span>
                         </div>
                     @endif
                 </a>
diff --git a/resources/views/main/_partials/widgets/mediamanager/mediamanager.blade.php b/resources/views/main/_partials/widgets/mediamanager/mediamanager.blade.php
index bca24d89..45c01adc 100644
--- a/resources/views/main/_partials/widgets/mediamanager/mediamanager.blade.php
+++ b/resources/views/main/_partials/widgets/mediamanager/mediamanager.blade.php
@@ -7,7 +7,7 @@ class="media-manager"
     data-select-mode="{{ $selectMode }}"
     data-unique-id="{{ $this->getId() }}"
 >
-    <div id="{{ $this->getId('toolbar') }}" class="media-toolbar">
+    <div id="{{ $this->getId('toolbar') }}" class="media-toolbar p-3">
         {!! $this->makePartial('mediamanager/toolbar') !!}
     </div>
 
@@ -16,14 +16,14 @@ class="media-manager"
     <div class="media-container bg-white">
         <div class="row no-gutters">
             <div
-                class="col-9 border-right wrap-none wrap-left"
+                class="col-9 border-right p-0"
                 data-control="media-list"
             >
-                <div id="{{ $this->getId('breadcrumb') }}" class="media-breadcrumb border-bottom">
+                <div id="{{ $this->getId('breadcrumb') }}" class="media-breadcrumb border-bottom px-3">
                     {!! $this->makePartial('mediamanager/breadcrumb') !!}
                 </div>
 
-                <div id="{{ $this->getId('item-list') }}" class="media-list-container">
+                <div id="{{ $this->getId('item-list') }}" class="media-list-container px-3">
                     @if ($this->getSetting('enable_uploads'))
                         {!! $this->makePartial('mediamanager/uploader') !!}
                     @endif
diff --git a/resources/views/main/_partials/widgets/mediamanager/popup.blade.php b/resources/views/main/_partials/widgets/mediamanager/popup.blade.php
index de7ea0ab..fb417a90 100644
--- a/resources/views/main/_partials/widgets/mediamanager/popup.blade.php
+++ b/resources/views/main/_partials/widgets/mediamanager/popup.blade.php
@@ -1,6 +1,6 @@
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
-        <div class="modal-header">
+        <div class="modal-header border-bottom">
             <h4 class="modal-title">Media Manager</h4>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
         </div>
diff --git a/resources/views/main/themes/delete.blade.php b/resources/views/main/themes/delete.blade.php
index b94b10c8..a7079ef2 100644
--- a/resources/views/main/themes/delete.blade.php
+++ b/resources/views/main/themes/delete.blade.php
@@ -1,62 +1,75 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open([
-        'id' => 'edit-form',
-        'role' => 'form',
-        'method' => 'DELETE',
-    ]) !!}
+    <div class="card shadow-sm mx-3">
+        {!! form_open([
+            'id' => 'edit-form',
+            'role' => 'form',
+            'method' => 'DELETE',
+        ]) !!}
 
-    <input type="hidden" name="_handler" value="onDelete">
-    <div class="toolbar">
-        <div class="toolbar-action">
-            <button
+        <input type="hidden" name="_handler" value="onDelete">
+        <div class="toolbar px-3 py-2 border-bottom">
+            <div class="toolbar-action">
+                <button
                     type="submit"
                     class="btn btn-danger"
                     data-request="onDelete"
-            >@lang('igniter::system.themes.button_yes_delete')</button>
-            <a class="btn btn-default" href="{{ admin_url('themes') }}">
-                @lang('igniter::system.themes.button_return_to_list')
-            </a>
+                >@lang('igniter::system.themes.button_yes_delete')</button>
+                <a class="btn btn-default" href="{{ admin_url('themes') }}">
+                    @lang('igniter::system.themes.button_return_to_list')
+                </a>
+            </div>
         </div>
-    </div>
 
-    <div class="card p-4 shadow-sm mx-3">
-        @php
-            $deleteAction = !empty($themeData)
-                ? lang('igniter::system.themes.text_files_data')
-                : lang('igniter::system.themes.text_files');
-        @endphp
-        <p>{!! sprintf(lang('igniter::system.themes.alert_delete_warning'), $deleteAction, $themeObj->label) !!}</p>
-        <p>{{ sprintf(lang('igniter::system.themes.alert_delete_confirm'), $deleteAction) }}</p>
+        <div class="form-fields p-3">
+            @php
+                $deleteAction = !empty($themeData)
+                    ? lang('igniter::system.themes.text_files_data')
+                    : lang('igniter::system.themes.text_files');
+            @endphp
+            <p>{!! sprintf(lang('igniter::system.themes.alert_delete_warning'), $deleteAction, $themeObj->label) !!}</p>
+            <p>{{ sprintf(lang('igniter::system.themes.alert_delete_confirm'), $deleteAction) }}</p>
 
-        @if ($themeData)
-            <div class="form-group span-full">
-                <label
+            @if ($themeData)
+                <div class="form-group span-full">
+                    <label
                         for="input-delete-data"
                         class="form-label"
-                >@lang('igniter::system.themes.label_delete_data')</label>
-                <br>
-                <div id="input-delete-data">
-                    <input
+                    >@lang('igniter::system.themes.label_delete_data')</label>
+                    <br>
+                    <div id="input-delete-data">
+                        <input
                             type="hidden"
                             name="delete_data"
                             value="0"
-                    >
-                    <div class="form-check form-switch">
-                        <input
+                        >
+                        <div class="form-check form-switch">
+                            <input
                                 type="checkbox"
                                 name="delete_data"
                                 id="delete-data"
                                 class="form-check-input"
                                 value="1"
-                        />
-                        <label
+                            />
+                            <label
                                 class="form-check-label"
                                 for="delete-data"
-                        >@lang('igniter::admin.text_no')/@lang('igniter::admin.text_yes')</label>
+                            >@lang('igniter::admin.text_no')/@lang('igniter::admin.text_yes')</label>
+                        </div>
                     </div>
                 </div>
-            </div>
-        @endif
+            @endif
+        </div>
+        {!! form_close() !!}
     </div>
-    {!! form_close() !!}
 </div>
diff --git a/resources/views/main/themes/index.blade.php b/resources/views/main/themes/index.blade.php
index 29dad244..b95780f4 100644
--- a/resources/views/main/themes/index.blade.php
+++ b/resources/views/main/themes/index.blade.php
@@ -1,5 +1,7 @@
 <div class="row-fluid">
-    {!! $this->widgets['toolbar']->render() !!}
+    <div class="py-3">
+        {!! $this->widgets['toolbar']->render() !!}
+    </div>
 
     {!! $this->makePartial('igniter.system::updates/search', ['itemType' => 'theme']) !!}
 
diff --git a/resources/views/system/_mail/layouts/default.blade.php b/resources/views/system/_mail/layouts/default.blade.php
index a9af10c1..156f6e44 100644
--- a/resources/views/system/_mail/layouts/default.blade.php
+++ b/resources/views/system/_mail/layouts/default.blade.php
@@ -23,7 +23,7 @@
                 @php $site_logo = setting('mail_logo') ?: $site_logo; @endphp
                 @isset($site_logo)
                     <img
-                        src="{{ \Igniter\Main\Helpers\ImageHelper::resize($site_logo, ['height' => 90]) }}"
+                        src="{{ media_thumb($site_logo, ['height' => 90]) }}"
                         alt="{{ $site_name }}"
                     >
                 @endisset
diff --git a/resources/views/system/_partials/extensions/lists/list.blade.php b/resources/views/system/_partials/extensions/lists/list.blade.php
index a4e9533d..2fbd27bc 100644
--- a/resources/views/system/_partials/extensions/lists/list.blade.php
+++ b/resources/views/system/_partials/extensions/lists/list.blade.php
@@ -1,4 +1,5 @@
-{!! form_open(current_url(),
+<div id="{{$this->getId('list')}}">
+    {!! form_open(current_url(),
     [
         'id' => $this->getId('list-form'),
         'role' => 'form',
@@ -6,16 +7,17 @@
     ]
 ) !!}
 
-<div class="list-extensions pt-3 px-3 pb-0">
-    @if(count($records))
-        {!! $this->makePartial('lists/list_body') !!}
-    @else
-        <div class="card border-none">
-            <div class="card-body p-3">{{ $emptyMessage }}</div>
-        </div>
-    @endif
-</div>
+    <div class="list-extensions pt-3 px-3 pb-0">
+        @if(count($records))
+            {!! $this->makePartial('lists/list_body') !!}
+        @else
+            <div class="card border-none">
+                <div class="card-body p-3">{{ $emptyMessage }}</div>
+            </div>
+        @endif
+    </div>
 
-{!! form_close() !!}
+    {!! form_close() !!}
 
-{!! $this->makePartial('lists/list_pagination') !!}
+    {!! $this->makePartial('lists/list_pagination') !!}
+</div>
diff --git a/resources/views/system/_partials/languages/translationseditor.blade.php b/resources/views/system/_partials/languages/translationseditor.blade.php
index 6c7f2a57..7fbb6629 100644
--- a/resources/views/system/_partials/languages/translationseditor.blade.php
+++ b/resources/views/system/_partials/languages/translationseditor.blade.php
@@ -1,3 +1,4 @@
+@php($translation = $field->options)
 <div
     id="{{ $this->getId() }}"
     class="field-translationseditor"
@@ -6,7 +7,7 @@ class="field-translationseditor"
 >
     <h5
         class="fw-600"
-    >{{ sprintf(lang('igniter::system.languages.text_locale_strings'), $translatedProgress, $totalStrings) }}</h5>
+    >{{ sprintf(lang('igniter::system.languages.text_locale_strings'), $translation->total, $translation->translated, $translation->progress, $translation->untranslated) }}</h5>
     <span class="help-block">@lang('igniter::system.languages.help_locale_strings')</span>
     <div
         id="{{ $this->getId('items') }}"
@@ -21,8 +22,8 @@ class="table-responsive mt-3"
             </tr>
             </thead>
             <tbody>
-            @if ($field->options && $field->options->count())
-                @foreach($field->options as $key => $value)
+            @if ($translation->strings->count())
+                @foreach($translation->strings as $key => $value)
                     <tr>
                         <td>
                             <a
@@ -54,7 +55,7 @@ class="btn btn-link"
                 <tr>
                     <td class="border-bottom-0" colspan="999">
                         <div class="d-flex justify-content-end pt-3">
-                            {!! $field->options->render() !!}
+                            {!! $translation->strings->render() !!}
                         </div>
                     </td>
                 </tr>
@@ -67,4 +68,15 @@ class="btn btn-link"
             </tbody>
         </table>
     </div>
+    <div class="card p-3">
+        <h4>@lang('igniter::system.languages.text_publish_translations')</h4>
+        <p>{{html(sprintf(lang('igniter::system.languages.help_publish_translations'), 'https://translate.tastyigniter.com'))}}</p>
+        <div>
+            <button
+                type="button"
+                class="btn btn-light"
+                data-request="onPublishTranslations"
+            >@lang('igniter::system.languages.button_publish_translations')</button>
+        </div>
+    </div>
 </div>
diff --git a/resources/views/system/_partials/updates/carte_info.blade.php b/resources/views/system/_partials/updates/carte_info.blade.php
index 6c39dd35..eb8952c1 100644
--- a/resources/views/system/_partials/updates/carte_info.blade.php
+++ b/resources/views/system/_partials/updates/carte_info.blade.php
@@ -8,12 +8,12 @@
                 class="btn border pull-right"
                 onclick="$('.carte-body').slideToggle()"
             ><i class="fa fa-pencil"></i></a>
-            <h3>{{ $carteInfo['name'] }}</h3>
-            <p class="mb-1">{{ $carteInfo['url'] }}</p>
+            <h6 class="mb-1">{{ $carteInfo['name'] }}</h6>
+            <p class="lead mb-1">{{ $carteInfo['url'] }}</p>
             <p class="mb-1">{{ $carteInfo['description'] ?? '' }}</p>
-            <p class="mb-1"><strong>Owner:</strong> {{ $carteInfo['owner'] }}</p>
+            <p class="mb-1">Owner: <strong>{{ $carteInfo['owner'] }}</strong></p>
             @isset($carteInfo['items_count'])
-                <p class="mb-1"><strong>Total Items:</strong> {{ $carteInfo['items_count'] }}</p>
+                <p class="mb-1">Total Items: <strong>{{ $carteInfo['items_count'] }}</strong></p>
             @endisset
         </div>
     </div>
diff --git a/resources/views/system/extensions/delete.blade.php b/resources/views/system/extensions/delete.blade.php
index 81464359..14500210 100644
--- a/resources/views/system/extensions/delete.blade.php
+++ b/resources/views/system/extensions/delete.blade.php
@@ -1,64 +1,78 @@
-{!! form_open(current_url(),
-    [
-        'id' => 'edit-form',
-        'role' => 'form',
-        'method' => 'DELETE',
-    ]
-) !!}
-
-<input type="hidden" name="_handler" value="onDelete">
-<div class="toolbar">
-    <div class="toolbar-action">
-        <button
-            type="submit"
-            class="btn btn-danger"
-            data-request="onDelete"
-        >@lang('igniter::system.extensions.button_yes_delete')</button>
-        <a class="btn btn-default" href="{{ admin_url('extensions') }}">
-            @lang('igniter::system.extensions.button_return_to_list')
-        </a>
-    </div>
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
 </div>
+<div class="row-fluid">
+    <div class="card shadow-sm mx-3">
+        {!! form_open(current_url(),
+            [
+                'id' => 'edit-form',
+                'role' => 'form',
+                'method' => 'DELETE',
+            ]
+        ) !!}
+
+        <input type="hidden" name="_handler" value="onDelete">
 
-<div class="form-fields">
-    @php $deleteAction = $extensionData
+        <div class="toolbar px-3 py-2 border-bottom">
+            <button
+                type="submit"
+                class="btn btn-danger"
+                data-request="onDelete"
+            >@lang('igniter::system.extensions.button_yes_delete')</button>
+            <a class="btn btn-default" href="{{ admin_url('extensions') }}">
+                @lang('igniter::system.extensions.button_return_to_list')
+            </a>
+        </div>
+
+        <div class="form-fields p-3">
+            @php $deleteAction = $extensionData
     ? lang('igniter::system.extensions.text_files_data')
     : lang('igniter::system.extensions.text_files');
-    @endphp
-    <p>
-        {!! sprintf(lang('igniter::system.extensions.alert_delete_warning'), $deleteAction, $extensionName) !!}
-        <br/>
-        {!! sprintf(lang('igniter::system.extensions.alert_delete_confirm'), $deleteAction) !!}
-    </p>
-    @if ($extensionData)
-        <div class="form-group span-full">
-            <label
-                for="input-delete-data"
-                class="form-label"
-            >@lang('igniter::system.extensions.label_delete_data')</label>
-            <div
-                id="input-delete-data"
-            >
-                <input
-                    type="hidden"
-                    name="delete_data"
-                    value="0"
-                >
-                <div class="form-check form-switch">
-                    <input
-                        type="checkbox"
-                        name="delete_data"
-                        id="delete-data"
-                        class="form-check-input"
-                        value="1"
-                    />
+            @endphp
+            <p>
+                {!! sprintf(lang('igniter::system.extensions.alert_delete_warning'), $deleteAction, $extensionName) !!}
+                <br/>
+                {!! sprintf(lang('igniter::system.extensions.alert_delete_confirm'), $deleteAction) !!}
+            </p>
+            @if ($extensionData)
+                <div class="form-group span-full">
                     <label
-                        class="form-check-label"
-                        for="delete-data"
-                    >@lang('igniter::admin.text_no')/@lang('igniter::admin.text_yes')</label>
+                        for="input-delete-data"
+                        class="form-label"
+                    >@lang('igniter::system.extensions.label_delete_data')</label>
+                    <div
+                        id="input-delete-data"
+                    >
+                        <input
+                            type="hidden"
+                            name="delete_data"
+                            value="0"
+                        >
+                        <div class="form-check form-switch">
+                            <input
+                                type="checkbox"
+                                name="delete_data"
+                                id="delete-data"
+                                class="form-check-input"
+                                value="1"
+                            />
+                            <label
+                                class="form-check-label"
+                                for="delete-data"
+                            >@lang('igniter::admin.text_no')/@lang('igniter::admin.text_yes')</label>
+                        </div>
+                    </div>
                 </div>
-            </div>
+            @endif
         </div>
-    @endif
+        {!! form_close() !!}
+    </div>
 </div>
-{!! form_close() !!}
diff --git a/resources/views/system/extensions/edit.blade.php b/resources/views/system/extensions/edit.blade.php
index 8720a93b..5e13ba29 100644
--- a/resources/views/system/extensions/edit.blade.php
+++ b/resources/views/system/extensions/edit.blade.php
@@ -1,15 +1,28 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open(current_url(),
-        [
-            'id' => 'edit-form',
-            'role' => 'form',
-            'method' => 'PATCH',
-        ]
-    ) !!}
-
-    {!! $this->toolbarWidget->render() !!}
     <div class="card shadow-sm mx-3">
+        {!! form_open(current_url(),
+            [
+                'id' => 'edit-form',
+                'role' => 'form',
+                'method' => 'PATCH',
+            ]
+        ) !!}
+
+        <div class="border-bottom">
+            {!! $this->toolbarWidget->render() !!}
+        </div>
         {!! $this->formWidget->render() !!}
+        {!! form_close() !!}
     </div>
-    {!! form_close() !!}
 </div>
diff --git a/resources/views/system/extensions/index.blade.php b/resources/views/system/extensions/index.blade.php
index fa884621..1c8d7a26 100644
--- a/resources/views/system/extensions/index.blade.php
+++ b/resources/views/system/extensions/index.blade.php
@@ -1,9 +1,25 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! $this->widgets['toolbar']->render() !!}
+    <div class="row align-items-center pb-3">
+        <div class="col-lg-9 pe-0">
+            {!! $this->widgets['toolbar']->render() !!}
+        </div>
+        <div class="col-lg-3">
+            {!! $this->widgets['list_filter']->render() !!}
+        </div>
+    </div>
 
     {!! $this->makePartial('updates/search', ['itemType' => 'extension']) !!}
 
-    {!! $this->widgets['list_filter']->render() !!}
-
     {!! $this->widgets['list']->render() !!}
 </div>
diff --git a/resources/views/system/languages/index.blade.php b/resources/views/system/languages/index.blade.php
new file mode 100644
index 00000000..607aadd2
--- /dev/null
+++ b/resources/views/system/languages/index.blade.php
@@ -0,0 +1,30 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
+<div class="row-fluid">
+    <div class="card shadow-sm mx-3">
+        <div class="border-bottom">
+            <div class="row align-items-center">
+                <div class="col-lg-9 pe-0">
+                    {!! $this->widgets['toolbar']->render() !!}
+                </div>
+                <div class="col-lg-3">
+                    {!! $this->widgets['list_filter']->render() !!}
+                </div>
+            </div>
+        </div>
+        <div class="border-bottom py-2">
+            {!! $this->makePartial('updates/search', ['itemType' => 'language']) !!}
+        </div>
+
+        {!! $this->widgets['list']->render() !!}
+    </div>
+</div>
diff --git a/resources/views/system/settings/edit.blade.php b/resources/views/system/settings/edit.blade.php
index f17b6818..243e641f 100644
--- a/resources/views/system/settings/edit.blade.php
+++ b/resources/views/system/settings/edit.blade.php
@@ -1,15 +1,28 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open(current_url(),
-        [
-            'id'     => 'edit-form',
-            'role'   => 'form',
-            'method' => 'PATCH',
-        ]
-    ) !!}
-
-    {!! $this->toolbarWidget->render() !!}
     <div class="card shadow-sm mx-3">
+        {!! form_open(current_url(),
+            [
+                'id'     => 'edit-form',
+                'role'   => 'form',
+                'method' => 'PATCH',
+            ]
+        ) !!}
+
+        <div class="border-bottom">
+            {!! $this->toolbarWidget->render() !!}
+        </div>
         {!! $this->formWidget->render() !!}
+        {!! form_close() !!}
     </div>
-    {!! form_close() !!}
 </div>
diff --git a/resources/views/system/settings/index.blade.php b/resources/views/system/settings/index.blade.php
index fe7ea2a0..5c74a07e 100644
--- a/resources/views/system/settings/index.blade.php
+++ b/resources/views/system/settings/index.blade.php
@@ -15,7 +15,7 @@ class="text-reset d-block h-100"
                             href="{{ $category->url }}"
                             role="button"
                         >
-                            <div @class(['card shadow-sm card-hover h-100', 'border-danger' => $hasErrors])>
+                            <div @class(['card card-hover h-100', 'border-danger' => $hasErrors])>
                                 <div class="card-body d-flex align-items-center">
                                     <div class="pr-3">
                                         @if ($item == 'core' && $hasErrors)
diff --git a/resources/views/system/systemlogs/index.blade.php b/resources/views/system/systemlogs/index.blade.php
index 57894b1c..6fa1c199 100644
--- a/resources/views/system/systemlogs/index.blade.php
+++ b/resources/views/system/systemlogs/index.blade.php
@@ -1,15 +1,28 @@
+<div class="d-flex px-3 py-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
-    {!! form_open(current_url(),
-        [
-            'id'     => 'list-form',
-            'role'   => 'form',
-            'method' => 'POST',
-        ]
-    ) !!}
+    <div class="card shadow-sm mx-3">
+        {!! form_open(current_url(),
+            [
+                'id'     => 'list-form',
+                'role'   => 'form',
+                'method' => 'POST',
+            ]
+        ) !!}
 
-    {!! $this->widgets['toolbar']->render() !!}
+        <div class="border-bottom">
+            {!! $this->widgets['toolbar']->render() !!}
+        </div>
 
-    <div class="card shadow-sm mx-3">
         <div class="list-table table-responsive">
             <table class="table table-hover border-bottom">
                 <thead>
@@ -42,7 +55,7 @@ class="text"
                             {{ $log['text'] }}
 
                             @isset($log['summary'])
-                                <br /> {{ $log['summary'] }}
+                                <br/> {{ $log['summary'] }}
                             @endisset
 
                             @if ($log['stack'])
@@ -56,7 +69,7 @@ class="text"
                 </tbody>
             </table>
         </div>
-    </div>
 
-    {!! form_close() !!}
+        {!! form_close() !!}
+    </div>
 </div>
diff --git a/resources/views/system/updates/index.blade.php b/resources/views/system/updates/index.blade.php
index 3870b41e..190c4081 100644
--- a/resources/views/system/updates/index.blade.php
+++ b/resources/views/system/updates/index.blade.php
@@ -1,18 +1,30 @@
+<div class="d-flex p-3">
+    @if($previousUrl = AdminMenu::getPreviousUrl())
+        <a
+            class="btn shadow-none border-none ps-0"
+            href="{{$previousUrl}}"
+        ><i class="fa fa-angle-left fs-4 align-bottom"></i></a>
+    @endif
+    <h4 class="page-title mb-0 lh-base">
+        <span>{!! Template::getHeading() !!}</span>
+    </h4>
+</div>
 <div class="row-fluid">
+    <div class="card shadow-sm mx-3">
+        <div class="p-3 border-bottom">
+            {!! $this->widgets['toolbar']->render() !!}
+        </div>
 
-  {!! $this->widgets['toolbar']->render() !!}
-
-  <div class="card shadow-sm mx-3">
-    @if (isset($updates) && ($updates['items']->isNotEmpty() || $updates['ignoredItems']->isNotEmpty()))
-      <div id="updates">
-        {!! $this->makePartial('updates/list') !!}
-      </div>
-    @else
-          <div class="card-body" id="list-items">
-              <h5 class="text-w-400 mb-0">@lang('igniter::system.updates.text_no_updates')</h5>
-      </div>
-    @endif
-  </div>
+        @if (isset($updates) && ($updates['items']->isNotEmpty() || $updates['ignoredItems']->isNotEmpty()))
+            <div id="updates">
+                {!! $this->makePartial('updates/list') !!}
+            </div>
+        @else
+            <div class="p-3" id="list-items">
+                <h5 class="text-w-400 mb-0">@lang('igniter::system.updates.text_no_updates')</h5>
+            </div>
+        @endif
+    </div>
 </div>
 
 {!! $this->makePartial('updates/carte') !!}
diff --git a/src/Admin/FormWidgets/Connector.php b/src/Admin/FormWidgets/Connector.php
index 845514b8..598b2e8c 100644
--- a/src/Admin/FormWidgets/Connector.php
+++ b/src/Admin/FormWidgets/Connector.php
@@ -108,7 +108,6 @@ public function loadAssets()
         $this->addJs('formwidgets/repeater.js', 'repeater-js');
 
         $this->addJs('formwidgets/recordeditor.modal.js', 'recordeditor-modal-js');
-        $this->addJs('formwidgets/recordeditor.js', 'recordeditor-js');
 
         $this->addJs('connector.js', 'connector-js');
     }
diff --git a/src/Admin/FormWidgets/RecordEditor.php b/src/Admin/FormWidgets/RecordEditor.php
index 009e45ee..0972f1fa 100644
--- a/src/Admin/FormWidgets/RecordEditor.php
+++ b/src/Admin/FormWidgets/RecordEditor.php
@@ -87,7 +87,6 @@ public function loadAssets()
         $this->addCss('formwidgets/recordeditor.css', 'recordeditor-css');
 
         $this->addJs('formwidgets/recordeditor.modal.js', 'recordeditor-modal-js');
-        $this->addJs('formwidgets/recordeditor.js', 'recordeditor-js');
     }
 
     public function prepareVars()
diff --git a/src/Admin/Http/Actions/FormController.php b/src/Admin/Http/Actions/FormController.php
index 692ab681..fa5478f1 100644
--- a/src/Admin/Http/Actions/FormController.php
+++ b/src/Admin/Http/Actions/FormController.php
@@ -119,6 +119,7 @@ public function initForm(Model $model, ?string $context = null)
         $formConfig['model'] = $model;
         $formConfig['arrayName'] = str_singular(strip_class_basename($model, '_model'));
         $formConfig['context'] = $context;
+        $formConfig['previewMode'] = $context === static::CONTEXT_PREVIEW;
 
         $this->controller->formExtendConfig($formConfig);
 
@@ -416,9 +417,9 @@ protected function setModelAttributes(Model $model, mixed $saveData)
         $singularTypes = ['belongsTo', 'hasOne', 'morphOne'];
         foreach ($saveData as $attribute => $value) {
             $isNested = ($attribute == 'pivot' || (
-                $model->hasRelation($attribute) &&
-                in_array($model->getRelationType($attribute), $singularTypes)
-            ));
+                    $model->hasRelation($attribute) &&
+                    in_array($model->getRelationType($attribute), $singularTypes)
+                ));
 
             if ($isNested && is_array($value) && $model->{$attribute}) {
                 $this->setModelAttributes($model->{$attribute}, $value);
diff --git a/src/Admin/Http/Controllers/Statuses.php b/src/Admin/Http/Controllers/Statuses.php
index 306c3d57..99f1099c 100644
--- a/src/Admin/Http/Controllers/Statuses.php
+++ b/src/Admin/Http/Controllers/Statuses.php
@@ -18,6 +18,7 @@ class Statuses extends \Igniter\Admin\Classes\AdminController
             'emptyMessage' => 'lang:igniter::admin.statuses.text_empty',
             'defaultSort' => ['status_id', 'DESC'],
             'configFile' => 'status',
+            'back' => 'settings',
         ],
     ];
 
diff --git a/src/Admin/Providers/MenuItemServiceProvider.php b/src/Admin/Providers/MenuItemServiceProvider.php
index 9eb7ee87..7cafbcba 100644
--- a/src/Admin/Providers/MenuItemServiceProvider.php
+++ b/src/Admin/Providers/MenuItemServiceProvider.php
@@ -70,29 +70,14 @@ protected function registerNavMenuItems()
                     'title' => lang('igniter::admin.side_menu.dashboard'),
                 ],
                 'restaurant' => [
-                    'priority' => 10,
+                    'priority' => 40,
                     'class' => 'restaurant',
-                    'icon' => 'fa-gem',
+                    'icon' => 'fa-utensils',
                     'title' => lang('igniter::admin.side_menu.restaurant'),
                     'child' => [],
                 ],
-                'sales' => [
-                    'priority' => 30,
-                    'class' => 'sales',
-                    'icon' => 'fa-file-invoice',
-                    'title' => lang('igniter::admin.side_menu.sale'),
-                    'child' => [
-                        'statuses' => [
-                            'priority' => 40,
-                            'class' => 'statuses',
-                            'href' => admin_url('statuses'),
-                            'title' => lang('igniter::admin.side_menu.status'),
-                            'permission' => 'Admin.Statuses',
-                        ],
-                    ],
-                ],
                 'marketing' => [
-                    'priority' => 40,
+                    'priority' => 50,
                     'class' => 'marketing',
                     'icon' => 'fa-bullseye',
                     'title' => lang('igniter::admin.side_menu.marketing'),
@@ -141,22 +126,22 @@ protected function registerNavMenuItems()
                     'icon' => 'fa-cog',
                     'title' => lang('igniter::admin.side_menu.system'),
                     'child' => [
-                        'extensions' => [
-                            'priority' => 10,
-                            'class' => 'extensions',
-                            'href' => admin_url('extensions'),
-                            'title' => lang('igniter::admin.side_menu.extension'),
-                            'permission' => 'Admin.Extensions',
-                        ],
                         'settings' => [
-                            'priority' => 20,
+                            'priority' => 0,
                             'class' => 'settings',
                             'href' => admin_url('settings'),
                             'title' => lang('igniter::admin.side_menu.setting'),
                             'permission' => 'Site.Settings',
                         ],
+                        'extensions' => [
+                            'priority' => 40,
+                            'class' => 'extensions',
+                            'href' => admin_url('extensions'),
+                            'title' => lang('igniter::admin.side_menu.extension'),
+                            'permission' => 'Admin.Extensions',
+                        ],
                         'updates' => [
-                            'priority' => 30,
+                            'priority' => 40,
                             'class' => 'updates',
                             'href' => admin_url('updates'),
                             'title' => lang('igniter::admin.side_menu.updates'),
diff --git a/src/Admin/Traits/HasChartDatasets.php b/src/Admin/Traits/HasChartDatasets.php
index f165af8d..2a392837 100644
--- a/src/Admin/Traits/HasChartDatasets.php
+++ b/src/Admin/Traits/HasChartDatasets.php
@@ -39,11 +39,16 @@ public function loadAssets()
         $this->addJs('dashboardwidgets/charts.js', 'charts-js');
     }
 
-    public function addDataset(string $code, array $config = [], bool $merge = true)
+    public function addDataset(string $code, array $config = [])
     {
-        $this->datasetsConfig[$code] = $merge
-            ? array_merge_recursive($this->datasetsConfig[$code] ?? [], $config)
-            : $config;
+        $this->datasetsConfig[$code] = $config;
+
+        return $this;
+    }
+
+    public function mergeDataset(string $code, string $key, mixed $value)
+    {
+        $this->datasetsConfig[$code][$key] = array_merge($this->datasetsConfig[$code][$key] ?? [], $value);
 
         return $this;
     }
diff --git a/src/Admin/Widgets/Filter.php b/src/Admin/Widgets/Filter.php
index 60d4a593..4d65b8e3 100644
--- a/src/Admin/Widgets/Filter.php
+++ b/src/Admin/Widgets/Filter.php
@@ -156,7 +156,7 @@ public function onSubmit()
         if ($result && is_array($result)) {
             [$redirect] = $result;
 
-            return ($redirect instanceof RedirectResponse) ? $redirect : $result;
+            return ($redirect instanceof RedirectResponse) ? $redirect : array_collapse($result);
         }
     }
 
diff --git a/src/Admin/Widgets/Form.php b/src/Admin/Widgets/Form.php
index f643d21f..e8bd7069 100644
--- a/src/Admin/Widgets/Form.php
+++ b/src/Admin/Widgets/Form.php
@@ -84,6 +84,7 @@ public function initialize()
             'data',
             'arrayName',
             'context',
+            'previewMode'
         ]);
 
         $this->optionModelTypes = [
@@ -908,7 +909,7 @@ protected function dataArrayGet(array $array, ?array $parts, $default = null): m
         if (count($parts) === 1) {
             $key = array_shift($parts);
 
-            return $array[$key] ?? $default;
+            return array_key_exists($key, $array) ? $array[$key] : $default;
         }
 
         foreach ($parts as $segment) {
diff --git a/src/Admin/Widgets/Lists.php b/src/Admin/Widgets/Lists.php
index 9ef1d4c5..0cd884cb 100644
--- a/src/Admin/Widgets/Lists.php
+++ b/src/Admin/Widgets/Lists.php
@@ -167,10 +167,8 @@ public function prepareVars()
      */
     public function onRefresh(): array
     {
-        $this->prepareVars();
-
         return [
-            '~#'.$this->getId('list') => $this->makePartial('lists/list'),
+            '~#'.$this->getId('list') => $this->render(),
         ];
     }
 
@@ -223,7 +221,7 @@ protected function prepareModel(): Builder
             foreach ($searchableColumns as $column) {
                 // Relation
                 if ($this->isColumnRelated($column)) {
-                    $table = DB::getTablePrefix().$this->model->{$column->relation}()->getTable();
+                    $table = DB::getTablePrefix().$this->model->{$column->relation}()->getModel()->getTable();
                     $columnName = isset($column->sqlSelect)
                         ? DB::raw($this->parseTableName($column->sqlSelect, $table))->getValue(DB::connection()->getSchemaGrammar())
                         : $table.'.'.$column->valueFrom;
@@ -619,7 +617,7 @@ public function getButtonAttributes(mixed $record, ListColumn $column): string
             unset($result['url']);
         }
 
-        $data = $record->getOriginal();
+        $data = $record->toArray();
         $data += [$record->getKeyName() => $record->getKey()];
 
         return parse_values($data, Html::attributes($result));
diff --git a/src/Admin/Widgets/Toolbar.php b/src/Admin/Widgets/Toolbar.php
index 72905c6c..1fad8adb 100644
--- a/src/Admin/Widgets/Toolbar.php
+++ b/src/Admin/Widgets/Toolbar.php
@@ -71,10 +71,10 @@ protected function defineButtons()
 
         $this->fireSystemEvent('admin.toolbar.extendButtonsBefore');
 
-        $this->prepareButtons();
-
         $this->addButtons($this->buttons);
 
+        $this->prepareButtons();
+
         $this->fireSystemEvent('admin.toolbar.extendButtons', [$this->allButtons]);
 
         $this->buttonsDefined = true;
diff --git a/src/Flame/Pagic/Cache/FileSystem.php b/src/Flame/Pagic/Cache/FileSystem.php
index cd871f04..0e6500ee 100644
--- a/src/Flame/Pagic/Cache/FileSystem.php
+++ b/src/Flame/Pagic/Cache/FileSystem.php
@@ -18,7 +18,7 @@ public function __construct(protected ?string $path = null)
         $this->path = $path ?? storage_path('/igniter/cache/');
     }
 
-    public function getCacheKey(?string $name, bool $hashName = false): string
+    public function getCacheKey(string $name, bool $hashName = false): string
     {
         $hash = md5($name);
         $result = str_finish($this->path, '/');
diff --git a/src/Flame/Pagic/Parsers/FileParser.php b/src/Flame/Pagic/Parsers/FileParser.php
index 7db71773..b133a12c 100644
--- a/src/Flame/Pagic/Parsers/FileParser.php
+++ b/src/Flame/Pagic/Parsers/FileParser.php
@@ -127,7 +127,7 @@ protected function compile(string $path): string
 
     protected function handleCorruptCache(array $data): array
     {
-        $path = array_get($data, 'filePath', $this->fileCache->getCacheKey($data['className']));
+        $path = array_get($data, 'filePath', $data['className'] ? $this->fileCache->getCacheKey($data['className']) : '');
         if (is_file($path)) {
             if (($className = $this->extractClassFromFile($path)) && class_exists($className)) {
                 $data['className'] = $className;
diff --git a/src/Main/Classes/ThemeManager.php b/src/Main/Classes/ThemeManager.php
index b17b66f5..92f4289c 100644
--- a/src/Main/Classes/ThemeManager.php
+++ b/src/Main/Classes/ThemeManager.php
@@ -297,15 +297,17 @@ public function checkParent(string $themeCode): bool
         return false;
     }
 
-    public function isLockedPath(string $path): bool
+    public function isLockedPath(string $path, Theme $theme): bool
     {
-        if (starts_with($path, Igniter::themesPath().'/')) {
-            $path = substr($path, strlen(Igniter::themesPath().'/'));
+        if ($theme->hasParent() && str_starts_with($path, $theme->getParent()->getPath())) {
+            return $theme->getParent()->locked;
         }
 
-        $themeCode = str_before($path, '/');
+        if (!str_starts_with($path, $theme->getPath())) {
+            return true;
+        }
 
-        return $this->isLocked($themeCode);
+        return $theme->locked;
     }
 
     //
@@ -414,7 +416,7 @@ public function renameFile(string $filePath, string $newFilePath, string $themeC
             throw new SystemException("Theme template file not found: $filePath");
         }
 
-        if ($this->isLockedPath($template->getFilePath())) {
+        if ($this->isLockedPath($template->getFilePath(), $theme)) {
             throw new SystemException(lang('igniter::system.themes.alert_theme_path_locked'));
         }
 
@@ -441,7 +443,7 @@ public function deleteFile(string $filePath, string $themeCode): bool
             throw new SystemException("Theme template file not found: $filePath");
         }
 
-        if ($this->isLockedPath($template->getFilePath())) {
+        if ($this->isLockedPath($template->getFilePath(), $theme)) {
             throw new SystemException(lang('igniter::system.themes.alert_theme_path_locked'));
         }
 
diff --git a/src/Main/Http/Controllers/Themes.php b/src/Main/Http/Controllers/Themes.php
index 52a6c6af..a0430118 100644
--- a/src/Main/Http/Controllers/Themes.php
+++ b/src/Main/Http/Controllers/Themes.php
@@ -73,13 +73,13 @@ public function edit(string $context, string $themeCode)
     {
         if (resolve(ThemeManager::class)->isLocked($themeCode)) {
             Template::setButton(lang('igniter::system.themes.button_child'), [
-                'class' => 'btn btn-default pull-right',
+                'class' => 'btn btn-default pull-right ms-2',
                 'data-request' => 'onCreateChild',
             ]);
         }
 
         Template::setButton(lang('igniter::system.themes.button_source'), [
-            'class' => 'btn btn-default pull-right mr-3',
+            'class' => 'btn btn-default pull-right',
             'href' => admin_url('themes/source/'.$themeCode),
         ]);
 
@@ -91,7 +91,7 @@ public function source(string $context, string $themeCode)
         $this->defaultView = 'edit';
         if (resolve(ThemeManager::class)->isLocked($themeCode)) {
             Template::setButton(lang('igniter::system.themes.button_child'), [
-                'class' => 'btn btn-default pull-right',
+                'class' => 'btn btn-default pull-right ms-2',
                 'data-request' => 'onCreateChild',
             ]);
         }
@@ -99,7 +99,7 @@ public function source(string $context, string $themeCode)
         $theme = resolve(ThemeManager::class)->findTheme($themeCode);
         if ($theme && $theme->hasCustomData()) {
             Template::setButton(lang('igniter::system.themes.button_customize'), [
-                'class' => 'btn btn-default pull-right mr-3',
+                'class' => 'btn btn-default pull-right',
                 'href' => admin_url('themes/edit/'.$themeCode),
             ]);
         }
@@ -206,11 +206,8 @@ public function onCreateChild(string $context, string $themeCode): RedirectRespo
 
     public function delete_onDelete(string $context, string $themeCode): RedirectResponse
     {
-        if (resolve(ThemeManager::class)->deleteTheme($themeCode, post('delete_data', 1) == 1)) {
-            flash()->success(sprintf(lang('igniter::admin.alert_success'), 'Theme deleted '));
-        } else {
-            flash()->danger(lang('igniter::admin.alert_error_try_again'));
-        }
+        resolve(ThemeManager::class)->deleteTheme($themeCode, post('delete_data', 1) == 1);
+        flash()->success(sprintf(lang('igniter::admin.alert_success'), 'Theme deleted '));
 
         return $this->redirect('themes');
     }
diff --git a/src/System/Classes/HubManager.php b/src/System/Classes/HubManager.php
index 1c37e413..046bd89a 100644
--- a/src/System/Classes/HubManager.php
+++ b/src/System/Classes/HubManager.php
@@ -12,8 +12,6 @@
  */
 class HubManager
 {
-    const ENDPOINT = 'https://api.tastyigniter.com/v2';
-
     public function listItems(array $filter = []): array
     {
         return $this->requestRemoteData('items', array_merge(['include' => 'require'], $filter));
@@ -59,7 +57,11 @@ public function setCarte(string $key, ?array $info = null): void
 
     protected function requestRemoteData(string $uri, array $params = [], ?string $eTag = null): array
     {
-        $client = Http::baseUrl(config('igniter-system.hubEndpoint', static::ENDPOINT));
+        throw_unless($endpoint = config('igniter-system.updatesEndpoint'), new SystemException(
+            'Updates endpoint not configured'
+        ));
+
+        $client = Http::baseUrl($endpoint);
 
         $response = $client->acceptJson()
             ->withHeaders($this->prepareHeaders($params))
@@ -127,6 +129,11 @@ public function listLanguages(array $filter = []): array
         return $this->requestRemoteData('languages', $filter);
     }
 
+    public function getLanguage(string $locale): array
+    {
+        return $this->requestRemoteData('language/'.$locale);
+    }
+
     public function applyLanguagePack(string $locale, ?array $items = null): array
     {
         return $this->requestRemoteData('language/apply', [
@@ -139,4 +146,12 @@ public function downloadLanguagePack(string $eTag, array $params = []): array
     {
         return $this->requestRemoteData('language/download', $params, $eTag);
     }
+
+    public function publishTranslations(string $locale, array $packs = []): array
+    {
+        return $this->requestRemoteData('language/upload', [
+            'locale' => $locale,
+            'packs' => $packs,
+        ]);
+    }
 }
diff --git a/src/System/Classes/LanguageManager.php b/src/System/Classes/LanguageManager.php
index c0134758..91fbd6b5 100644
--- a/src/System/Classes/LanguageManager.php
+++ b/src/System/Classes/LanguageManager.php
@@ -6,11 +6,13 @@
 use Igniter\Flame\Support\Facades\File;
 use Igniter\Flame\Translation\FileLoader;
 use Igniter\System\Models\Language;
+use Igniter\System\Models\Translation;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
+use stdClass;
 
 class LanguageManager
 {
@@ -76,38 +78,116 @@ public function paths(): array
     // Translations
     //
 
-    public function listLocaleFiles(string $locale): array
+    public function listLocalePackages(?string $locale = null): array
     {
+        $locale ??= 'en';
+
         $result = [];
+        $extensionManager = resolve(ExtensionManager::class);
         $namespaces = $this->loader->namespaces();
         asort($namespaces);
         foreach ($namespaces as $namespace => $folder) {
-            foreach (File::glob($folder.'/'.$locale.'/*.php') as $filePath) {
-                $result[] = [
-                    'namespace' => $namespace,
-                    'group' => pathinfo($filePath, PATHINFO_FILENAME),
-                    'system' => in_array(ucfirst($namespace), config('igniter-system.modules', [])),
-                ];
+            if ($namespace === 'igniter') {
+                $name = 'Application';
+            } else if ($extension = $extensionManager->findExtension($namespace)) {
+                $name = array_get($extension->extensionMeta(), 'name');
+            } else {
+                continue;
             }
+
+            $result[] = (object)[
+                'code' => $namespace,
+                'name' => $name,
+                'files' => File::glob($folder.'/'.$locale.'/*.php'),
+            ];
+        }
+
+        return $result;
+    }
+
+    public function listTranslations(
+        Language $model,
+        ?string $packageCode = null,
+        ?string $filter = null,
+        ?string $searchTerm = null
+    ): stdClass {
+        $result = (object)[
+            'total' => null,
+            'translated' => null,
+            'untranslated' => null,
+            'progress' => null,
+            'strings' => [],
+        ];
+
+        collect($this->listLocalePackages())
+            ->filter(function(stdClass $localePackage) use ($packageCode) {
+                return !strlen($packageCode) || $localePackage->code === $packageCode;
+            })
+            ->each(function(stdClass $localePackage) use ($filter, $result, $model) {
+                collect($localePackage->files)->each(function($filePath) use ($filter, $result, $localePackage, $model) {
+                    $filePath = pathinfo($filePath, PATHINFO_FILENAME);
+
+                    $sourceLines = $model->getLines('en', $filePath, $localePackage->code);
+                    $translationLines = $model->getTranslations($filePath, $localePackage->code);
+
+                    $result->total += count($sourceLines);
+                    $result->translated += count($translationLines);
+
+                    $localeGroup = sprintf('%s::%s', $localePackage->code, $filePath);
+                    $translations = $this->listTranslationStrings($sourceLines, $translationLines, $localeGroup, $filter);
+
+                    $result->strings = array_merge($result->strings, $translations);
+                });
+            });
+
+        if (!is_null($searchTerm) && strlen($searchTerm)) {
+            $result->strings = $this->searchTranslations($result->strings, $searchTerm);
         }
 
+        $result->strings = $this->paginateTranslations($result->strings);
+
+        $result->untranslated = $result->total - $result->translated;
+        $result->progress = $result->total ? round(($result->translated * 100) / $result->total, 2) : 0;
+
         return $result;
     }
 
-    public function listTranslations(array $sourceLines, array $translationLines, array $options = []): array
+    public function publishTranslations(Language $model)
     {
-        $file = array_get($options, 'file');
-        $stringFilter = array_get($options, 'stringFilter');
+        $translations = $model->translations()
+            ->get()
+            ->groupBy(function(Translation $translation) {
+                return sprintf("%s::%s", $translation->namespace, $translation->group);
+            })
+            ->map(function(Collection $translations, string $group) {
+                return [
+                    'name' => $group,
+                    'strings' => $translations
+                        ->map(function(Translation $translation) {
+                            return [
+                                'key' => $translation->item,
+                                'value' => $translation->text,
+                            ];
+                        })
+                        ->all()
+                ];
+            })
+            ->all();
+
+        $this->hubManager->publishTranslations($model->code, $translations);
+    }
 
+    protected function listTranslationStrings(array $sourceLines, array $translationLines, string $localeGroup, string $filter): array
+    {
         $result = [];
         foreach ($sourceLines as $key => $sourceLine) {
             $translationLine = array_get($translationLines, $key, $sourceLine);
 
-            if ($stringFilter === 'changed' && !array_has($translationLines, $key)) {
+            if ($filter === 'changed' && !array_has($translationLines, $key)) {
                 continue;
             }
 
-            if ($stringFilter === 'unchanged' && array_has($translationLines, $key)) {
+            if ($filter === 'unchanged' && array_has($translationLines, $key)) {
                 continue;
             }
 
@@ -119,9 +199,7 @@ public function listTranslations(array $sourceLines, array $translationLines, ar
                 continue;
             }
 
-            $namespacedKey = sprintf('%s::%s.%s', $file['namespace'], $file['group'], $key);
-
-            $result[$namespacedKey] = [
+            $result[sprintf('%s.%s', $localeGroup, $key)] = [
                 'source' => $sourceLine,
                 'translation' => (strcmp($sourceLine, $translationLine) === 0) ? '' : $translationLine,
             ];
@@ -130,12 +208,8 @@ public function listTranslations(array $sourceLines, array $translationLines, ar
         return $result;
     }
 
-    public function searchTranslations(array $translations, ?string $term = null): array
+    protected function searchTranslations(array $translations, ?string $term = null): array
     {
-        if (!strlen($term)) {
-            return $translations;
-        }
-
         $result = [];
         $term = strtolower($term);
         foreach ($translations as $key => $value) {
@@ -153,13 +227,12 @@ public function searchTranslations(array $translations, ?string $term = null): a
         return $result;
     }
 
-    public function paginateTranslations(array $translations, int $perPage = 50): LengthAwarePaginator
+    protected function paginateTranslations(array $translations, int $perPage = 50): LengthAwarePaginator
     {
         $page = Paginator::resolveCurrentPage();
 
         $items = collect($translations);
         $total = $items->count();
-
         $items = $total ? $items->forPage($page, $perPage) : collect();
 
         $options = [
@@ -196,6 +269,13 @@ public function searchLanguages(string $term): array
         return $items;
     }
 
+    public function findLanguage(string $locale): array
+    {
+        $result = $this->getHubManager()->getLanguage($locale);
+
+        return array_get($result, 'data', []);
+    }
+
     public function requestUpdateList(string $locale, bool $force = false): array
     {
         $cacheKey = 'translation_string_updates';
@@ -213,14 +293,6 @@ public function requestUpdateList(string $locale, bool $force = false): array
         return $response;
     }
 
-    public function hasNewStrings(string $locale): int
-    {
-        $cacheKey = 'translation_string_updates';
-        $cacheKey .= '.'.$locale;
-
-        return count(array_get(cache()->get($cacheKey), 'items', []));
-    }
-
     public function applyLanguagePack(string $locale, ?array $builds = null): array
     {
         $items = collect($this->updateManager->getInstalledItems())
diff --git a/src/System/Console/Commands/LanguageInstall.php b/src/System/Console/Commands/LanguageInstall.php
index 7905b085..855d529f 100644
--- a/src/System/Console/Commands/LanguageInstall.php
+++ b/src/System/Console/Commands/LanguageInstall.php
@@ -2,7 +2,6 @@
 
 namespace Igniter\System\Console\Commands;
 
-use Igniter\Flame\Exception\ApplicationException;
 use Igniter\System\Classes\LanguageManager;
 use Igniter\System\Models\Language;
 use Illuminate\Console\Command;
@@ -19,7 +18,9 @@ public function handle()
     {
         $locale = $this->argument('locale');
 
-        throw_unless($language = Language::findByCode($locale), new ApplicationException('Language not found'));
+        if (!$language = Language::findByCode($locale)) {
+            $language = Language::make(['code' => $locale]);
+        }
 
         $languageManager = resolve(LanguageManager::class);
         if (!$response = $languageManager->applyLanguagePack($language->code, (array)$language->version)) {
@@ -34,6 +35,12 @@ public function handle()
 
         $this->output->writeln(sprintf('<info>%s translated strings found</info>', count($response)));
 
+        if (!$language->exists) {
+            $language->name = $response[0]['name'];
+            $language->status = true;
+            $language->save();
+        }
+
         foreach ($response as $languageBuild) {
             $this->output->writeln(sprintf('<info>Installing %s translated strings for %s</info>', $language->code, $languageBuild['name']));
             $languageManager->installLanguagePack($language->code, [
@@ -43,6 +50,8 @@ public function handle()
                 'build' => str_after($languageBuild['version'], '+'),
                 'hash' => $languageBuild['hash'],
             ]);
+
+            $language->updateVersions($languageBuild);
         }
     }
 
diff --git a/src/System/Http/Controllers/Languages.php b/src/System/Http/Controllers/Languages.php
index 56c01065..bf436323 100644
--- a/src/System/Http/Controllers/Languages.php
+++ b/src/System/Http/Controllers/Languages.php
@@ -7,12 +7,11 @@
 use Igniter\Admin\Facades\Template;
 use Igniter\Admin\Widgets\Form;
 use Igniter\Flame\Database\Model;
-use Igniter\System\Classes\ExtensionManager;
+use Igniter\Flame\Exception\FlashException;
 use Igniter\System\Classes\LanguageManager;
 use Igniter\System\Models\Language;
 use Igniter\System\Traits\ManagesUpdates;
 use Igniter\System\Traits\SessionMaker;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 class Languages extends \Igniter\Admin\Classes\AdminController
 {
@@ -131,14 +130,14 @@ public function edit_onSubmitFilter(?string $context = null, ?string $recordId =
 
         $this->asExtension('FormController')->initForm($model, $context);
 
-        $file = post('Language._file');
-        $this->setFilterValue('file', (!strlen($file) || strpos($file, '::') == false) ? null : $file);
+        $group = post('Language._group');
+        $this->setFilterValue('group', !strlen($group) ? null : $group);
 
         $term = post('Language._search');
-        $this->setFilterValue('search', (!strlen($term) || !is_string($term)) ? null : $term);
+        $this->setFilterValue('search', (!is_string($term) || !strlen($term)) ? null : $term);
 
-        $stringFilter = post('Language._string_filter');
-        $this->setFilterValue('string_filter', (!strlen($stringFilter) || !is_string($stringFilter)) ? null : $stringFilter);
+        $filter = post('Language._filter');
+        $this->setFilterValue('filter', (!strlen($filter) || !is_string($filter)) ? null : $filter);
 
         return $this->asExtension('FormController')->makeRedirect('edit', $model);
     }
@@ -155,6 +154,47 @@ public function edit_onCheckUpdates(?string $context = null, ?string $recordId =
         ]);
     }
 
+    public function edit_onPublishTranslations(?string $context = null, ?string $recordId = null)
+    {
+        $model = $this->formFindModelObject($recordId);
+
+        resolve(LanguageManager::class)->publishTranslations($model);
+
+        flash()->success(lang('igniter::system.languages.alert_publish_success'));
+
+        return $this->asExtension('FormController')->makeRedirect('edit', $model);
+    }
+
+    public function onApplyItems()
+    {
+        $items = post('items') ?? [];
+        if (!count($items)) {
+            throw new FlashException(lang('igniter::system.updates.alert_no_items'));
+        }
+
+        $this->validateItems();
+
+        $itemMeta = $items[0];
+
+        throw_unless(
+            $response = resolve(LanguageManager::class)->findLanguage($itemMeta['name']),
+            new FlashException(lang('igniter::system.languages.alert_language_not_found'))
+        );
+
+        if (!Language::findByCode($itemMeta['name'])) {
+            $language = Language::make(['code' => $itemMeta['name']]);
+            $language->name = $response['name'];
+            $language->status = true;
+            $language->save();
+        }
+
+        $response = resolve(LanguageManager::class)->applyLanguagePack($itemMeta['name']);
+
+        return [
+            'steps' => $response ? $this->buildProcessSteps([$response]) : [],
+        ];
+    }
+
     public function onApplyUpdate(?string $context = null, ?string $recordId = null)
     {
         $model = $this->formFindModelObject($recordId);
@@ -211,12 +251,14 @@ public function onProcessItems(?string $context = null, ?string $recordId = null
 
     public function formExtendModel(Model $model)
     {
-        $hasNewStrings = resolve(LanguageManager::class)->hasNewStrings($model->code);
+        if (!$model->exists) {
+            return;
+        }
 
-        Template::setButton(lang($hasNewStrings ? 'igniter::system.languages.button_apply_update' : 'igniter::system.languages.button_check'), [
-            'class' => 'btn btn-success pull-right',
+        Template::setButton(lang('igniter::system.languages.button_import_translations'), [
+            'class' => 'btn btn-light pull-right',
             'data-toggle' => 'record-editor',
-            'data-handler' => $hasNewStrings ? 'onApplyUpdates' : 'onCheckUpdates',
+            'data-handler' => 'onCheckUpdates',
         ]);
     }
 
@@ -226,32 +268,19 @@ public function formExtendFields(Form $form, array $fields)
             return;
         }
 
-        $fileField = $form->getField('_file');
+        $groupField = $form->getField('_group');
         $searchField = $form->getField('_search');
-        $stringFilterField = $form->getField('_string_filter');
+        $filterField = $form->getField('_filter');
         $field = $form->getField('translations');
 
-        $fileField->value = $this->getFilterValue('file');
+        $groupField->value = $this->getFilterValue('group');
         $searchField->value = $this->getFilterValue('search');
-        $stringFilterField->value = $this->getFilterValue('string_filter', 'all');
+        $filterField->value = $this->getFilterValue('filter', 'changed');
         $field->value = $this->getFilterValue('search');
 
-        if (is_null($this->localeFiles)) {
-            $this->localeFiles = resolve(LanguageManager::class)->listLocaleFiles('en');
-        }
-
-        $fileField->options = $this->prepareNamespaces();
-        $field->options = post($field->getName()) ?: $this->prepareTranslations($form->model);
-
-        if ($form->model->version) {
-            Template::setButton(sprintf(lang('igniter::system.languages.text_current_build'), $form->model->version), [
-                'class' => 'btn disabled text-muted pull-right', 'role' => 'button',
-            ]);
-        }
-
-        $this->vars['totalStrings'] = $this->totalStrings;
-        $this->vars['totalTranslated'] = $this->totalTranslated;
-        $this->vars['translatedProgress'] = $this->totalStrings ? round(($this->totalTranslated * 100) / $this->totalStrings, 2) : 0;
+        $field->options = resolve(LanguageManager::class)->listTranslations(
+            $form->model, $groupField->value, $filterField->value, $searchField->value
+        );
     }
 
     protected function getFilterValue(string $key, ?string $default = null)
@@ -268,63 +297,6 @@ protected function setFilterValue(string $key, ?string $value = null)
         }
     }
 
-    protected function prepareNamespaces(): array
-    {
-        $result = [];
-
-        $extensionManager = resolve(ExtensionManager::class);
-
-        foreach ($this->localeFiles as $file) {
-            $name = sprintf('%s::%s', $file['namespace'], $file['group']);
-
-            if (!array_get($file, 'system', false)
-                && ($extension = $extensionManager->findExtension($file['namespace']))) {
-                $result[$name] = array_get($extension->extensionMeta(), 'name').' - '.$name;
-            } else {
-                $result[$name] = ucfirst($file['namespace']).' - '.$name;
-            }
-        }
-
-        return $result;
-    }
-
-    protected function prepareTranslations(Language $model): LengthAwarePaginator
-    {
-        $this->totalStrings = 0;
-        $this->totalTranslated = 0;
-        $stringFilter = $this->getFilterValue('string_filter');
-        $files = collect($this->localeFiles);
-
-        $file = $this->getFilterValue('file');
-        if (strlen($file) && strpos($file, '::')) {
-            [$namespace, $group] = explode('::', $file);
-            $files = $files->where('group', $group)->where('namespace', $namespace);
-        }
-
-        $manager = resolve(LanguageManager::class);
-
-        $result = [];
-        $files->each(function($file) use ($manager, $model, &$result, $stringFilter) {
-            $sourceLines = $model->getLines('en', $file['group'], $file['namespace']);
-            $translationLines = $model->getTranslations($file['group'], $file['namespace']);
-
-            $this->totalStrings += count($sourceLines);
-            $this->totalTranslated += count($translationLines);
-
-            $translations = $manager->listTranslations($sourceLines, $translationLines, [
-                'file' => $file,
-                'stringFilter' => $stringFilter,
-            ]);
-
-            $result = array_merge($result, $translations);
-        });
-
-        $term = $this->getFilterValue('search');
-        $result = $manager->searchTranslations($result, $term);
-
-        return $manager->paginateTranslations($result);
-    }
-
     protected function buildProcessSteps(array $itemsToUpdate): array
     {
         $processSteps = [];
diff --git a/src/System/Http/Controllers/SystemLogs.php b/src/System/Http/Controllers/SystemLogs.php
index aa08bc20..cf60ac2b 100644
--- a/src/System/Http/Controllers/SystemLogs.php
+++ b/src/System/Http/Controllers/SystemLogs.php
@@ -24,7 +24,7 @@ public function index()
             'href' => 'system_logs',
         ]);
         Template::setButton(lang('igniter::system.system_logs.button_empty'), [
-            'class' => 'btn btn-danger',
+            'class' => 'btn btn-link pull-right text-danger text-decoration-none',
             'data-request-form' => '#lists-list-form',
             'data-request' => 'onEmptyLog',
             'data-request-confirm' => lang('igniter::admin.alert_warning_confirm'),
diff --git a/src/System/Models/Language.php b/src/System/Models/Language.php
index 4ea0ef79..25d9017f 100644
--- a/src/System/Models/Language.php
+++ b/src/System/Models/Language.php
@@ -4,6 +4,7 @@
 
 use Igniter\Flame\Database\Factories\HasFactory;
 use Igniter\Flame\Database\Traits\Purgeable;
+use Igniter\System\Classes\LanguageManager;
 use Igniter\System\Models\Concerns\Defaultable;
 use Igniter\System\Models\Concerns\Switchable;
 use Illuminate\Support\Facades\Lang;
@@ -105,9 +106,12 @@ public static function supportsLocale(): bool
     // Translations
     //
 
-    public function listAllFiles()
+    public function getGroupOptions(?string $locale = null)
     {
-        traceLog('Method Language::listAllFiles() has been deprecated. Use Translator loader instead.');
+        return collect(resolve(LanguageManager::class)->listLocalePackages($locale))
+            ->mapWithKeys(function($localePackage) {
+                return [$localePackage->code => $localePackage->name];
+            });
     }
 
     public function getLines(string $locale, string $group, ?string $namespace = null): array
@@ -140,7 +144,7 @@ public function addTranslations(array $translations): bool
 
             [, $namespace, $group, $item] = $matches;
 
-            $this->updateTranslation($group, $namespace, $item, $translation['translation']);
+            $this->updateTranslation($group, $namespace, $item, (string)$translation['translation']);
         }
 
         return true;
diff --git a/src/System/Models/Settings.php b/src/System/Models/Settings.php
index 25706f9c..b73e9d0f 100644
--- a/src/System/Models/Settings.php
+++ b/src/System/Models/Settings.php
@@ -120,7 +120,7 @@ public static function onboardingIsComplete()
 
     public function getValueAttribute()
     {
-        return ($value = @unserialize($this->attributes['value']))
+        return ($value = @unserialize($this->attributes['value'] ?? ''))
             ? $value
             : $this->attributes['value'];
     }
@@ -165,17 +165,16 @@ public function getFieldValues(string $group = 'config')
             return [];
         }
 
-        if (is_array($fieldValues = array_get($this->fieldValues, $group))) {
-            return $fieldValues;
+        if (is_array($this->fieldValues[$group] ?? '')) {
+            return $this->fieldValues[$group];
         }
 
-        $values = [];
-        $records = $this->newQuery()->where('sort', $group)->get();
-        foreach ($records as $record) {
-            $values[$record->item] = $record->value;
-        }
-
-        return $this->fieldValues[$group] = array_undot($values);
+        return $this->fieldValues[$group] = $this
+            ->newQuery()
+            ->where('sort', $group)
+            ->pluck('value', 'item')
+            ->undot()
+            ->all();
     }
 
     public function resetFieldValues()
diff --git a/src/System/Providers/FormServiceProvider.php b/src/System/Providers/FormServiceProvider.php
index 4ff69dc3..809720bb 100644
--- a/src/System/Providers/FormServiceProvider.php
+++ b/src/System/Providers/FormServiceProvider.php
@@ -31,6 +31,15 @@ public function register()
                     'form' => 'mailsettings',
                     'request' => \Igniter\System\Http\Requests\MailSettingsRequest::class,
                 ],
+                'statuses' => [
+                    'label' => 'lang:igniter::admin.side_menu.status',
+                    'description' => 'lang:igniter::system.settings.text_tab_desc_status',
+                    'icon' => 'fa fa-diagram-project',
+                    'priority' => 45,
+                    'class' => 'statuses',
+                    'permission' => ['Admin.Statuses'],
+                    'url' => admin_url('statuses'),
+                ],
                 'languages' => [
                     'label' => 'lang:igniter::system.settings.text_tab_language',
                     'description' => 'lang:igniter::system.settings.text_tab_desc_language',
diff --git a/src/System/Traits/ManagesUpdates.php b/src/System/Traits/ManagesUpdates.php
index 2d19d433..8fa1b350 100644
--- a/src/System/Traits/ManagesUpdates.php
+++ b/src/System/Traits/ManagesUpdates.php
@@ -209,7 +209,7 @@ protected function validateItems(): array
         return $this->validate(post(), [
             'items.*.name' => ['required'],
             'items.*.type' => ['required', 'in:core,extension,theme,language'],
-            'items.*.ver' => ['required'],
+            'items.*.ver' => ['sometimes', 'required'],
             'items.*.action' => ['required', 'in:install,update'],
         ], [], [
             'items.*.name' => lang('igniter::system.updates.label_meta_code'),
diff --git a/tests/src/Admin/Classes/NavigationTest.php b/tests/src/Admin/Classes/NavigationTest.php
index d11dd674..ba7b3eeb 100644
--- a/tests/src/Admin/Classes/NavigationTest.php
+++ b/tests/src/Admin/Classes/NavigationTest.php
@@ -44,8 +44,6 @@
         ->toHaveKeys([
             'dashboard',
             'restaurant',
-            'sales.child.statuses',
-            'sales',
             'marketing',
             'design.child.themes',
             'tools.child.media_manager',
diff --git a/tests/src/Admin/DashboardWidgets/ChartsTest.php b/tests/src/Admin/DashboardWidgets/ChartsTest.php
index 132648a1..8966eb7f 100644
--- a/tests/src/Admin/DashboardWidgets/ChartsTest.php
+++ b/tests/src/Admin/DashboardWidgets/ChartsTest.php
@@ -40,7 +40,7 @@
 
     expect($this->charts->vars['chartContext'])->toBe('reports')
         ->and($this->charts->vars['chartType'])->toBe('line')
-        ->and($this->charts->vars['chartLabel'])->toBe('igniter::admin.dashboard.text_reports_chart')
+        ->and($this->charts->vars['chartLabel'])->toBe('--')
         ->and($this->charts->vars['chartIcon'])->toBe('fa fa-bar-chart-o')
         ->and($this->charts->vars['chartData'])->toBeArray()->toHaveKey('datasets');
 });
diff --git a/tests/src/Admin/FormWidgets/ConnectorTest.php b/tests/src/Admin/FormWidgets/ConnectorTest.php
index b822ca8a..1a5b109a 100644
--- a/tests/src/Admin/FormWidgets/ConnectorTest.php
+++ b/tests/src/Admin/FormWidgets/ConnectorTest.php
@@ -54,7 +54,6 @@
 it('loads assets correctly', function() {
     Assets::shouldReceive('addJs')->once()->with('formwidgets/repeater.js', 'repeater-js');
     Assets::shouldReceive('addJs')->once()->with('formwidgets/recordeditor.modal.js', 'recordeditor-modal-js');
-    Assets::shouldReceive('addJs')->once()->with('formwidgets/recordeditor.js', 'recordeditor-js');
     Assets::shouldReceive('addJs')->once()->with('connector.js', 'connector-js');
 
     $this->connectorWidget->assetPath = [];
diff --git a/tests/src/Admin/FormWidgets/RecordEditorTest.php b/tests/src/Admin/FormWidgets/RecordEditorTest.php
index bf12423d..3e60f4b9 100644
--- a/tests/src/Admin/FormWidgets/RecordEditorTest.php
+++ b/tests/src/Admin/FormWidgets/RecordEditorTest.php
@@ -63,7 +63,6 @@
     Assets::shouldReceive('addJs')->once()->with('formwidgets/repeater.js', 'repeater-js');
     Assets::shouldReceive('addCss')->once()->with('formwidgets/recordeditor.css', 'recordeditor-css');
     Assets::shouldReceive('addJs')->once()->with('formwidgets/recordeditor.modal.js', 'recordeditor-modal-js');
-    Assets::shouldReceive('addJs')->once()->with('formwidgets/recordeditor.js', 'recordeditor-js');
 
     $this->recordEditorWidget->assetPath = [];
 
diff --git a/tests/src/Admin/Widgets/FilterTest.php b/tests/src/Admin/Widgets/FilterTest.php
index 87291056..24c5182e 100644
--- a/tests/src/Admin/Widgets/FilterTest.php
+++ b/tests/src/Admin/Widgets/FilterTest.php
@@ -87,7 +87,7 @@
     ]]);
 
     $this->filterWidget->bindEvent('filter.submit', function($params) {
-        return 'triggered';
+        return ['triggered'];
     });
 
     $result = $this->filterWidget->onSubmit();
diff --git a/tests/src/Admin/Widgets/ListsTest.php b/tests/src/Admin/Widgets/ListsTest.php
index ddc4b906..c55b8adf 100644
--- a/tests/src/Admin/Widgets/ListsTest.php
+++ b/tests/src/Admin/Widgets/ListsTest.php
@@ -88,7 +88,6 @@ public function refreshList($alias)
         ->toHaveKey('showCheckboxes')
         ->toHaveKey('showDragHandle')
         ->toHaveKey('showSetup')
-        ->toHaveKey('showFilter')
         ->toHaveKey('showPagination')
         ->toHaveKey('showPageNumbers')
         ->toHaveKey('showSorting')