diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7761553..7d2bd88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,161 +1,5 @@
 ## [Unreleased]
 
-### Added
-* feat(repository): add RepositoryQuery::addCaseInsensitiveFilters()
-* feat(repository): add RepositoryQuery::addForcedFilterHandler()
-
-### Fixed
-* fix(crud/index): fix row attribute value render
-* fix(crud/navigation_setting): fix form action
-* fix(crud/template): use default route params
-
-## [v1.27.0] - 2025-12-22
-### Fixed
-* fix(crud): use route params to redirect after a delation
-
-### Added
-* add option `removeItemButton: true` when applying choices.js
-* feat(builder): allow to define `allowed_widgets` in form options
-* feat(collection): add delete_attr, add_attr options
-* feat(builder): allow to add block between children
-* feat(builder): improve UI to add new block
-* feat(settings): allow to edit a setting in plain page
-* feat(crud/index): allow to define row attributes
-
-## [v1.26.0] - 2025-03-17
-### Added
-* FileUploadHandler: allow to upload multiple files
-* CrudController: allow to add callables after creation, update and delation
-### Fixed
-* fix(crud): use context variable to retrieve the form and the form options
-* fix(node): use `false` instead of `O` in query
-### Changed
-* CrudConfiguration::setShowActions: add context when setting this parameter
-
-## [v1.25.2] - 2025-02-07
-### Added
-* allow to set `data-*` attributes on modal
-
-## [v1.25.1] - 2024-05-13
-### Added
-* add drag&drop in the block builder
-
-## [v1.25.0] - 2024-05-12
-### Added
-* add block builder widget
-* allow to use `window.tinymceModes` to add or override tinymce modes
-* add border color on tinymce editor
-### Fixed
-* fix default crud sort
-* fix hidden save button in file manager
-* fix template of CrudController (maker)
-* fix undefined `window.tinymce.murph`
-
-## [v1.24.1] - 2024-02-01
-### Fixed
-* update Murph version constant
-
-## [v1.24.0] - 2024-01-27
-### Added
-* add CSS class `no-wrap`
-* copy the pager of the CRUD at the bottom of the list
-### Fixed
-* fix an issue with the file manager when editing an item opened in a modal
-* fix type casting in slugifier
-
-## [v1.23.0] - 2023-11-01
-### Added
-* allow to define templates show before and after a murph collection item
-* add global batch actions
-* add constraint `Length` in forms
-* add sass classes to mange with of elements
-* set searchFields option on jschoice manager (search on labels)
-### Changed
-* refactor services using constructor property promotions
-* remove twig in the mail notifier service
-* change pills colors
-* change border colors of inputs when focused
-* change colors on js-choices element
-### Fixed
-* fix regression on crud sorting
-* fix test in RepositoryQuery::addForcedFilterHandler
-* remove parameter $option on CrudConfiguration::setForm and fix CrudController make template
-* fix the aspect of the actions's column in the crud
-
-## [v1.22.0] - 2023-09-28
-### Added
-* add new options in BooleanField: `toggle|checkbox_class_when_true` and `toggle|checkbox_class_when_false`
-* add `count` method in repository query
-* add `addForcedFilterHandler` method in repository query
-* add `inline_form_validation` option to validate inline forms with custom algo
-* add crud sorting parameters in the session
-* add flush option in the entity manager on create, update, remove, and persist methods
-
-## [1.21.1] - 2023-08-17
-### Added
-* add form error handle in inline edit action and refill the form using the previous request content
-* add form error handle in ssettings actions and refill the form using the previous request content
-### Fixed
-* fix tinymce reload when modal is closed and reopened
-* fix modal hiding when a file is successfuly uploaded in the file manager
-
-## [1.21.0] - 2023-08-11
-### Added
-* allow to use array syntax in string builder filter
-* add color property in Navigation
-* add badge with navigation color in admin views
-* add `default_value` option in crud fields
-* add `display` option in BooleanField
-* add associated nodes in page form
-### Fixed
-* fix routes in the global settings controller
-
-## [1.20.0] - 2023-07-27
-### Added
-* enable double click on cruds
-* add block class name for the choice type in the page maker
-* update file details view on the file manager
-* add form options in the crud filter action
-* add trans filter in inline form modal title
-* add setter to define all fields in a defined context
-* add filename generator setter in FileUploadHandler
-* add variable for the sidebar size
-* add twig block to override defaults actions in crud index template
-* add option to remove iterable values and/or specifics keys in the twig toArray function
-* add boolean field for CRUD
-* add context variable in each controllers to simplify overrides
-* core.site.name and core.site.logo are not longer required
-* add default templates when a crud is generated
-* add boolean 'is_disabled' in the menu item template options
-### Fixed
-* fix filemanager date ordering
-* fix maker CrudController template: remove bad pasted code
-* fix redirect listener: use boolean instead of integer
-* fix responsive of account edit template
-* fix collection widget: allow_add/allow_delete and prototype
-### Changed
-* user admin routes are defined in core, custom controller is not required
-
-## [1.19.0] - 2023-04-15
-### Added
-* feat(page): forms for metas, opengraph and extra informations can be removed
-* feat(navigation): user interface is improved
-* feat(file): webp is allowed and shown in form widgets and in file manager details
-* feat(file): the file manager now show the size and the modification date of a file
-* feat(crud): add option `action` in field to add a link to the view page or to the edition page
-* feat(crud): add option `inline_form` in field to configure to edit the data
-* feat(crud): add `setDoubleClick` in the crud configuration
-
-## [1.18.0] - 2023-01-13
-### Added
-* feat(dep): add symfony/runtime
-* feat(dep): add symfony/flex
-### Fixed
-* fix(crud): allow POST in delete actions
-* fix(crud): remove default page value in abstract crud controller
-* fix(admin): test site_logo before using it
-* fix(ui): update z-index of choices__list--dropdown
-
 ## [1.17.1] - 2022-12-03
 ### Fixed
 * add mising attribute on timestampable (doctrine)
diff --git a/composer.json b/composer.json
index 0c4114d..3276767 100644
--- a/composer.json
+++ b/composer.json
@@ -61,11 +61,17 @@
         "symfony/yaml": "5.4.*",
         "twig/extra-bundle": "^2.12|^3.3",
         "twig/twig": "^2.12|^3.3",
-        "symfony/runtime": "^5.4"
+        "symfony/phpunit-bridge": "^6.2",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {
             "App\\Core\\": "src/core/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": true
+        }
     }
 }
diff --git a/src/core/Ab/AbTest.php b/src/core/Ab/AbTest.php
index aef9bf4..47f52c4 100644
--- a/src/core/Ab/AbTest.php
+++ b/src/core/Ab/AbTest.php
@@ -10,12 +10,14 @@ namespace App\Core\Ab;
 class AbTest implements AbTestInterface
 {
     protected $results;
+    protected string $name;
     protected array $variations = [];
     protected array $probabilities = [];
     protected int $duration = 3600 * 24;
 
-    public function __construct(protected string $name)
+    public function __construct(string $name)
     {
+        $this->name = $name;
     }
 
     public function getName(): string
diff --git a/src/core/Analytic/DateRangeAnalytic.php b/src/core/Analytic/DateRangeAnalytic.php
index bd6a6ed..15f46ae 100644
--- a/src/core/Analytic/DateRangeAnalytic.php
+++ b/src/core/Analytic/DateRangeAnalytic.php
@@ -13,16 +13,18 @@ use App\Core\Repository\Analytic\ViewRepositoryQuery;
  */
 class DateRangeAnalytic
 {
+    protected ViewRepositoryQuery $viewQuery;
+    protected RefererRepositoryQuery $refererQuery;
     protected ?Node $node;
     protected ?\DateTime $from;
     protected ?\DateTime $to;
     protected bool $reload = true;
     protected array $cache = [];
 
-    public function __construct(
-        protected ViewRepositoryQuery $viewQuery,
-        protected RefererRepositoryQuery $refererQuery
-    ) {
+    public function __construct(ViewRepositoryQuery $viewQuery, RefererRepositoryQuery $refererQuery)
+    {
+        $this->viewQuery = $viewQuery;
+        $this->refererQuery = $refererQuery;
     }
 
     public function getViews(): array
@@ -81,7 +83,7 @@ class DateRangeAnalytic
             $datas[$index]['mobileViews'] += $entity->getMobileViews();
         }
 
-        uasort($datas, function ($a, $b) {
+        uasort($datas, function($a, $b) {
             if ($a['views'] > $b['views']) {
                 return -1;
             }
@@ -128,7 +130,7 @@ class DateRangeAnalytic
             $datas[$index]['uris'][$path] += $entity->getViews();
         }
 
-        uasort($datas, function ($a, $b) {
+        uasort($datas, function($a, $b) {
             if ($a['views'] > $b['views']) {
                 return -1;
             }
diff --git a/src/core/Annotation/UrlGenerator.php b/src/core/Annotation/UrlGenerator.php
index f397bb7..2afa0b4 100644
--- a/src/core/Annotation/UrlGenerator.php
+++ b/src/core/Annotation/UrlGenerator.php
@@ -10,10 +10,16 @@ namespace App\Core\Annotation;
 #[\Attribute]
 class UrlGenerator
 {
-    public function __construct(
-        public string $service,
-        public string $method,
-        public array $options = []
-    ) {
+    public string $service;
+
+    public string $method;
+
+    public array $options = [];
+
+    public function __construct(string $service, string $method, array $options = [])
+    {
+        $this->service = $service;
+        $this->method = $method;
+        $this->options = $options;
     }
 }
diff --git a/src/core/Authenticator/LoginFormAuthenticator.php b/src/core/Authenticator/LoginFormAuthenticator.php
index cb1f957..193c61f 100644
--- a/src/core/Authenticator/LoginFormAuthenticator.php
+++ b/src/core/Authenticator/LoginFormAuthenticator.php
@@ -23,12 +23,20 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator
 {
     use TargetPathTrait;
 
-    public function __construct(
-        private EntityManagerInterface $entityManager,
-        private UrlGeneratorInterface $urlGenerator,
-        private CsrfTokenManagerInterface $csrfTokenManager,
-        private UserPasswordEncoderInterface $passwordEncoder
-    ) {
+    private EntityManagerInterface $entityManager;
+
+    private UrlGeneratorInterface $urlGenerator;
+
+    private CsrfTokenManagerInterface $csrfTokenManager;
+
+    private UserPasswordEncoderInterface $passwordEncoder;
+
+    public function __construct(EntityManagerInterface $entityManager, UrlGeneratorInterface $urlGenerator, CsrfTokenManagerInterface $csrfTokenManager, UserPasswordEncoderInterface $passwordEncoder)
+    {
+        $this->entityManager = $entityManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->csrfTokenManager = $csrfTokenManager;
+        $this->passwordEncoder = $passwordEncoder;
     }
 
     public function supports(Request $request)
diff --git a/src/core/BuilderBlock/Block/Bootstrap/AlertBlock.php b/src/core/BuilderBlock/Block/Bootstrap/AlertBlock.php
deleted file mode 100644
index acd3ab6..0000000
--- a/src/core/BuilderBlock/Block/Bootstrap/AlertBlock.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Bootstrap;
-
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-#[AutoconfigureTag('builder_block.widget')]
-class AlertBlock extends BootstrapBlock
-{
-    public function __construct(protected TranslatorInterface $translator)
-    {
-    }
-
-    public function configure()
-    {
-        parent::configure();
-
-        $options = [];
-
-        foreach ([
-            'Primary' => 'primary',
-            'Secondary' => 'secondary',
-            'Info' => 'info',
-            'Success' => 'success',
-            'Danger' => 'danger',
-            'Warning' => 'warning',
-            'Light' => 'light',
-            'Dark' => 'dark',
-        ] as $k => $v) {
-            $options[] = [
-                'text' => $this->translator->trans($k),
-                'value' => $v,
-            ];
-        }
-
-        $this
-            ->setName('bsAlert')
-            ->setLabel('Alert')
-            ->setOrder(4)
-            ->setIsContainer(true)
-            ->setIcon('<i class="fas fa-exclamation-circle"></i>')
-            ->setTemplate('@Core/builder_block/bootstrap/alert.html.twig')
-            ->addSetting(name: 'level', label: 'Level', type: 'select', extraOptions: ['options' => $options])
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Bootstrap/BootstrapBlock.php b/src/core/BuilderBlock/Block/Bootstrap/BootstrapBlock.php
deleted file mode 100644
index 1f332ba..0000000
--- a/src/core/BuilderBlock/Block/Bootstrap/BootstrapBlock.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Bootstrap;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-abstract class BootstrapBlock extends BuilderBlock
-{
-    public function configure()
-    {
-        $this->setCategory('Bootstrap');
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Bootstrap/ColumnBlock.php b/src/core/BuilderBlock/Block/Bootstrap/ColumnBlock.php
deleted file mode 100644
index 71be682..0000000
--- a/src/core/BuilderBlock/Block/Bootstrap/ColumnBlock.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Bootstrap;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class ColumnBlock extends BootstrapBlock
-{
-    public function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setName('bsColumn')
-            ->setLabel('Column')
-            ->setIsContainer(true)
-            ->setOrder(3)
-            ->setClass('col-12 col-lg-3 pr-md-1')
-            ->setTemplate('@Core/builder_block/bootstrap/column.html.twig')
-            ->setIcon('<i class="fas fa-columns"></i>')
-            ->addSetting(name: 'size', label: 'Extra small', type: 'number', attributes: ['min' => 0, 'max' => 12])
-            ->addSetting(name: 'sizeSm', label: 'Small', type: 'number', attributes: ['min' => 0, 'max' => 12])
-            ->addSetting(name: 'sizeMd', label: 'Medium', type: 'number', attributes: ['min' => 0, 'max' => 12])
-            ->addSetting(name: 'sizeLg', label: 'Large', type: 'number', attributes: ['min' => 0, 'max' => 12])
-            ->addSetting(name: 'sizeXl', label: 'Extra large', type: 'number', attributes: ['min' => 0, 'max' => 12])
-            ->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Bootstrap/ContainerBlock.php b/src/core/BuilderBlock/Block/Bootstrap/ContainerBlock.php
deleted file mode 100644
index 3382d28..0000000
--- a/src/core/BuilderBlock/Block/Bootstrap/ContainerBlock.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Bootstrap;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class ContainerBlock extends BootstrapBlock
-{
-    public function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setName('bsContainer')
-            ->setLabel('Container')
-            ->setIsContainer(true)
-            ->setOrder(1)
-            ->setTemplate('@Core/builder_block/bootstrap/container.html.twig')
-            ->setIcon('<i class="fas fa-th"></i>')
-            ->addSetting(name: 'isFluid', label: 'Fluid', type: 'checkbox')
-            ->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Bootstrap/RowBlock.php b/src/core/BuilderBlock/Block/Bootstrap/RowBlock.php
deleted file mode 100644
index 5ade3da..0000000
--- a/src/core/BuilderBlock/Block/Bootstrap/RowBlock.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Bootstrap;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class RowBlock extends BootstrapBlock
-{
-    public function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setName('bsRow')
-            ->setLabel('Row')
-            ->setOrder(2)
-            ->setIsContainer(true)
-            ->setIcon('<i class="fas fa-align-justify"></i>')
-            ->setTemplate('@Core/builder_block/bootstrap/row.html.twig')
-            ->addWidget('bsColumn')
-            ->addSetting(name: 'customClass', label: 'Custom class', type: 'text')
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Editor/EditorBlock.php b/src/core/BuilderBlock/Block/Editor/EditorBlock.php
deleted file mode 100644
index 3172048..0000000
--- a/src/core/BuilderBlock/Block/Editor/EditorBlock.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Editor;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-abstract class EditorBlock extends BuilderBlock
-{
-    public function configure()
-    {
-        $this->setCategory('Editors');
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Editor/TextareaBlock.php b/src/core/BuilderBlock/Block/Editor/TextareaBlock.php
deleted file mode 100644
index bec2db6..0000000
--- a/src/core/BuilderBlock/Block/Editor/TextareaBlock.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Editor;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class TextareaBlock extends EditorBlock
-{
-    public function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setName('textarea')
-            ->setLabel('Text')
-            ->setIsContainer(false)
-            ->setIcon('<i class="fas fa-pencil-alt"></i>')
-            ->setTemplate('@Core/builder_block/editor/textarea.html.twig')
-            ->addSetting(name: 'nl2br', label: 'Insert line breaks', type: 'checkbox', default: true)
-            ->addSetting(name: 'allowHtml', label: 'Allow HTML', type: 'checkbox', default: false)
-            ->addSetting(name: 'value', type: 'textarea')
-            ->setPreview('value')
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/Block/Editor/TinymceBlock.php b/src/core/BuilderBlock/Block/Editor/TinymceBlock.php
deleted file mode 100644
index 130088a..0000000
--- a/src/core/BuilderBlock/Block/Editor/TinymceBlock.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock\Block\Editor;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class TinymceBlock extends EditorBlock
-{
-    public function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setName('tinymce')
-            ->setLabel('TinyMCE')
-            ->setIsContainer(false)
-            ->setIcon('<i class="fas fa-pencil-alt"></i>')
-            ->setTemplate('@Core/builder_block/editor/tinymce.html.twig')
-            ->addSetting(name: 'value', type: 'textarea', attributes: ['data-tinymce' => ''])
-            ->setPreview('value')
-        ;
-    }
-}
diff --git a/src/core/BuilderBlock/BuilderBlock.php b/src/core/BuilderBlock/BuilderBlock.php
deleted file mode 100644
index e5660be..0000000
--- a/src/core/BuilderBlock/BuilderBlock.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock;
-
-abstract class BuilderBlock
-{
-    protected string $name;
-    protected string $label;
-    protected ?string $class = 'col-12';
-    protected ?string $category = null;
-    protected array $settings = [];
-    protected array $widgets = [];
-    protected array $vars = [];
-    protected string $template = '';
-    protected ?string $preview = null;
-    protected bool $isContainer = false;
-    protected ?string $icon = null;
-    protected int $order = 1;
-
-    abstract public function configure();
-
-    public function setLabel(string $label): self
-    {
-        $this->label = $label;
-
-        return $this;
-    }
-
-    public function getLabel(): string
-    {
-        return $this->label;
-    }
-
-    public function setName(string $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setCategory(?string $category): self
-    {
-        $this->category = $category;
-
-        return $this;
-    }
-
-    public function getCategory(): ?string
-    {
-        return $this->category;
-    }
-
-    public function setIsContainer(bool $isContainer): self
-    {
-        $this->isContainer = $isContainer;
-
-        return $this;
-    }
-
-    public function getIsContainer(): bool
-    {
-        return $this->isContainer;
-    }
-
-    public function setWidgets(array $widgets): self
-    {
-        $this->widgets = $widgets;
-
-        return $this;
-    }
-
-    public function addWidget(string $widget): self
-    {
-        if (!in_array($widget, $this->widgets)) {
-            $this->widgets[] = $widget;
-        }
-
-        return $this;
-    }
-
-    public function getWidgets(): array
-    {
-        return $this->widgets;
-    }
-
-    public function setSettings(array $settings): self
-    {
-        $this->settings = $settings;
-
-        return $this;
-    }
-
-    public function addSetting(
-        string $name,
-        string $type = 'input',
-        ?string $label = null,
-        array $attributes = [],
-        array $extraOptions = [],
-        $default = null
-    ) {
-        $this->settings[$name] = [
-            'label' => $label,
-            'type' => $type,
-            'attr' => $attributes,
-            'default' => $default,
-        ];
-
-        foreach ($extraOptions as $key => $value) {
-            if (!in_array($key, array_keys($this->settings[$name]))) {
-                $this->settings[$name][$key] = $value;
-            }
-        }
-
-        return $this;
-    }
-
-    public function getSettings(): array
-    {
-        return $this->settings;
-    }
-
-    public function setTemplate(string $template): self
-    {
-        $this->template = $template;
-
-        return $this;
-    }
-
-    public function getTemplate(): string
-    {
-        return $this->template;
-    }
-
-    public function setClass(?string $class): self
-    {
-        $this->class = $class;
-
-        return $this;
-    }
-
-    public function getClass(): ?string
-    {
-        return $this->class;
-    }
-
-    public function setIcon(?string $icon): self
-    {
-        $this->icon = $icon;
-
-        return $this;
-    }
-
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    public function setOrder(int $order): self
-    {
-        $this->order = $order;
-
-        return $this;
-    }
-
-    public function getOrder(): int
-    {
-        return $this->order;
-    }
-
-    public function setPreview(?string $preview): self
-    {
-        $this->preview = $preview;
-
-        return $this;
-    }
-
-    public function getPreview(): ?string
-    {
-        return $this->preview;
-    }
-
-    public function buildVars(array $data, array $context)
-    {
-    }
-
-    public function getVars(): array
-    {
-        return $this->vars;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'label' => $this->getLabel(),
-            'category' => $this->getCategory(),
-            'isContainer' => $this->getIsContainer(),
-            'widgets' => $this->getWidgets(),
-            'settings' => $this->getSettings(),
-            'class' => $this->getClass(),
-            'icon' => $this->getIcon(),
-            'preview' => $this->getPreview(),
-        ];
-    }
-}
diff --git a/src/core/BuilderBlock/BuilderBlockContainer.php b/src/core/BuilderBlock/BuilderBlockContainer.php
deleted file mode 100644
index dcda7b5..0000000
--- a/src/core/BuilderBlock/BuilderBlockContainer.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Core\BuilderBlock;
-
-class BuilderBlockContainer
-{
-    protected array $widgets = [];
-
-    public function addWidget(BuilderBlock $widget): self
-    {
-        $widget->configure();
-
-        $this->widgets[$widget->getName()] = $widget;
-
-        return $this;
-    }
-
-    public function removeWidget(string $name)
-    {
-        unset($this->widgets[$name]);
-
-        return $this;
-    }
-
-    public function getWidgets(): array
-    {
-        usort($this->widgets, fn(BuilderBlock $a, BuilderBlock $b) => $a->getOrder() <=> $b->getOrder());
-
-        return $this->widgets;
-    }
-
-    public function hasWidget(string $name)
-    {
-        return isset($this->widgets[$name]);
-    }
-
-    public function getWidget(string $name): BuilderBlock
-    {
-        return $this->widgets[$name];
-    }
-}
diff --git a/src/core/Bundle/CoreBundle.php b/src/core/Bundle/CoreBundle.php
index 4be0b94..034a544 100644
--- a/src/core/Bundle/CoreBundle.php
+++ b/src/core/Bundle/CoreBundle.php
@@ -12,8 +12,8 @@
 namespace App\Core\Bundle;
 
 use App\Core\DependencyInjection\CoreExtension;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 class CoreBundle extends Bundle
 {
diff --git a/src/core/Cache/SymfonyCacheManager.php b/src/core/Cache/SymfonyCacheManager.php
index 8e4e500..a368cd0 100644
--- a/src/core/Cache/SymfonyCacheManager.php
+++ b/src/core/Cache/SymfonyCacheManager.php
@@ -5,13 +5,13 @@ namespace App\Core\Cache;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
-use Symfony\Component\HttpClient\Exception\ClientException;
-use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\HttpClient\Exception\ClientException;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpClient\Exception\TransportException;
 
 /**
  * class SymfonyCacheManager.
@@ -20,11 +20,15 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
  */
 class SymfonyCacheManager
 {
-    public function __construct(
-        protected KernelInterface $kernel,
-        protected HttpClientInterface $httpClient,
-        protected UrlGeneratorInterface $urlGenerator
-    ) {
+    protected KernelInterface $kernel;
+    protected HttpClientInterface $httpClient;
+    protected UrlGeneratorInterface $urlGenerator;
+
+    public function __construct(KernelInterface $kernel, HttpClientInterface $httpClient, UrlGeneratorInterface $urlGenerator)
+    {
+        $this->kernel = $kernel;
+        $this->httpClient = $httpClient;
+        $this->urlGenerator = $urlGenerator;
     }
 
     public function cleanRouting()
diff --git a/src/core/Command/UserCreateCommand.php b/src/core/Command/UserCreateCommand.php
index 7c1ecdc..598bfaf 100644
--- a/src/core/Command/UserCreateCommand.php
+++ b/src/core/Command/UserCreateCommand.php
@@ -18,12 +18,19 @@ class UserCreateCommand extends Command
 {
     protected static $defaultName = 'murph:user:create';
     protected static $defaultDescription = 'Creates a user';
+    protected UserFactory $userFactory;
+    protected EntityManager $entityManager;
+    protected TokenGeneratorInterface $tokenGenerator;
 
     public function __construct(
-        protected UserFactory $userFactory,
-        protected EntityManager $entityManager,
-        protected TokenGeneratorInterface $tokenGenerator
+        UserFactory $userFactory,
+        EntityManager $entityManager,
+        TokenGeneratorInterface $tokenGenerator
     ) {
+        $this->userFactory = $userFactory;
+        $this->entityManager = $entityManager;
+        $this->tokenGenerator = $tokenGenerator;
+
         parent::__construct();
     }
 
diff --git a/src/core/Controller/Admin/Crud/CrudController.php b/src/core/Controller/Admin/Crud/CrudController.php
index 810087f..57f6688 100644
--- a/src/core/Controller/Admin/Crud/CrudController.php
+++ b/src/core/Controller/Admin/Crud/CrudController.php
@@ -26,13 +26,7 @@ abstract class CrudController extends AdminController
 
     abstract protected function getConfiguration(): CrudConfiguration;
 
-    protected function doIndex(
-        int $page,
-        RepositoryQuery $query,
-        Request $request,
-        Session $session,
-        string $context = 'index'
-    ): Response
+    protected function doIndex(int $page = 1, RepositoryQuery $query, Request $request, Session $session): Response
     {
         $configuration = $this->getConfiguration();
 
@@ -41,14 +35,13 @@ abstract class CrudController extends AdminController
 
         $pager = $query
             ->usefilters($this->filters)
-            ->paginate($page, $configuration->getMaxPerPage($context))
+            ->paginate($page, $configuration->getmaxperpage('index'))
         ;
 
-        return $this->render($this->getConfiguration()->getView($context), [
+        return $this->render($this->getConfiguration()->getView('index'), [
             'configuration' => $configuration,
             'pager' => $pager,
             'sort' => $this->sort,
-            'context' => $context,
             'filters' => [
                 'show' => null !== $configuration->getForm('filter'),
                 'isEmpty' => empty($this->filters),
@@ -56,20 +49,13 @@ abstract class CrudController extends AdminController
         ]);
     }
 
-    protected function doNew(
-        EntityInterface $entity,
-        EntityManager $entityManager,
-        Request $request,
-        callable $beforeCreate = null,
-        callable $afterCreate = null,
-        string $context = 'new'
-    ): Response
+    protected function doNew(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeCreate = null): Response
     {
         $configuration = $this->getConfiguration();
 
         $this->prepareEntity($entity);
 
-        $form = $this->createForm($configuration->getForm($context), $entity, $configuration->getFormOptions($context));
+        $form = $this->createForm($configuration->getForm('new'), $entity, $configuration->getFormOptions('new'));
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
@@ -80,11 +66,6 @@ abstract class CrudController extends AdminController
                 }
 
                 $entityManager->create($entity);
-
-                if (null !== $afterCreate) {
-                    call_user_func_array($afterCreate, [$entity, $form, $request]);
-                }
-
                 $this->addFlash('success', 'The data has been saved.');
 
                 return $this->redirectToRoute($configuration->getPageRoute('edit'), array_merge(
@@ -95,39 +76,30 @@ abstract class CrudController extends AdminController
             $this->addFlash('warning', 'The form is not valid.');
         }
 
-        return $this->render($configuration->getView($context), [
+        return $this->render($configuration->getView('new'), [
             'form' => $form->createView(),
             'configuration' => $configuration,
-            'context' => $context,
             'entity' => $entity,
         ]);
     }
 
-    protected function doShow(EntityInterface $entity, string $context = 'show'): Response
+    protected function doShow(EntityInterface $entity): Response
     {
         $configuration = $this->getConfiguration();
 
-        return $this->render($configuration->getView($context), [
+        return $this->render($configuration->getView('show'), [
             'entity' => $entity,
-            'context' => $context,
             'configuration' => $configuration,
         ]);
     }
 
-    protected function doEdit(
-        EntityInterface $entity,
-        EntityManager $entityManager,
-        Request $request,
-        callable $beforeUpdate = null,
-        callable $afterUpdate = null,
-        string $context = 'edit'
-    ): Response
+    protected function doEdit(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeUpdate = null): Response
     {
         $configuration = $this->getConfiguration();
 
         $this->prepareEntity($entity);
 
-        $form = $this->createForm($configuration->getForm($context), $entity, $configuration->getFormOptions($context));
+        $form = $this->createForm($configuration->getForm('edit'), $entity, $configuration->getFormOptions('edit'));
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
@@ -138,135 +110,24 @@ abstract class CrudController extends AdminController
                 }
 
                 $entityManager->update($entity);
-
-                if (null !== $afterUpdate) {
-                    call_user_func_array($afterUpdate, [$entity, $form, $request]);
-                }
-
                 $this->addFlash('success', 'The data has been saved.');
 
-                return $this->redirectToRoute($configuration->getPageRoute($context), array_merge(
+                return $this->redirectToRoute($configuration->getPageRoute('edit'), array_merge(
                     ['entity' => $entity->getId()],
-                    $configuration->getPageRouteParams($context)
+                    $configuration->getPageRouteParams('edit')
                 ));
             }
             $this->addFlash('warning', 'The form is not valid.');
         }
 
-        return $this->render($configuration->getView($context), [
+        return $this->render($configuration->getView('edit'), [
             'form' => $form->createView(),
-            'context' => $context,
             'configuration' => $configuration,
             'entity' => $entity,
         ]);
     }
 
-    protected function doInlineEdit(
-        string $context,
-        string $label,
-        EntityInterface $entity,
-        EntityManager $entityManager,
-        Request $request,
-        callable $beforeUpdate = null,
-        callable $afterUpdate = null
-    ): Response
-    {
-        $configuration = $this->getConfiguration();
-
-        $this->prepareEntity($entity);
-
-        $builder = $this->createFormBuilder($entity);
-        $callback = $configuration->getFields($context)[$label]['options']['inline_form'] ?? null;
-        $validationCallback = $configuration->getFields($context)[$label]['options']['inline_form_validation'] ?? null;
-
-        if (null === $callback) {
-            throw $this->createNotFoundException();
-        }
-
-        call_user_func_array($callback, [$builder, $entity]);
-
-        $redirectTo = $request->query->get('redirectTo');
-
-        $form = $builder->getForm();
-        $session = $request->getSession();
-
-        $lastRequestId = sprintf(
-            'inline_request_%s_%s_%s_%s',
-            get_class($entity),
-            $entity->getId(),
-            $context,
-            $label
-        );
-
-        $lastRequest = $session->get($lastRequestId);
-
-        if (null !== $lastRequest && !$request->isMethod('POST')) {
-            $fakeRequest = Request::create(
-                uri: $request->getUri(),
-                method: 'POST',
-                parameters: [$form->getName() => $lastRequest]
-            );
-
-            $form->handleRequest($fakeRequest);
-
-            if (null !== $validationCallback) {
-                call_user_func_array($validationCallback, [$entity, $form, $request]);
-            }
-
-            $session->remove($lastRequestId);
-        }
-
-        if ($request->isMethod('POST')) {
-            $form->handleRequest($request);
-
-            if (null !== $validationCallback) {
-                call_user_func_array($validationCallback, [$entity, $form, $request]);
-            }
-
-            if ($form->isValid()) {
-                if (null !== $beforeUpdate) {
-                    call_user_func_array($beforeUpdate, [$entity, $form, $request]);
-                }
-
-                $session->remove($lastRequestId);
-                $entityManager->update($entity);
-
-                if (null !== $afterUpdate) {
-                    call_user_func_array($afterUpdate, [$entity, $form, $request]);
-                }
-
-                $this->addFlash('success', 'The data has been saved.');
-
-                return $this->redirect($redirectTo);
-            }
-
-            $session->set($lastRequestId, $request->request->get('form'));
-            $this->addFlash('warning', 'The form is not valid.');
-
-            return $this->redirect(sprintf(
-                '%s?data-modal=%s',
-                $redirectTo,
-                urlencode($request->getUri())
-            ));
-        }
-
-        return $this->render($configuration->getView('inline_edit'), [
-            'form' => $form->createView(),
-            'configuration' => $configuration,
-            'entity' => $entity,
-            'context' => $context,
-            'label' => $label,
-            'redirectTo' => $redirectTo,
-        ]);
-    }
-
-    protected function doSort(
-        int $page,
-        RepositoryQuery $query,
-        EntityManager $entityManager,
-        Request $request,
-        Session $session
-    ): Response
+    protected function doSort(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
     {
         $configuration = $this->getConfiguration();
         $context = $request->query->get('context', 'index');
@@ -304,13 +165,7 @@ abstract class CrudController extends AdminController
         return $this->json([]);
     }
 
-    protected function doBatch(
-        int $page,
-        RepositoryQuery $query,
-        EntityManager $entityManager,
-        Request $request,
-        Session $session
-    ): Response
+    protected function doBatch(int $page = 1, RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session): Response
     {
         $configuration = $this->getConfiguration();
         $datas = $request->request->get('batch', []);
@@ -339,39 +194,16 @@ abstract class CrudController extends AdminController
 
         $query->useFilters($this->filters);
 
-        $useSelection = 'selection' === $target;
-
-        if ($batchAction['isGlobal']) {
-            $selection = null;
-
-            if ($useSelection) {
-                $queryClone = clone $query;
-                $pager = $queryClone->paginate($page, $configuration->getMaxPerPage($context));
-                $selection = [];
-
-                foreach ($pager as $key => $entity) {
-                    if (isset($items[$key + 1])) {
-                        $selection[] = $entity;
-                    }
-                }
-            }
-
-            $result = $callback($query, $entityManager, $selection);
-
-            if ($result instanceof Response) {
-                return $result;
-            }
-
-            return $this->redirect($request->query->get('redirectTo'));
+        if ('selection' === $target) {
+            $isSelection = true;
+            $pager = $query->paginate($page, $configuration->getMaxPerPage($context));
+        } else {
+            $isSelection = false;
+            $pager = $query->find();
         }
 
-        $pager = $useSelection
-            ? $query->paginate($page, $configuration->getMaxPerPage($context))
-            : $query->find()
-        ;
-
         foreach ($pager as $key => $entity) {
-            if (($useSelection && isset($items[$key + 1])) || !$useSelection) {
+            if (($isSelection && isset($items[$key + 1])) || !$isSelection) {
                 $callback($entity, $entityManager);
             }
         }
@@ -381,14 +213,7 @@ abstract class CrudController extends AdminController
         return $this->json([]);
     }
 
-    protected function doDelete(
-        EntityInterface $entity,
-        EntityManager $entityManager,
-        Request $request,
-        callable $beforeDelete = null,
-        callable $afterDelete = null,
-        string $route = 'index'
-    ): Response
+    protected function doDelete(EntityInterface $entity, EntityManager $entityManager, Request $request, callable $beforeDelete = null): Response
     {
         $configuration = $this->getConfiguration();
 
@@ -399,31 +224,26 @@ abstract class CrudController extends AdminController
 
             $entityManager->delete($entity);
 
-            if (null !== $afterDelete) {
-                call_user_func($afterDelete, $entity);
-            }
-
             $this->addFlash('success', 'The data has been removed.');
         }
 
-        return $this->redirectToRoute($configuration->getPageRoute($route), $configuration->getPageRouteParams($route));
+        return $this->redirectToRoute($configuration->getPageRoute('index'));
     }
 
-    protected function doFilter(Session $session, string $context = 'filter'): Response
+    protected function doFilter(Session $session): Response
     {
         $configuration = $this->getConfiguration();
-        $type = $configuration->getForm($context);
+        $type = $configuration->getForm('filter');
 
         if (null === $type) {
             throw $this->createNotFoundException();
         }
 
-        $form = $this->createForm($type, null, $configuration->getFormOptions($context));
+        $form = $this->createForm($type);
         $form->submit($session->get($form->getName(), []));
 
-        return $this->render($configuration->getView($context), [
+        return $this->render($configuration->getView('filter'), [
             'form' => $form->createView(),
-            'context' => $context,
             'configuration' => $configuration,
         ]);
     }
@@ -437,7 +257,7 @@ abstract class CrudController extends AdminController
             return;
         }
 
-        $form = $this->createForm($type, null, $configuration->getFormOptions('filter'));
+        $form = $this->createForm($type);
 
         if ($request->query->has($form->getName())) {
             $filters = $request->query->get($form->getName());
@@ -484,27 +304,9 @@ abstract class CrudController extends AdminController
         }
 
         $defaultSort = $configuration->getDefaultSort($context);
-        $session = $request->getSession();
 
-        $sessionId = sprintf('%s_%s_sort', $context, get_called_class());
-        $sessionSortName = sprintf('%s_label', $sessionId);
-        $sessionSortDirection = sprintf('%s_direction', $sessionId);
-
-        $name = $request->query->get('_sort', $session->get($sessionSortName)) ?? $defaultSort['label'] ?? null;
-
-        $direction = strtolower(
-            $request->query->get(
-                '_sort_direction',
-                $session->get($sessionSortDirection)
-            ) ?? $defaultSort['direction'] ?? 'asc'
-        );
-
-        $session->set($sessionSortName, $name);
-        $session->set($sessionSortDirection, $direction);
-
-        if (empty($name)) {
-            return;
-        }
+        $name = $request->query->get('_sort', $defaultSort['label'] ?? null);
+        $direction = strtolower($request->query->get('_sort_direction', $defaultSort['direction'] ?? 'asc'));
 
         if (!in_array($direction, ['asc', 'desc'])) {
             $direction = 'asc';
diff --git a/src/core/Controller/Dashboard/DashboardAdminController.php b/src/core/Controller/Dashboard/DashboardAdminController.php
index 502f84c..e81c9f8 100644
--- a/src/core/Controller/Dashboard/DashboardAdminController.php
+++ b/src/core/Controller/Dashboard/DashboardAdminController.php
@@ -3,6 +3,8 @@
 namespace App\Core\Controller\Dashboard;
 
 use App\Core\Controller\Admin\AdminController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 class DashboardAdminController extends AdminController
 {
diff --git a/src/core/Controller/Editor/BuilderBlockController.php b/src/core/Controller/Editor/BuilderBlockController.php
deleted file mode 100644
index 2bded85..0000000
--- a/src/core/Controller/Editor/BuilderBlockController.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Core\Controller\Editor;
-
-use App\Core\BuilderBlock\BuilderBlockContainer;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-#[Route(path: '/admin/editor/builder_block')]
-class BuilderBlockController extends AbstractController
-{
-    public function __construct(protected TranslatorInterface $translator)
-    {
-    }
-
-    #[Route(path: '/widgets', name: 'admin_editor_builder_block_widgets', options: ['expose' => true])]
-    public function widgets(BuilderBlockContainer $container): JsonResponse
-    {
-        $data = [];
-
-        foreach ($container->getWidgets() as $widget) {
-            $data[$widget->getName()] = $this->translate($widget->toArray());
-        }
-
-        return $this->json($data);
-    }
-
-    protected function translate(array $data)
-    {
-        $data['label'] = $this->translator->trans($data['label']);
-        $data['category'] = $this->translator->trans($data['category']);
-
-        foreach ($data['settings'] as $key => $value) {
-            $data['settings'][$key]['label'] = $this->translator->trans($data['settings'][$key]['label']);
-        }
-
-        return $data;
-    }
-}
diff --git a/src/core/Controller/FileManager/FileManagerAdminController.php b/src/core/Controller/FileManager/FileManagerAdminController.php
index 8312997..a5f6ebb 100644
--- a/src/core/Controller/FileManager/FileManagerAdminController.php
+++ b/src/core/Controller/FileManager/FileManagerAdminController.php
@@ -390,7 +390,7 @@ class FileManagerAdminController extends AdminController
         ]);
     }
 
-    #[Route(path: '/delete', name: 'admin_file_manager_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/delete', name: 'admin_file_manager_delete', methods: ['DELETE'])]
     public function delete(FsFileManager $manager, Request $request): Response
     {
         $path = $request->request->get('file');
diff --git a/src/core/Controller/Redirect/RedirectAdminController.php b/src/core/Controller/Redirect/RedirectAdminController.php
index 6066db2..dd773f8 100644
--- a/src/core/Controller/Redirect/RedirectAdminController.php
+++ b/src/core/Controller/Redirect/RedirectAdminController.php
@@ -61,7 +61,7 @@ class RedirectAdminController extends CrudController
         return $this->doBatch($page, $query, $entityManager, $request, $session);
     }
 
-    #[Route(path: '/admin/redirect/delete/{entity}', name: 'admin_redirect_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/admin/redirect/delete/{entity}', name: 'admin_redirect_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doDelete($entity, $entityManager, $request);
@@ -102,11 +102,11 @@ class RedirectAdminController extends CrudController
                 'attr' => ['class' => 'col-6'],
             ])
             ->setField('index', 'Enabled', Field\ButtonField::class, [
-                'property_builder' => function (EntityInterface $entity) {
+                'property_builder' => function(EntityInterface $entity) {
                     return $entity->getIsEnabled() ? 'Yes' : 'No';
                 },
                 'attr' => ['class' => 'col-1'],
-                'button_attr_builder' => function (EntityInterface $entity) {
+                'button_attr_builder' => function(EntityInterface $entity) {
                     return ['class' => 'btn btn-sm btn-'.($entity->getIsEnabled() ? 'success' : 'primary')];
                 },
             ])
diff --git a/src/core/Controller/Setting/NavigationSettingAdminController.php b/src/core/Controller/Setting/NavigationSettingAdminController.php
index 74bbb68..95874e4 100644
--- a/src/core/Controller/Setting/NavigationSettingAdminController.php
+++ b/src/core/Controller/Setting/NavigationSettingAdminController.php
@@ -31,30 +31,11 @@ class NavigationSettingAdminController extends AdminController
         $eventDispatcher->dispatch($event, NavigationSettingEvent::FORM_INIT_EVENT);
 
         $form = $builder->getForm();
-        $redirectTo = $request->query->get('redirectTo');
-        $session = $request->getSession();
-        $lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId());
-        $lastRequest = $session->get($lastRequestId);
-        $options = $entity->getOptions();
-        $optionView = $options['view'] ?? 'modal';
-
-        if (null !== $lastRequest && !$request->isMethod('POST')) {
-            $fakeRequest = Request::create(
-                uri: $request->getUri(),
-                method: 'POST',
-                parameters: [$form->getName() => $lastRequest]
-            );
-
-            $form->handleRequest($fakeRequest);
-            $session->remove($lastRequestId);
-        }
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $entityManager->update($entity);
-                $session->remove($lastRequestId);
                 $entityManager->update($entity);
                 $this->addFlash('success', 'The data has been saved.');
 
@@ -63,27 +44,17 @@ class NavigationSettingAdminController extends AdminController
                 ]);
             }
 
-            $session->set($lastRequestId, $request->request->get('form'));
             $this->addFlash('warning', 'The form is not valid.');
-
-            if ($optionView === 'modal') {
-                return $this->redirect(sprintf(
-                    '%s?data-modal=%s',
-                    $redirectTo,
-                    urlencode($request->getUri())
-                ));
-            }
         }
 
         return $this->render('@Core/setting/navigation_setting_admin/edit.html.twig', [
             'form' => $form->createView(),
             'entity' => $entity,
-            'options' => $options,
-            'redirectTo' => $redirectTo,
+            'options' => $event->getData()['options'],
         ]);
     }
 
-    #[Route(path: '/delete/{entity}', name: 'admin_navigation_setting_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/delete/{entity}', name: 'admin_navigation_setting_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
diff --git a/src/core/Controller/Setting/SettingAdminController.php b/src/core/Controller/Setting/SettingAdminController.php
index 707a19e..afcb82e 100644
--- a/src/core/Controller/Setting/SettingAdminController.php
+++ b/src/core/Controller/Setting/SettingAdminController.php
@@ -12,10 +12,14 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-#[Route(path: '/admin/setting')]
+/**
+ * @Route("/admin/setting")
+ */
 class SettingAdminController extends AdminController
 {
-    #[Route(path: '/{page}', name: 'admin_setting_index', requirements: ['page' => '\d+'])]
+    /**
+     * @Route("/{page}", name="admin_setting_index", requirements={"page": "\d+"})
+     */
     public function index(
         RepositoryQuery $query,
         EventDispatcherInterface $eventDispatcher,
@@ -34,7 +38,9 @@ class SettingAdminController extends AdminController
         ]);
     }
 
-    #[Route(path: '/edit/{entity}', name: 'admin_setting_edit')]
+    /**
+     * @Route("/edit/{entity}", name="admin_setting_edit")
+     */
     public function edit(
         Entity $entity,
         EntityManager $entityManager,
@@ -51,57 +57,30 @@ class SettingAdminController extends AdminController
         $eventDispatcher->dispatch($event, SettingEvent::FORM_INIT_EVENT);
 
         $form = $builder->getForm();
-        $redirectTo = $request->query->get('redirectTo');
-        $session = $request->getSession();
-        $lastRequestId = sprintf('setting_request_%s_%s', get_class($entity), $entity->getId());
-        $lastRequest = $session->get($lastRequestId);
-        $options = $entity->getOptions();
-        $optionView = $options['view'] ?? 'modal';
-
-        if (null !== $lastRequest && !$request->isMethod('POST')) {
-            $fakeRequest = Request::create(
-                uri: $request->getUri(),
-                method: 'POST',
-                parameters: [$form->getName() => $lastRequest]
-            );
-
-            $form->handleRequest($fakeRequest);
-            $session->remove($lastRequestId);
-        }
 
         if ($request->isMethod('POST')) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
-                $entityManager->update($entity);
-                $session->remove($lastRequestId);
                 $entityManager->update($entity);
                 $this->addFlash('success', 'The data has been saved.');
 
                 return $this->redirectToRoute('admin_setting_index');
             }
 
-            $session->set($lastRequestId, $request->request->get('form'));
             $this->addFlash('warning', 'The form is not valid.');
-
-            if ($optionView === 'modal') {
-                return $this->redirect(sprintf(
-                    '%s?data-modal=%s',
-                    $redirectTo,
-                    urlencode($request->getUri())
-                ));
-            }
         }
 
         return $this->render('@Core/setting/setting_admin/edit.html.twig', [
             'form' => $form->createView(),
             'entity' => $entity,
             'options' => $event->getData()['options'],
-            'redirectTo' => $redirectTo,
         ]);
     }
 
-    #[Route(path: '/delete/{entity}', name: 'admin_setting_delete', methods: ['DELETE', 'POST'])]
+    /**
+     * @Route("/delete/{entity}", name="admin_setting_delete", methods={"DELETE"})
+     */
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
diff --git a/src/core/Controller/Site/MenuAdminController.php b/src/core/Controller/Site/MenuAdminController.php
index 68ea9c6..a8f122d 100644
--- a/src/core/Controller/Site/MenuAdminController.php
+++ b/src/core/Controller/Site/MenuAdminController.php
@@ -53,7 +53,7 @@ class MenuAdminController extends AdminController
         ]);
     }
 
-    #[Route(path: '/delete/{entity}', name: 'admin_site_menu_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/delete/{entity}', name: 'admin_site_menu_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         if ($this->isCsrfTokenValid('delete'.$entity->getId(), $request->request->get('_token'))) {
diff --git a/src/core/Controller/Site/NavigationAdminController.php b/src/core/Controller/Site/NavigationAdminController.php
index d72cf86..be49cb7 100644
--- a/src/core/Controller/Site/NavigationAdminController.php
+++ b/src/core/Controller/Site/NavigationAdminController.php
@@ -67,12 +67,12 @@ class NavigationAdminController extends CrudController
     }
 
     #[Route(path: '/admin/site/navigation/sort/{page}', name: 'admin_site_navigation_sort', methods: ['POST'], requirements: ['page' => '\d+'])]
-    public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
+    public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1, ): Response
     {
         return $this->doSort($page, $query, $entityManager, $request, $session);
     }
 
-    #[Route(path: '/admin/site/navigation/delete/{entity}', name: 'admin_site_navigation_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/admin/site/navigation/delete/{entity}', name: 'admin_site_navigation_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doDelete($entity, $entityManager, $request);
@@ -104,11 +104,9 @@ class NavigationAdminController extends CrudController
             ->setView('form', '@Core/site/navigation_admin/_form.html.twig')
 
             ->setIsSortableCollection('index', true)
-            ->setDoubleClick('index', true)
 
             ->setField('index', 'Label', Field\TextField::class, [
                 'property' => 'label',
-                'view' => '@Core/site/navigation_admin/field/label.html.twig',
                 'attr' => ['class' => 'miw-200'],
             ])
             ->setField('index', 'Domain', Field\ButtonField::class, [
diff --git a/src/core/Controller/Site/NodeAdminController.php b/src/core/Controller/Site/NodeAdminController.php
index dfa733b..e3fb30e 100644
--- a/src/core/Controller/Site/NodeAdminController.php
+++ b/src/core/Controller/Site/NodeAdminController.php
@@ -2,6 +2,7 @@
 
 namespace App\Core\Controller\Site;
 
+use App\Core\Controller\Admin\AdminController;
 use App\Core\Entity\Site\Node;
 use App\Core\Entity\Site\Node as Entity;
 use App\Core\Entity\Site\Page\Page;
@@ -13,15 +14,15 @@ use App\Core\Form\Site\NodeType as EntityType;
 use App\Core\Manager\EntityManager;
 use App\Core\Repository\Site\NodeRepository;
 use App\Core\Site\ControllerLocator;
-use App\Core\Site\PageLocator;
 use App\Core\Site\RoleLocator;
+use App\Core\Site\PageLocator;
 use App\Core\Sitemap\SitemapBuilder;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 #[Route(path: '/admin/site/node')]
 class NodeAdminController extends AbstractController
@@ -144,7 +145,7 @@ class NodeAdminController extends AbstractController
 
         $page = $entity->getPage();
 
-        if (null !== $page) {
+        if ($page !== null) {
             $pageConfiguration = $pageLocator->getPages()[get_class($page)] ?? null;
         } else {
             $pageConfiguration = null;
@@ -238,7 +239,7 @@ class NodeAdminController extends AbstractController
         ]).sprintf('#node-%d', $entity->getId()));
     }
 
-    #[Route(path: '/delete/{entity}', name: 'admin_site_node_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/delete/{entity}', name: 'admin_site_node_delete', methods: ['DELETE'])]
     public function delete(
         Entity $entity,
         NodeRepository $nodeRepository,
diff --git a/src/core/Controller/Site/PageAdminController.php b/src/core/Controller/Site/PageAdminController.php
index 57384dc..b7b57b3 100644
--- a/src/core/Controller/Site/PageAdminController.php
+++ b/src/core/Controller/Site/PageAdminController.php
@@ -5,19 +5,19 @@ namespace App\Core\Controller\Site;
 use App\Core\Controller\Admin\Crud\CrudController;
 use App\Core\Crud\CrudConfiguration;
 use App\Core\Crud\Field;
-use App\Core\Entity\EntityInterface;
 use App\Core\Entity\Site\Page\Page as Entity;
-use App\Core\Event\Page\PageEditEvent;
 use App\Core\Form\Site\Page\Filter\PageFilterType as FilterType;
 use App\Core\Form\Site\Page\PageType as Type;
 use App\Core\Manager\EntityManager;
 use App\Core\Repository\Site\Page\PageRepositoryQuery as RepositoryQuery;
 use App\Core\Site\PageLocator;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
+use App\Core\Event\Page\PageEditEvent;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use App\Core\Entity\EntityInterface;
 
 class PageAdminController extends CrudController
 {
@@ -61,7 +61,7 @@ class PageAdminController extends CrudController
         return $this->doEdit($entity, $entityManager, $request);
     }
 
-    #[Route(path: '/admin/site/page/delete/{entity}', name: 'admin_site_page_delete', methods: ['DELETE', 'POST'])]
+    #[Route(path: '/admin/site/page/delete/{entity}', name: 'admin_site_page_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doDelete($entity, $entityManager, $request);
@@ -95,8 +95,6 @@ class PageAdminController extends CrudController
             ->setAction('index', 'show', false)
             ->setAction('edit', 'show', false)
 
-            ->setDoubleClick('index', true)
-
             ->setField('index', 'Name', Field\TextField::class, [
                 'property' => 'name',
                 'sort' => ['name', '.name'],
@@ -114,7 +112,7 @@ class PageAdminController extends CrudController
                 }],
                 'attr' => ['class' => 'col-6'],
             ])
-            ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->delete($entity);
             })
         ;
diff --git a/src/core/Controller/User/UserAdminController.php b/src/core/Controller/User/UserAdminController.php
index e2edcda..e8e5aa5 100644
--- a/src/core/Controller/User/UserAdminController.php
+++ b/src/core/Controller/User/UserAdminController.php
@@ -8,55 +8,55 @@ use App\Core\Crud\Field;
 use App\Core\Event\Account\PasswordRequestEvent;
 use App\Core\Factory\UserFactory as Factory;
 use App\Core\Manager\EntityManager;
-use App\Core\Security\TokenGenerator;
 use App\Entity\User as Entity;
 use App\Form\UserType as Type;
 use App\Repository\UserRepositoryQuery as RepositoryQuery;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Routing\Annotation\Route;
+use App\Core\Security\TokenGenerator;
 
 class UserAdminController extends CrudController
 {
-    protected ?CrudConfiguration $configuration = null;
-
+    #[Route(path: '/admin/user/{page}', name: 'admin_user_index', methods: ['GET'], requirements: ['page' => '\d+'])]
     public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
     {
         return $this->doIndex($page, $query, $request, $session);
     }
 
+    #[Route(path: '/admin/user/new', name: 'admin_user_new', methods: ['GET', 'POST'])]
     public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response
     {
         return $this->doNew($factory->create(null, $tokenGenerator->generateToken()), $entityManager, $request);
     }
 
+    #[Route(path: '/admin/user/show/{entity}', name: 'admin_user_show', methods: ['GET'])]
     public function show(Entity $entity): Response
     {
         return $this->doShow($entity);
     }
 
+    #[Route(path: '/admin/user/filter', name: 'admin_user_filter', methods: ['GET'])]
     public function filter(Session $session): Response
     {
         return $this->doFilter($session);
     }
 
+    #[Route(path: '/admin/user/edit/{entity}', name: 'admin_user_edit', methods: ['GET', 'POST'])]
     public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doEdit($entity, $entityManager, $request);
     }
 
-    public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response
-    {
-        return $this->doInlineEdit($context, $label, $entity, $entityManager, $request);
-    }
-
+    #[Route(path: '/admin/user/delete/{entity}', name: 'admin_user_delete', methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doDelete($entity, $entityManager, $request);
     }
 
+    #[Route(path: '/admin/user/resetting_request/{entity}', name: 'admin_user_resetting_request', methods: ['POST'])]
     public function requestResetting(Entity $entity, EventDispatcherInterface $eventDispatcher, Request $request): Response
     {
         if ($this->isCsrfTokenValid('resetting_request'.$entity->getId(), $request->request->get('_token'))) {
@@ -81,7 +81,6 @@ class UserAdminController extends CrudController
             ->setPageRoute('index', 'admin_user_index')
             ->setPageRoute('new', 'admin_user_new')
             ->setPageRoute('edit', 'admin_user_edit')
-            ->setPageRoute('inline_edit', 'admin_user_inline_edit')
             ->setPageRoute('show', 'admin_user_show')
             ->setPageRoute('delete', 'admin_user_delete')
             ->setPageRoute('filter', 'admin_user_filter')
@@ -97,7 +96,6 @@ class UserAdminController extends CrudController
             ->setView('edit', '@Core/user/user_admin/edit.html.twig')
 
             ->setDefaultSort('index', 'username')
-            ->setDoubleClick('index', true)
 
             ->setField('index', 'E-mail', Field\TextField::class, [
                 'property' => 'email',
@@ -108,9 +106,6 @@ class UserAdminController extends CrudController
                 'property' => 'displayName',
                 'sort' => ['displayName', '.displayName'],
                 'attr' => ['class' => 'miw-200'],
-                'inline_form' => function (FormBuilderInterface $builder) {
-                    $builder->add('displayName', null);
-                },
             ])
         ;
     }
diff --git a/src/core/Crud/CrudConfiguration.php b/src/core/Crud/CrudConfiguration.php
index c083d9d..f25ee94 100644
--- a/src/core/Crud/CrudConfiguration.php
+++ b/src/core/Crud/CrudConfiguration.php
@@ -2,8 +2,6 @@
 
 namespace App\Core\Crud;
 
-use App\Core\Entity\EntityInterface;
-
 /**
  * class CrudConfiguration.
  *
@@ -19,7 +17,6 @@ class CrudConfiguration
     protected array $actionTitles = [];
     protected array $forms = [];
     protected array $formOptions = [];
-    protected array $inlineForms = [];
     protected array $views = [];
     protected array $viewDatas = [];
     protected array $fields = [];
@@ -29,8 +26,7 @@ class CrudConfiguration
     protected array $isSortableCollection = [];
     protected string $sortableCollectionProperty = 'sortOrder';
     protected ?string $defaultLocale = null;
-    protected array $showActions = [];
-    protected array $listRowAttributes = [];
+    protected bool $showActions = true;
 
     protected static $self;
 
@@ -43,7 +39,7 @@ class CrudConfiguration
         return self::$self;
     }
 
-    // --
+    /* -- */
 
     public function setPageTitle(string $page, string $title): self
     {
@@ -57,7 +53,7 @@ class CrudConfiguration
         return $this->pageTitles[$page] ?? $default;
     }
 
-    // --
+    /* -- */
 
     public function setPageRoute(string $page, string $route): self
     {
@@ -83,9 +79,9 @@ class CrudConfiguration
         return $this->pageRouteParams[$page] ?? [];
     }
 
-    // --
+    /* -- */
 
-    public function setForm(string $context, string $form): self
+    public function setForm(string $context, string $form, array $options = []): self
     {
         $this->forms[$context] = $form;
 
@@ -109,7 +105,7 @@ class CrudConfiguration
         return $this->formOptions[$context] ?? [];
     }
 
-    // --
+    /* -- */
 
     public function setAction(string $page, string $action, bool|callable $enabled): self
     {
@@ -138,24 +134,8 @@ class CrudConfiguration
         );
     }
 
-    public function setGlobalBatchAction(
-        string $page,
-        string $action,
-        string $label,
-        callable $callback
-    ): self {
-        $this->setBatchAction($page, $action, $label, $callback);
-        $this->batchActions[$page][$action]['isGlobal'] = true;
-
-        return $this;
-    }
-
-    public function setBatchAction(
-        string $page,
-        string $action,
-        string $label,
-        callable $callback
-    ): self {
+    public function setBatchAction(string $page, string $action, string $label, callable $callback): self
+    {
         if (!isset($this->batchActions[$page])) {
             $this->batchActions[$page] = [];
         }
@@ -163,7 +143,6 @@ class CrudConfiguration
         $this->batchActions[$page][$action] = [
             'label' => $label,
             'callback' => $callback,
-            'isGlobal' => false,
         ];
 
         return $this;
@@ -184,7 +163,7 @@ class CrudConfiguration
         return !empty($this->batchActions[$page]);
     }
 
-    // --
+    /* -- */
 
     public function setActionTitle(string $page, string $action, string $title): self
     {
@@ -202,7 +181,7 @@ class CrudConfiguration
         return $this->actionTitles[$page][$action] ?? $default;
     }
 
-    // --
+    /* -- */
 
     public function setView(string $context, string $view): self
     {
@@ -250,27 +229,7 @@ class CrudConfiguration
         return $this->viewDatas[$context][$name] ?? $defaultValue;
     }
 
-    public function setListRowAttributes(string $context, array $attributes): self
-    {
-        $this->listRowAttributes[$context] = $attributes;
-
-        return $this;
-    }
-
-    public function getListRowAttributes(string $context, EntityInterface $entity): array
-    {
-        $attributes = $this->listRowAttributes[$context] ?? [];
-
-        foreach ($attributes as $key => $attribute) {
-            if (is_callable($attribute)) {
-                $attributes[$key] = $attribute($entity);
-            }
-        }
-
-        return $attributes;
-    }
-
-    // --
+    /* -- */
 
     public function setField(string $context, string $label, string $field, array $options): self
     {
@@ -291,16 +250,9 @@ class CrudConfiguration
         return $this->fields[$context] ?? [];
     }
 
-    public function setFields(string $context, array $fields): self
-    {
-        $this->fields[$context] = $fields;
+    /* -- */
 
-        return $this;
-    }
-
-    // --
-
-    public function setMaxPerPage(string $page, int $max): self
+    public function setMaxPerPage(string $page, int $max)
     {
         $this->maxPerPage[$page] = $max;
 
@@ -312,21 +264,7 @@ class CrudConfiguration
         return $this->maxPerPage[$page] ?? $default;
     }
 
-    // --
-
-    public function setDoubleClick(string $page, bool $enabled): self
-    {
-        $this->doubleClick[$page] = $enabled;
-
-        return $this;
-    }
-
-    public function getDoubleClick(string $page): bool
-    {
-        return $this->doubleClick[$page] ?? false;
-    }
-
-    // --
+    /* -- */
 
     public function setI18n(array $locales, string $defaultLocale): self
     {
@@ -351,7 +289,7 @@ class CrudConfiguration
         return !empty($this->locales);
     }
 
-    // --
+    /* -- */
 
     public function setDefaultSort(string $context, string $label, string $direction = 'asc'): self
     {
@@ -392,15 +330,15 @@ class CrudConfiguration
         return $this->sortableCollectionProperty;
     }
 
-    public function setShowActions(string $page, bool $showActions): self
+    public function setShowActions(bool $showActions): self
     {
-        $this->showActions[$page] = $showActions;
+        $this->showActions = $showActions;
 
         return $this;
     }
 
-    public function getShowActions(string $page): bool
+    public function getShowActions(): bool
     {
-        return $this->showActions[$page] ?? true;
+        return $this->showActions;
     }
 }
diff --git a/src/core/Crud/Field/BooleanField.php b/src/core/Crud/Field/BooleanField.php
deleted file mode 100644
index 54d68bf..0000000
--- a/src/core/Crud/Field/BooleanField.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Core\Crud\Field;
-
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * class BooleanField.
- *
- * @author Simon Vieille <simon@deblan.fr>
- */
-class BooleanField extends Field
-{
-    public function configureOptions(OptionsResolver $resolver): OptionsResolver
-    {
-        parent::configureOptions($resolver);
-
-        $resolver->setDefaults([
-            'view' => '@Core/admin/crud/field/boolean.html.twig',
-            'display' => 'toggle',
-            'checkbox_class_when_true' => 'fa-check-square',
-            'checkbox_class_when_false' => 'fa-square',
-            'toggle_class_when_true' => 'bg-success',
-            'toggle_class_when_false' => 'bg-secondary',
-            'default_value' => false,
-        ]);
-
-        $resolver->setAllowedTypes('display', 'string');
-
-        return $resolver;
-    }
-}
diff --git a/src/core/Crud/Field/Field.php b/src/core/Crud/Field/Field.php
index e0c6bd1..42256e8 100644
--- a/src/core/Crud/Field/Field.php
+++ b/src/core/Crud/Field/Field.php
@@ -28,31 +28,24 @@ abstract class Field
         $resolver->setDefaults([
             'property' => null,
             'property_builder' => null,
-            'default_value' => null,
             'view' => null,
-            'action' => null,
             'raw' => false,
             'sort' => null,
             'href' => null,
             'href_attr' => [],
             'attr' => [],
-            'inline_form' => null,
-            'inline_form_validation' => null,
         ]);
 
         $resolver->setRequired('view');
         $resolver->setAllowedTypes('property', ['null', 'string']);
         $resolver->setAllowedTypes('view', 'string');
-        $resolver->setAllowedTypes('action', ['null', 'string']);
         $resolver->setAllowedTypes('attr', 'array');
         $resolver->setAllowedTypes('href', ['null', 'string', 'callable']);
-        $resolver->setAllowedTypes('inline_form', ['null', 'callable']);
-        $resolver->setAllowedTypes('inline_form_validation', ['null', 'callable']);
-        $resolver->setAllowedTypes('href_attr', ['array', 'callable']);
+        $resolver->setAllowedTypes('href_attr', 'array', 'callable');
         $resolver->setAllowedTypes('raw', 'boolean');
         $resolver->setAllowedTypes('property_builder', ['null', 'callable']);
-        $resolver->setAllowedValues('sort', function ($value) {
-            if (null === $value) {
+        $resolver->setAllowedValues('sort', function($value) {
+            if ($value === null) {
                 return true;
             }
 
diff --git a/src/core/DependencyInjection/Compiler/BuilderBlockPass.php b/src/core/DependencyInjection/Compiler/BuilderBlockPass.php
deleted file mode 100644
index cdf019f..0000000
--- a/src/core/DependencyInjection/Compiler/BuilderBlockPass.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Core\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use App\Core\BuilderBlock\BuilderBlockContainer;
-
-class BuilderBlockPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (!$container->has(BuilderBlockContainer::class)) {
-            return;
-        }
-
-        $definition = $container->findDefinition(BuilderBlockContainer::class);
-        $taggedServices = $container->findTaggedServiceIds('builder_block.widget');
-
-        foreach ($taggedServices as $id => $tags) {
-            $definition->addMethodCall('addWidget', [new Reference($id)]);
-        }
-    }
-}
diff --git a/src/core/DependencyInjection/Configuration.php b/src/core/DependencyInjection/Configuration.php
index cb6b6d1..6999049 100644
--- a/src/core/DependencyInjection/Configuration.php
+++ b/src/core/DependencyInjection/Configuration.php
@@ -15,7 +15,6 @@ class Configuration implements ConfigurationInterface
             'image/jpeg',
             'image/gif',
             'image/svg+xml',
-            'image/webp',
             'video/mp4',
             'audio/mpeg3',
             'audio/x-mpeg-3',
@@ -51,10 +50,12 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('name')
                             ->defaultValue('Murph')
                             ->isRequired()
+                            ->cannotBeEmpty()
                         ->end()
                         ->scalarNode('logo')
                             ->defaultValue('build/images/core/logo.svg')
                             ->isRequired()
+                            ->cannotBeEmpty()
                         ->end()
                         ->arrayNode('controllers')
                             ->prototype('array')
@@ -139,7 +140,6 @@ class Configuration implements ConfigurationInterface
                     ->end()
                 ->end()
             ->end();
-        ;
 
         return $treeBuilder;
     }
diff --git a/src/core/DependencyInjection/CoreExtension.php b/src/core/DependencyInjection/CoreExtension.php
index 4cac902..4708e21 100644
--- a/src/core/DependencyInjection/CoreExtension.php
+++ b/src/core/DependencyInjection/CoreExtension.php
@@ -2,7 +2,6 @@
 
 namespace App\Core\DependencyInjection;
 
-use App\Core\DependencyInjection\Compiler\BuilderBlockPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 
diff --git a/src/core/Entity/Analytic/Referer.php b/src/core/Entity/Analytic/Referer.php
index c0cf79a..84b145d 100644
--- a/src/core/Entity/Analytic/Referer.php
+++ b/src/core/Entity/Analytic/Referer.php
@@ -2,9 +2,10 @@
 
 namespace App\Core\Entity\Analytic;
 
-use App\Core\Entity\EntityInterface;
 use App\Core\Entity\Site\Node;
+use App\Repository\Entity\Analytic\NodeViewRepository;
 use Doctrine\ORM\Mapping as ORM;
+use App\Core\Entity\EntityInterface;
 
 #[ORM\Table(name: 'analytic_referer')]
 #[ORM\Entity(repositoryClass: ViewRepository::class)]
diff --git a/src/core/Entity/Analytic/View.php b/src/core/Entity/Analytic/View.php
index 7068151..b2ad763 100644
--- a/src/core/Entity/Analytic/View.php
+++ b/src/core/Entity/Analytic/View.php
@@ -2,9 +2,10 @@
 
 namespace App\Core\Entity\Analytic;
 
-use App\Core\Entity\EntityInterface;
 use App\Core\Entity\Site\Node;
+use App\Repository\Entity\Analytic\NodeViewRepository;
 use Doctrine\ORM\Mapping as ORM;
+use App\Core\Entity\EntityInterface;
 
 #[ORM\Table(name: 'analytic_view')]
 #[ORM\Entity(repositoryClass: ViewRepository::class)]
diff --git a/src/core/Entity/NavigationSetting.php b/src/core/Entity/NavigationSetting.php
index 8adfb36..bfaa2ac 100644
--- a/src/core/Entity/NavigationSetting.php
+++ b/src/core/Entity/NavigationSetting.php
@@ -26,9 +26,6 @@ class NavigationSetting implements EntityInterface
     #[ORM\Column(type: 'text', nullable: true)]
     protected $value;
 
-    #[ORM\Column(type: 'text', nullable: true)]
-    protected $options;
-
     #[ORM\ManyToOne(targetEntity: Navigation::class, inversedBy: 'navigationSettings')]
     #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
     protected $navigation;
@@ -97,16 +94,4 @@ class NavigationSetting implements EntityInterface
 
         return $this;
     }
-
-    public function getOptions()
-    {
-        return json_decode($this->options, true) ?? [];
-    }
-
-    public function setOptions(?array $options): self
-    {
-        $this->options = json_encode($options ?? []);
-
-        return $this;
-    }
 }
diff --git a/src/core/Entity/Setting.php b/src/core/Entity/Setting.php
index 032e74a..d4a1036 100644
--- a/src/core/Entity/Setting.php
+++ b/src/core/Entity/Setting.php
@@ -25,9 +25,6 @@ class Setting implements EntityInterface
     #[ORM\Column(type: 'text', nullable: true)]
     protected $value;
 
-    #[ORM\Column(type: 'text', nullable: true)]
-    protected $options;
-
     public function getId(): ?int
     {
         return $this->id;
@@ -80,16 +77,4 @@ class Setting implements EntityInterface
 
         return $this;
     }
-
-    public function getOptions()
-    {
-        return json_decode($this->options, true) ?? [];
-    }
-
-    public function setOptions(?array $options): self
-    {
-        $this->options = json_encode($options ?? []);
-
-        return $this;
-    }
 }
diff --git a/src/core/Entity/Site/Navigation.php b/src/core/Entity/Site/Navigation.php
index d538df1..c3a4f3c 100644
--- a/src/core/Entity/Site/Navigation.php
+++ b/src/core/Entity/Site/Navigation.php
@@ -42,9 +42,6 @@ class Navigation implements EntityInterface
     #[ORM\Column(type: 'string', length: 10)]
     protected $locale = 'en';
 
-    #[ORM\Column(type: 'string', length: 7, nullable: true)]
-    protected $color;
-
     #[ORM\Column(type: 'integer', nullable: true)]
     protected $sortOrder;
 
@@ -67,7 +64,7 @@ class Navigation implements EntityInterface
         return $this->label;
     }
 
-    public function setLabel(?string $label): self
+    public function setLabel(string $label): self
     {
         $this->label = $label;
 
@@ -240,16 +237,4 @@ class Navigation implements EntityInterface
 
         return false;
     }
-
-    public function setColor(string $color): self
-    {
-        $this->color = $color;
-
-        return $this;
-    }
-
-    public function getColor(): ?string
-    {
-        return $this->color;
-    }
 }
diff --git a/src/core/Entity/Site/Page/BuilderBlock.php b/src/core/Entity/Site/Page/BuilderBlock.php
deleted file mode 100644
index 878c96f..0000000
--- a/src/core/Entity/Site/Page/BuilderBlock.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Core\Entity\Site\Page;
-
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-class BuilderBlock extends JsonBlock
-{
-    public function getValue()
-    {
-        $value = parent::getValue();
-
-        if (is_string($value)) {
-            return json_decode($value, true);
-        }
-
-        return [];
-    }
-}
diff --git a/src/core/Entity/Site/Page/ChoiceBlock.php b/src/core/Entity/Site/Page/ChoiceBlock.php
index 47deefa..a0c65b4 100644
--- a/src/core/Entity/Site/Page/ChoiceBlock.php
+++ b/src/core/Entity/Site/Page/ChoiceBlock.php
@@ -5,6 +5,15 @@ namespace App\Core\Entity\Site\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class ChoiceBlock extends JsonBlock
+class ChoiceBlock extends Block
 {
+    public function getValue()
+    {
+        return json_decode(parent::getValue(), true);
+    }
+
+    public function setValue($value): self
+    {
+        return parent::setValue(json_encode($value));
+    }
 }
diff --git a/src/core/Entity/Site/Page/JsonBlock.php b/src/core/Entity/Site/Page/JsonBlock.php
deleted file mode 100644
index 47101d5..0000000
--- a/src/core/Entity/Site/Page/JsonBlock.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Core\Entity\Site\Page;
-
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-class JsonBlock extends Block
-{
-    public function getValue()
-    {
-        return json_decode(parent::getValue(), true);
-    }
-
-    public function setValue($value): self
-    {
-        return parent::setValue(json_encode($value));
-    }
-}
diff --git a/src/core/Entity/Site/Page/Page.php b/src/core/Entity/Site/Page/Page.php
index cfd32d7..2ad1138 100644
--- a/src/core/Entity/Site/Page/Page.php
+++ b/src/core/Entity/Site/Page/Page.php
@@ -5,12 +5,13 @@ namespace App\Core\Entity\Site\Page;
 use App\Core\Doctrine\Timestampable;
 use App\Core\Entity\EntityInterface;
 use App\Core\Entity\Site\Node;
-use App\Core\File\FileAttribute;
 use App\Core\Repository\Site\Page\PageRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\File\File;
+use App\Core\File\FileAttribute;
 
 #[ORM\Entity(repositoryClass: PageRepository::class)]
 #[ORM\DiscriminatorColumn(name: 'class_key', type: 'string')]
@@ -88,7 +89,7 @@ class Page implements EntityInterface
     }
 
     /**
-     * @return Block[]|Collection
+     * @return Collection|Block[]
      */
     public function getBlocks(): Collection
     {
diff --git a/src/core/Event/Ab/AbTestEvent.php b/src/core/Event/Ab/AbTestEvent.php
index 1b8cd3a..922f9cc 100644
--- a/src/core/Event/Ab/AbTestEvent.php
+++ b/src/core/Event/Ab/AbTestEvent.php
@@ -15,8 +15,11 @@ class AbTestEvent extends Event
     public const INIT_EVENT = 'ab_test.init';
     public const RUN_EVENT = 'ab_test.run';
 
-    public function __construct(protected AbTest $test)
+    protected AbTest $test;
+
+    public function __construct(AbTest $test)
     {
+        $this->test = $test;
     }
 
     public function getTest(): AbTest
diff --git a/src/core/Event/Account/PasswordRequestEvent.php b/src/core/Event/Account/PasswordRequestEvent.php
index 8a876d5..b5ec7a0 100644
--- a/src/core/Event/Account/PasswordRequestEvent.php
+++ b/src/core/Event/Account/PasswordRequestEvent.php
@@ -12,10 +12,13 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class PasswordRequestEvent extends Event
 {
-    public const EVENT = 'account_event.password_request';
+    const EVENT = 'account_event.password_request';
 
-    public function __construct(protected User $user)
+    protected User $user;
+
+    public function __construct(User $user)
     {
+        $this->user = $user;
     }
 
     public function getUser(): User
diff --git a/src/core/Event/EntityManager/EntityManagerEvent.php b/src/core/Event/EntityManager/EntityManagerEvent.php
index fa38c93..7c5c666 100644
--- a/src/core/Event/EntityManager/EntityManagerEvent.php
+++ b/src/core/Event/EntityManager/EntityManagerEvent.php
@@ -12,15 +12,18 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class EntityManagerEvent extends Event
 {
-    public const CREATE_EVENT = 'entity_manager_event.create';
-    public const UPDATE_EVENT = 'entity_manager_event.update';
-    public const DELETE_EVENT = 'entity_manager_event.delete';
-    public const PRE_CREATE_EVENT = 'entity_manager_event.pre_create';
-    public const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update';
-    public const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete';
+    const CREATE_EVENT = 'entity_manager_event.create';
+    const UPDATE_EVENT = 'entity_manager_event.update';
+    const DELETE_EVENT = 'entity_manager_event.delete';
+    const PRE_CREATE_EVENT = 'entity_manager_event.pre_create';
+    const PRE_UPDATE_EVENT = 'entity_manager_event.pre_update';
+    const PRE_DELETE_EVENT = 'entity_manager_event.pre_delete';
 
-    public function __construct(protected EntityInterface $entity)
+    protected EntityInterface $entity;
+
+    public function __construct(EntityInterface $entity)
     {
+        $this->entity = $entity;
     }
 
     public function getEntity(): EntityInterface
diff --git a/src/core/Event/Page/PageEditEvent.php b/src/core/Event/Page/PageEditEvent.php
index 178ffee..afa7d3d 100644
--- a/src/core/Event/Page/PageEditEvent.php
+++ b/src/core/Event/Page/PageEditEvent.php
@@ -2,8 +2,8 @@
 
 namespace App\Core\Event\Page;
 
-use App\Core\Entity\Site\Page\Page;
 use Symfony\Contracts\EventDispatcher\Event;
+use App\Core\Entity\Site\Page\Page;
 
 /**
  * class PageEditEvent.
@@ -12,12 +12,14 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class PageEditEvent extends Event
 {
-    public const FORM_INIT_EVENT = 'page_edit_event.form_init';
+    const FORM_INIT_EVENT = 'page_edit_event.form_init';
 
+    protected Page $page;
     protected array $pageBuilderOptions = [];
 
-    public function __construct(protected Page $page)
+    public function __construct(Page $page)
     {
+        $this->page = $page;
     }
 
     public function getPage()
diff --git a/src/core/Event/Setting/NavigationSettingEvent.php b/src/core/Event/Setting/NavigationSettingEvent.php
index 1aa27e6..60133c7 100644
--- a/src/core/Event/Setting/NavigationSettingEvent.php
+++ b/src/core/Event/Setting/NavigationSettingEvent.php
@@ -11,11 +11,14 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class NavigationSettingEvent extends Event
 {
-    public const INIT_EVENT = 'navigation_setting_event.init';
-    public const FORM_INIT_EVENT = 'navigation_setting_event.form_init';
+    const INIT_EVENT = 'navigation_setting_event.init';
+    const FORM_INIT_EVENT = 'navigation_setting_event.form_init';
 
-    public function __construct(protected $data = null)
+    protected $data;
+
+    public function __construct($data = null)
     {
+        $this->data = $data;
     }
 
     public function getData()
diff --git a/src/core/Event/Setting/SettingEvent.php b/src/core/Event/Setting/SettingEvent.php
index 3dc2c99..f5a8805 100644
--- a/src/core/Event/Setting/SettingEvent.php
+++ b/src/core/Event/Setting/SettingEvent.php
@@ -11,11 +11,14 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class SettingEvent extends Event
 {
-    public const INIT_EVENT = 'setting_event.init';
-    public const FORM_INIT_EVENT = 'setting_event.form_init';
+    const INIT_EVENT = 'setting_event.init';
+    const FORM_INIT_EVENT = 'setting_event.form_init';
 
-    public function __construct(protected $data = null)
+    protected $data;
+
+    public function __construct($data = null)
     {
+        $this->data = $data;
     }
 
     public function getData()
diff --git a/src/core/Event/Task/TaskInitEvent.php b/src/core/Event/Task/TaskInitEvent.php
index 33fbdf5..d436195 100644
--- a/src/core/Event/Task/TaskInitEvent.php
+++ b/src/core/Event/Task/TaskInitEvent.php
@@ -11,7 +11,7 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class TaskInitEvent extends Event
 {
-    public const INIT_EVENT = 'task_event.init';
+    const INIT_EVENT = 'task_event.init';
 
     protected array $tasks = [];
 
diff --git a/src/core/Event/Task/TaskRunRequestedEvent.php b/src/core/Event/Task/TaskRunRequestedEvent.php
index 7a3e19a..d25ed89 100644
--- a/src/core/Event/Task/TaskRunRequestedEvent.php
+++ b/src/core/Event/Task/TaskRunRequestedEvent.php
@@ -14,13 +14,17 @@ use Symfony\Contracts\EventDispatcher\Event;
  */
 class TaskRunRequestedEvent extends Event
 {
-    public const RUN_REQUEST_EVENT = 'task_event.run_request';
+    const RUN_REQUEST_EVENT = 'task_event.run_request';
 
-    public function __construct(
-        protected string $task,
-        protected InputBag $parameters,
-        protected BufferedOutput $output
-    ) {
+    protected string $task;
+    protected InputBag $parameters;
+    protected BufferedOutput $output;
+
+    public function __construct(string $task, InputBag $parameters, BufferedOutput $output)
+    {
+        $this->task = $task;
+        $this->parameters = $parameters;
+        $this->output = $output;
     }
 
     public function getTask(): string
diff --git a/src/core/EventListener/AbListener.php b/src/core/EventListener/AbListener.php
index f2a1ebf..03ba6f2 100644
--- a/src/core/EventListener/AbListener.php
+++ b/src/core/EventListener/AbListener.php
@@ -6,6 +6,7 @@ use App\Core\Ab\AbContainer;
 use App\Core\Ab\AbTest;
 use App\Core\Entity\Site\Node;
 use App\Core\Event\Ab\AbTestEvent;
+use App\Core\Repository\Site\NodeRepository;
 use App\Core\Site\SiteRequest;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -20,13 +21,19 @@ use Symfony\Component\HttpKernel\Event\ResponseEvent;
  */
 class AbListener
 {
+    protected EventDispatcherInterface $eventDispatcher;
+    protected AbContainer $container;
+    protected SiteRequest $siteRequest;
     protected ?Node $node;
 
     public function __construct(
-        protected AbContainer $container,
-        protected EventDispatcherInterface $eventDispatcher,
-        protected SiteRequest $siteRequest
+        AbContainer $container,
+        EventDispatcherInterface $eventDispatcher,
+        SiteRequest $siteRequest
     ) {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->container = $container;
+        $this->siteRequest = $siteRequest;
     }
 
     public function onKernelRequest(RequestEvent $event)
@@ -63,16 +70,6 @@ class AbListener
         }
     }
 
-    public function onKernelResponse(ResponseEvent $event)
-    {
-        $cookies = $event->getRequest()->attributes->get('ab_test_cookies', []);
-
-        foreach ($cookies as $name => $value) {
-            $cookie = Cookie::create($name, $value['value'], time() + $value['duration']);
-            $event->getResponse()->headers->setCookie($cookie);
-        }
-    }
-
     protected function getCookieName(): string
     {
         return 'ab_test_'.$this->getAbTestCode();
@@ -99,4 +96,14 @@ class AbListener
 
         return true;
     }
+
+    public function onKernelResponse(ResponseEvent $event)
+    {
+        $cookies = $event->getRequest()->attributes->get('ab_test_cookies', []);
+
+        foreach ($cookies as $name => $value) {
+            $cookie = Cookie::create($name, $value['value'], time() + $value['duration']);
+            $event->getResponse()->headers->setCookie($cookie);
+        }
+    }
 }
diff --git a/src/core/EventListener/AnalyticListener.php b/src/core/EventListener/AnalyticListener.php
index 23e186f..645d053 100644
--- a/src/core/EventListener/AnalyticListener.php
+++ b/src/core/EventListener/AnalyticListener.php
@@ -23,18 +23,30 @@ use Symfony\Component\HttpKernel\Event\RequestEvent;
  */
 class AnalyticListener
 {
+    protected NodeRepository $nodeRepository;
+    protected ViewRepositoryQuery $viewRepositoryQuery;
+    protected ViewFactory $viewFactory;
+    protected RefererRepositoryQuery $refererRepositoryQuery;
+    protected RefererFactory $refererFactory;
+    protected EntityManager $manager;
     protected DeviceDetector $deviceDetector;
     protected Request $request;
     protected Node $node;
 
     public function __construct(
-        protected NodeRepository $nodeRepository,
-        protected ViewRepositoryQuery $viewRepositoryQuery,
-        protected ViewFactory $viewFactory,
-        protected RefererRepositoryQuery $refererRepositoryQuery,
-        protected RefererFactory $refererFactory,
-        protected EntityManager $manager
+        NodeRepository $nodeRepository,
+        ViewRepositoryQuery $viewRepositoryQuery,
+        ViewFactory $viewFactory,
+        RefererRepositoryQuery $refererRepositoryQuery,
+        RefererFactory $refererFactory,
+        EntityManager $manager
     ) {
+        $this->nodeRepository = $nodeRepository;
+        $this->viewRepositoryQuery = $viewRepositoryQuery;
+        $this->viewFactory = $viewFactory;
+        $this->refererRepositoryQuery = $refererRepositoryQuery;
+        $this->refererFactory = $refererFactory;
+        $this->manager = $manager;
         $this->createDeviceDetector();
     }
 
diff --git a/src/core/EventListener/RedirectListener.php b/src/core/EventListener/RedirectListener.php
index 8791684..edb7218 100644
--- a/src/core/EventListener/RedirectListener.php
+++ b/src/core/EventListener/RedirectListener.php
@@ -3,10 +3,11 @@
 namespace App\Core\EventListener;
 
 use App\Core\Repository\RedirectRepositoryQuery;
-use App\Core\Router\RedirectBuilder;
 use App\Core\Router\RedirectMatcher;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use App\Core\Router\RedirectBuilder;
 
 /**
  * class RedirectListener.
@@ -15,11 +16,15 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class RedirectListener
 {
-    public function __construct(
-        protected RedirectMatcher $matcher,
-        protected RedirectBuilder $builder,
-        protected RedirectRepositoryQuery $repository
-    ) {
+    protected RedirectMatcher $matcher;
+    protected RedirectBuilder $builder;
+    protected RedirectRepositoryQuery $repository;
+
+    public function __construct(RedirectMatcher $matcher, RedirectBuilder $builder, RedirectRepositoryQuery $repository)
+    {
+        $this->matcher = $matcher;
+        $this->builder = $builder;
+        $this->repository = $repository;
     }
 
     public function onKernelException(ExceptionEvent $event)
@@ -32,7 +37,7 @@ class RedirectListener
 
         $redirects = $this->repository
             ->orderBy('.sortOrder')
-            ->where('.isEnabled=true')
+            ->where('.isEnabled=1')
             ->find()
         ;
 
diff --git a/src/core/EventSubscriber/Account/PasswordRequestEventSubscriber.php b/src/core/EventSubscriber/Account/PasswordRequestEventSubscriber.php
index aeca6d9..8f2c5d2 100644
--- a/src/core/EventSubscriber/Account/PasswordRequestEventSubscriber.php
+++ b/src/core/EventSubscriber/Account/PasswordRequestEventSubscriber.php
@@ -17,13 +17,24 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class PasswordRequestEventSubscriber implements EventSubscriberInterface
 {
+    protected MailNotifier $notifier;
+    protected UrlGeneratorInterface $urlGenerator;
+    protected EntityManager $entityManager;
+    protected TokenGeneratorInterface $tokenGenerator;
+    protected TranslatorInterface $translator;
+
     public function __construct(
-        protected MailNotifier $notifier,
-        protected UrlGeneratorInterface $urlGenerator,
-        protected EntityManager $entityManager,
-        protected TokenGeneratorInterface $tokenGenerator,
-        protected TranslatorInterface $translator
+        MailNotifier $notifier,
+        UrlGeneratorInterface $urlGenerator,
+        EntityManager $entityManager,
+        TokenGeneratorInterface $tokenGenerator,
+        TranslatorInterface $translator
     ) {
+        $this->notifier = $notifier;
+        $this->urlGenerator = $urlGenerator;
+        $this->entityManager = $entityManager;
+        $this->tokenGenerator = $tokenGenerator;
+        $this->translator = $translator;
     }
 
     public static function getSubscribedEvents()
diff --git a/src/core/EventSubscriber/RequestSecurityEventSubscriber.php b/src/core/EventSubscriber/RequestSecurityEventSubscriber.php
index fd4483a..00ede77 100644
--- a/src/core/EventSubscriber/RequestSecurityEventSubscriber.php
+++ b/src/core/EventSubscriber/RequestSecurityEventSubscriber.php
@@ -16,12 +16,12 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
  */
 class RequestSecurityEventSubscriber implements EventSubscriberInterface
 {
+    protected NodeRepository $nodeRepository;
     protected AuthorizationChecker $authorizationChecker;
 
-    public function __construct(
-        protected NodeRepository $nodeRepository,
-        ContainerInterface $container
-    ) {
+    public function __construct(NodeRepository $nodeRepository, ContainerInterface $container)
+    {
+        $this->nodeRepository = $nodeRepository;
         $this->authorizationChecker = $container->get('security.authorization_checker');
     }
 
diff --git a/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php b/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php
index b86b0d6..5aa86fe 100644
--- a/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/ForcedDomainEventSubscriber.php
@@ -4,15 +4,18 @@ namespace App\Core\EventSubscriber\Site;
 
 use App\Core\Site\SiteRequest;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
+use Symfony\Component\HttpFoundation\Response;
 use function Symfony\Component\String\u;
 
 class ForcedDomainEventSubscriber implements EventSubscriberInterface
 {
-    public function __construct(protected SiteRequest $siteRequest)
+    protected SiteRequest $siteRequest;
+
+    public function __construct(SiteRequest $siteRequest)
     {
+        $this->siteRequest = $siteRequest;
     }
 
     public function onKernelResponse(ResponseEvent $event)
@@ -35,8 +38,7 @@ class ForcedDomainEventSubscriber implements EventSubscriberInterface
             ->replace(
                 '://'.$this->siteRequest->getDomain(),
                 '://'.$navigation->getDomain()
-            )
-        ;
+            );
 
         $event->getResponse()->headers->set('Location', $uri);
         $event->getResponse()->setStatusCode(Response::HTTP_MOVED_PERMANENTLY);
diff --git a/src/core/EventSubscriber/Site/MenuEventSubscriber.php b/src/core/EventSubscriber/Site/MenuEventSubscriber.php
index e706488..6cc73ba 100644
--- a/src/core/EventSubscriber/Site/MenuEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/MenuEventSubscriber.php
@@ -20,14 +20,27 @@ use Symfony\Contracts\Translation\TranslatorInterface;
  */
 class MenuEventSubscriber extends EntityManagerEventSubscriber
 {
+    protected NodeFactory $nodeFactory;
+    protected NodeRepository $nodeRepository;
+    protected EntityManager $entityManager;
+    protected CodeSlugify $slugify;
+    protected SymfonyCacheManager $cacheManager;
+    protected TranslatorInterface $translation;
+
     public function __construct(
-        protected NodeFactory $nodeFactory,
-        protected NodeRepository $nodeRepository,
-        protected EntityManager $entityManager,
-        protected CodeSlugify $slugify,
-        protected SymfonyCacheManager $cacheManager,
-        protected TranslatorInterface $translator
+        NodeFactory $nodeFactory,
+        NodeRepository $nodeRepository,
+        EntityManager $entityManager,
+        CodeSlugify $slugify,
+        SymfonyCacheManager $cacheManager,
+        TranslatorInterface $translator
     ) {
+        $this->nodeFactory = $nodeFactory;
+        $this->nodeRepository = $nodeRepository;
+        $this->entityManager = $entityManager;
+        $this->slugify = $slugify;
+        $this->cacheManager = $cacheManager;
+        $this->translator = $translator;
     }
 
     public function supports(EntityInterface $entity): bool
diff --git a/src/core/EventSubscriber/Site/NavigationEventSubscriber.php b/src/core/EventSubscriber/Site/NavigationEventSubscriber.php
index ed32dbd..f666e4f 100644
--- a/src/core/EventSubscriber/Site/NavigationEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/NavigationEventSubscriber.php
@@ -17,9 +17,11 @@ use App\Core\Slugify\CodeSlugify;
 class NavigationEventSubscriber extends EntityManagerEventSubscriber
 {
     public function __construct(
-        protected EntityManager $entityManager,
-        protected CodeSlugify $slugify
+        EntityManager $entityManager,
+        CodeSlugify $slugify
     ) {
+        $this->entityManager = $entityManager;
+        $this->slugify = $slugify;
     }
 
     public function supports(EntityInterface $entity): bool
diff --git a/src/core/EventSubscriber/Site/NodeEventSubscriber.php b/src/core/EventSubscriber/Site/NodeEventSubscriber.php
index 3d54a87..5a0b6df 100644
--- a/src/core/EventSubscriber/Site/NodeEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/NodeEventSubscriber.php
@@ -12,6 +12,7 @@ use App\Core\Repository\Site\NodeRepository;
 use App\Core\Slugify\CodeSlugify;
 use App\Core\Slugify\RouteParameterSlugify;
 use App\Core\Slugify\Slugify;
+use Symfony\Component\HttpKernel\KernelInterface;
 use function Symfony\Component\String\u;
 
 /**
@@ -21,14 +22,27 @@ use function Symfony\Component\String\u;
  */
 class NodeEventSubscriber extends EntityManagerEventSubscriber
 {
+    protected NodeFactory $nodeFactory;
+    protected EntityManager $entityManager;
+    protected KernelInterface $kernel;
+    protected Slugify $slugify;
+    protected CodeSlugify $codeSlugify;
+    protected RouteParameterSlugify $routeParameterSlugify;
+
     public function __construct(
-        protected NodeFactory $nodeFactory,
-        protected NodeRepository $nodeRepository,
-        protected EntityManager $entityManager,
-        protected Slugify $slugify,
-        protected CodeSlugify $codeSlugify,
-        protected RouteParameterSlugify $routeParameterSlugify
+        NodeFactory $nodeFactory,
+        NodeRepository $nodeRepository,
+        EntityManager $entityManager,
+        Slugify $slugify,
+        CodeSlugify $codeSlugify,
+        RouteParameterSlugify $routeParameterSlugify
     ) {
+        $this->nodeFactory = $nodeFactory;
+        $this->nodeRepository = $nodeRepository;
+        $this->entityManager = $entityManager;
+        $this->slugify = $slugify;
+        $this->codeSlugify = $codeSlugify;
+        $this->routeParameterSlugify = $routeParameterSlugify;
     }
 
     public function supports(EntityInterface $entity): bool
@@ -49,7 +63,7 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
 
         $node = $event->getEntity();
 
-        $node->setCode($this->codeSlugify->slugify($node->getCode() ?? ''));
+        $node->setCode($this->codeSlugify->slugify($node->getCode()));
 
         if ($node->getDisableUrl()) {
             $node->setUrl(null);
diff --git a/src/core/EventSubscriber/Site/Page/BlockEventSubscriber.php b/src/core/EventSubscriber/Site/Page/BlockEventSubscriber.php
index 29198a6..753f9d0 100644
--- a/src/core/EventSubscriber/Site/Page/BlockEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/Page/BlockEventSubscriber.php
@@ -17,8 +17,11 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
  */
 class BlockEventSubscriber extends EntityManagerEventSubscriber
 {
-    public function __construct(protected FileUploadHandler $fileUpload)
+    protected FileUploadHandler $fileUpload;
+
+    public function __construct(FileUploadHandler $fileUpload)
     {
+        $this->fileUpload = $fileUpload;
     }
 
     public function supports(EntityInterface $entity): bool
diff --git a/src/core/EventSubscriber/Site/Page/PageEventSubscriber.php b/src/core/EventSubscriber/Site/Page/PageEventSubscriber.php
index 61268c0..a73ad5a 100644
--- a/src/core/EventSubscriber/Site/Page/PageEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/Page/PageEventSubscriber.php
@@ -16,8 +16,11 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
  */
 class PageEventSubscriber extends EntityManagerEventSubscriber
 {
-    public function __construct(protected FileUploadHandler $fileUpload)
+    protected FileUploadHandler $fileUpload;
+
+    public function __construct(FileUploadHandler $fileUpload)
     {
+        $this->fileUpload = $fileUpload;
     }
 
     public function supports(EntityInterface $entity): bool
diff --git a/src/core/EventSubscriber/Site/SiteEventSubscriber.php b/src/core/EventSubscriber/Site/SiteEventSubscriber.php
index 02bdc01..e93530e 100644
--- a/src/core/EventSubscriber/Site/SiteEventSubscriber.php
+++ b/src/core/EventSubscriber/Site/SiteEventSubscriber.php
@@ -18,10 +18,13 @@ use Symfony\Component\HttpKernel\KernelInterface;
  */
 class SiteEventSubscriber extends EntityManagerEventSubscriber
 {
-    public function __construct(
-        protected KernelInterface $kernel,
-        protected SymfonyCacheManager $cacheManager
-    ) {
+    protected KernelInterface $kernel;
+    protected SymfonyCacheManager $cacheManager;
+
+    public function __construct(KernelInterface $kernel, SymfonyCacheManager $cacheManager)
+    {
+        $this->kernel = $kernel;
+        $this->cacheManager = $cacheManager;
     }
 
     public function supports(EntityInterface $entity): bool
diff --git a/src/core/EventSubscriber/Task/CacheCleanTaskEventSubscriber.php b/src/core/EventSubscriber/Task/CacheCleanTaskEventSubscriber.php
index ae5674b..f2efbcb 100644
--- a/src/core/EventSubscriber/Task/CacheCleanTaskEventSubscriber.php
+++ b/src/core/EventSubscriber/Task/CacheCleanTaskEventSubscriber.php
@@ -13,8 +13,11 @@ use App\Core\Event\Task\TaskRunRequestedEvent;
  */
 class CacheCleanTaskEventSubscriber extends TaskEventSubscriber
 {
-    public function __construct(protected SymfonyCacheManager $cacheManager)
+    protected SymfonyCacheManager $cacheManager;
+
+    public function __construct(SymfonyCacheManager $cacheManager)
     {
+        $this->cacheManager = $cacheManager;
     }
 
     public function onInit(TaskInitEvent $event)
diff --git a/src/core/Factory/RedirectFactory.php b/src/core/Factory/RedirectFactory.php
index cb1fe5f..d7a138a 100644
--- a/src/core/Factory/RedirectFactory.php
+++ b/src/core/Factory/RedirectFactory.php
@@ -2,6 +2,7 @@
 
 namespace App\Core\Factory;
 
+use App\Core\Factory\FactoryInterface;
 use App\Core\Entity\Redirect as Entity;
 
 class RedirectFactory implements FactoryInterface
diff --git a/src/core/FileManager/FsFileManager.php b/src/core/FileManager/FsFileManager.php
index 8c85407..e4a1751 100644
--- a/src/core/FileManager/FsFileManager.php
+++ b/src/core/FileManager/FsFileManager.php
@@ -23,15 +23,22 @@ class FsFileManager
     protected string $path;
     protected string $pathUri;
     protected array $pathLocked;
+    protected FileUploadHandler $uploadHandler;
+    protected FileInformationFactory $fileInformationFactory;
+    protected FileInformationRepositoryQuery $fileInformationRepositoryQuery;
 
     public function __construct(
         ParameterBagInterface $params,
-        protected FileUploadHandler $uploadHandler,
-        protected FileInformationFactory $fileInformationFactory,
-        protected FileInformationRepositoryQuery $fileInformationRepositoryQuery
+        FileUploadHandler $uploadHandler,
+        FileInformationFactory $fileInformationFactory,
+        FileInformationRepositoryQuery $fileInformationRepositoryQuery
     ) {
         $config = $params->get('core')['file_manager'];
 
+        $this->uploadHandler = $uploadHandler;
+        $this->fileInformationFactory = $fileInformationFactory;
+        $this->fileInformationRepositoryQuery = $fileInformationRepositoryQuery;
+
         $this->mimes = $config['mimes'];
         $this->path = $config['path'];
         $this->pathUri = $this->normalizePath($config['path_uri']);
@@ -84,16 +91,12 @@ class FsFileManager
         $this->applySort($finder, $options['sort'] ?? 'name', $options['sort_direction'] ?? 'asc');
 
         foreach ($finder as $file) {
-            $splInfo = $this->getSplInfo($directory.'/'.$file->getBasename());
-
             $data['files'][] = [
                 'basename' => $file->getBasename(),
                 'path' => $directory,
                 'webPath' => $this->pathUri.'/'.$directory.'/'.$file->getBasename(),
                 'locked' => $this->isLocked($directory.'/'.$file->getBasename()),
                 'mime' => mime_content_type($file->getRealPath()),
-                'size' => $splInfo ? $splInfo->getSize() : null,
-                'updated_at' => $splInfo ? date('Y-m-d H:i', $splInfo->getMTime()) : null,
             ];
         }
 
@@ -233,7 +236,7 @@ class FsFileManager
                 $directory .= '/'.trim(dirname($fullPaths[$key]), '/');
             }
 
-            $this->uploadHandler->handleForm($file, $directory, keepOriginalFilename: true);
+            $this->uploadHandler->handleForm($file, $directory, null, true);
         }
     }
 
@@ -294,16 +297,14 @@ class FsFileManager
 
     protected function applySort(Finder $finder, string $sort, string $direction)
     {
-        $sorts = [
-            'name' => 'sortByName',
-            'type' => 'sortByType',
-            'updated_at' => 'sortByModifiedTime',
-        ];
+        if ('name' === $sort) {
+            $finder->sortByName();
+        } elseif ('modification_date' === $sort) {
+            $finder->sortByModifiedTime();
+        }
 
         if ('desc' === $direction) {
-            $finder->{$sorts[$sort]}()->reverseSorting();
-        } else {
-            $finder->{$sorts[$sort]}();
+            $finder->reverseSorting();
         }
     }
 
diff --git a/src/core/Form/FileManager/FilePickerType.php b/src/core/Form/FileManager/FilePickerType.php
index 2dbcd2c..666c789 100644
--- a/src/core/Form/FileManager/FilePickerType.php
+++ b/src/core/Form/FileManager/FilePickerType.php
@@ -6,6 +6,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
 class FilePickerType extends AbstractType
 {
diff --git a/src/core/Form/FileUploadHandler.php b/src/core/Form/FileUploadHandler.php
index d3b68bf..68b9b90 100644
--- a/src/core/Form/FileUploadHandler.php
+++ b/src/core/Form/FileUploadHandler.php
@@ -11,62 +11,25 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
  */
 class FileUploadHandler
 {
-    protected $filenameGenerator;
-
-    public function setFilenameGenerator(callable $filenameGenerator): self
-    {
-        $this->filenameGenerator = $filenameGenerator;
-
-        return $this;
-    }
-
-    public function handleForm(
-        null|array|UploadedFile $uploadedFile,
-        string $path,
-        ?callable $afterUploadCallback = null,
-        ?callable $afterUploadsCallback = null,
-        bool $keepOriginalFilename = false
-    ): null|array|string
+    public function handleForm(?UploadedFile $uploadedFile, string $path, ?callable $afterUploadCallback = null, bool $keepOriginalFilename = false): void
     {
         if (null === $uploadedFile) {
-            return null;
+            return;
         }
 
-        if (is_array($uploadedFile)) {
-            $filenames = [];
+        $originalFilename = pathinfo($uploadedFile->getClientOriginalName(), PATHINFO_FILENAME);
 
-            foreach ($uploadedFile as $file) {
-                $filename = $this->handleForm($file, $path, $afterUploadCallback, null, $keepOriginalFilename);
-
-                if ($filename !== null) {
-                    $filenames[] = $filename;
-                }
-            }
-
-            if (!empty($filenames) && $afterUploadsCallback) {
-                $afterUploadsCallback($filenames);
-            }
-
-            return $filenames;
+        if ($keepOriginalFilename) {
+            $filename = $originalFilename.'.'.$uploadedFile->guessExtension();
         } else {
-            $originalFilename = pathinfo($uploadedFile->getClientOriginalName(), PATHINFO_FILENAME);
+            $safeFilename = transliterator_transliterate('Any-Latin; Latin-ASCII; [^A-Za-z0-9_] remove; Lower()', $originalFilename);
+            $filename = date('Ymd-his').$safeFilename.'.'.$uploadedFile->guessExtension();
+        }
 
-            if ($keepOriginalFilename) {
-                $filename = $originalFilename.'.'.$uploadedFile->guessExtension();
-            } elseif (!is_callable($this->filenameGenerator)) {
-                $safeFilename = transliterator_transliterate('Any-Latin; Latin-ASCII; [^A-Za-z0-9_] remove; Lower()', $originalFilename);
-                $filename = date('Ymd-his').$safeFilename.'.'.$uploadedFile->guessExtension();
-            } else {
-                $filename = call_user_func($this->filenameGenerator, $uploadedFile);
-            }
+        $uploadedFile->move($path, $filename);
 
-            $uploadedFile->move($path, $filename);
-
-            if ($afterUploadCallback) {
-                $afterUploadCallback($filename);
-            }
-
-            return $filename;
+        if ($afterUploadCallback) {
+            $afterUploadCallback($filename);
         }
     }
 }
diff --git a/src/core/Form/Filter/RedirectFilterType.php b/src/core/Form/Filter/RedirectFilterType.php
index c694663..2cf4cd4 100644
--- a/src/core/Form/Filter/RedirectFilterType.php
+++ b/src/core/Form/Filter/RedirectFilterType.php
@@ -2,11 +2,13 @@
 
 namespace App\Core\Form\Filter;
 
+use App\Core\Entity\Redirect;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class RedirectFilterType extends AbstractType
 {
diff --git a/src/core/Form/RedirectType.php b/src/core/Form/RedirectType.php
index ef2b836..3acce35 100644
--- a/src/core/Form/RedirectType.php
+++ b/src/core/Form/RedirectType.php
@@ -4,12 +4,12 @@ namespace App\Core\Form;
 
 use App\Core\Entity\Redirect;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 
 class RedirectType extends AbstractType
 {
diff --git a/src/core/Form/Site/MenuType.php b/src/core/Form/Site/MenuType.php
index 6ff2275..3efefdd 100644
--- a/src/core/Form/Site/MenuType.php
+++ b/src/core/Form/Site/MenuType.php
@@ -7,7 +7,6 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class MenuType extends AbstractType
@@ -24,7 +23,6 @@ class MenuType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -39,7 +37,6 @@ class MenuType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
diff --git a/src/core/Form/Site/NavigationAdditionalDomainType.php b/src/core/Form/Site/NavigationAdditionalDomainType.php
index ab91563..cc4ecf4 100644
--- a/src/core/Form/Site/NavigationAdditionalDomainType.php
+++ b/src/core/Form/Site/NavigationAdditionalDomainType.php
@@ -7,7 +7,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class NavigationAdditionalDomainType extends AbstractType
@@ -25,7 +24,6 @@ class NavigationAdditionalDomainType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
diff --git a/src/core/Form/Site/NavigationType.php b/src/core/Form/Site/NavigationType.php
index a6c3278..9ccf546 100644
--- a/src/core/Form/Site/NavigationType.php
+++ b/src/core/Form/Site/NavigationType.php
@@ -6,7 +6,6 @@ use App\Core\Entity\Site\Navigation;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\ColorType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -27,7 +26,6 @@ class NavigationType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -40,21 +38,6 @@ class NavigationType extends AbstractType
                 'required' => true,
                 'attr' => [
                 ],
-                'constraints' => [
-                    new NotBlank(),
-                    new Length(max: 255),
-                ],
-            ]
-        );
-
-        $builder->add(
-            'color',
-            ColorType::class,
-            [
-                'label' => 'Color',
-                'required' => true,
-                'attr' => [
-                ],
                 'constraints' => [
                     new NotBlank(),
                 ],
@@ -71,7 +54,6 @@ class NavigationType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -112,7 +94,7 @@ class NavigationType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(min: 2, max: 10),
+                    new Length(['min' => 2, 'max' => 10]),
                 ],
             ]
         );
diff --git a/src/core/Form/Site/NodeType.php b/src/core/Form/Site/NodeType.php
index a60552f..3f2a454 100644
--- a/src/core/Form/Site/NodeType.php
+++ b/src/core/Form/Site/NodeType.php
@@ -13,7 +13,6 @@ use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class NodeType extends AbstractType
@@ -30,7 +29,6 @@ class NodeType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -45,7 +43,6 @@ class NodeType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -85,7 +82,6 @@ class NodeType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -120,9 +116,6 @@ class NodeType extends AbstractType
 
                     return $choices;
                 }),
-                'constraints' => [
-                    new Length(max: 255),
-                ],
             ]
         );
 
diff --git a/src/core/Form/Site/Page/BuilderBlockType.php b/src/core/Form/Site/Page/BuilderBlockType.php
deleted file mode 100644
index e3c5cc3..0000000
--- a/src/core/Form/Site/Page/BuilderBlockType.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Core\Form\Site\Page;
-
-use App\Core\Entity\Site\Page\BuilderBlock;
-use App\Core\Form\Type\BuilderType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class BuilderBlockType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add(
-            'value',
-            BuilderType::class,
-            array_merge([
-                'required' => false,
-                'label' => false,
-            ], $options['options']),
-        );
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => BuilderBlock::class,
-            'options' => [],
-        ]);
-    }
-}
diff --git a/src/core/Form/Site/Page/FilePickerBlockType.php b/src/core/Form/Site/Page/FilePickerBlockType.php
index 87d87af..85a7ed9 100644
--- a/src/core/Form/Site/Page/FilePickerBlockType.php
+++ b/src/core/Form/Site/Page/FilePickerBlockType.php
@@ -2,11 +2,11 @@
 
 namespace App\Core\Form\Site\Page;
 
-use App\Core\Entity\Site\Page\Block;
 use App\Core\Form\FileManager\FilePickerType;
-use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\AbstractType;
+use App\Core\Entity\Site\Page\Block;
 
 class FilePickerBlockType extends AbstractType
 {
diff --git a/src/core/Form/Site/Page/Filter/PageFilterType.php b/src/core/Form/Site/Page/Filter/PageFilterType.php
index 09c8331..0aee47f 100644
--- a/src/core/Form/Site/Page/Filter/PageFilterType.php
+++ b/src/core/Form/Site/Page/Filter/PageFilterType.php
@@ -6,10 +6,10 @@ use App\Core\Entity\Site\Navigation;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 class PageFilterType extends AbstractType
 {
diff --git a/src/core/Form/Site/Page/PageType.php b/src/core/Form/Site/Page/PageType.php
index 40cb428..352c740 100644
--- a/src/core/Form/Site/Page/PageType.php
+++ b/src/core/Form/Site/Page/PageType.php
@@ -10,7 +10,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Image;
-use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
 class PageType extends AbstractType
@@ -27,7 +26,6 @@ class PageType extends AbstractType
                 ],
                 'constraints' => [
                     new NotBlank(),
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -41,7 +39,6 @@ class PageType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -55,7 +52,6 @@ class PageType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -69,7 +65,6 @@ class PageType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
@@ -83,7 +78,6 @@ class PageType extends AbstractType
                 'attr' => [
                 ],
                 'constraints' => [
-                    new Length(max: 255),
                 ],
             ]
         );
diff --git a/src/core/Form/Type/BuilderType.php b/src/core/Form/Type/BuilderType.php
deleted file mode 100644
index 1f2fd09..0000000
--- a/src/core/Form/Type/BuilderType.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Core\Form\Type;
-
-use Symfony\Component\Form\Extension\Core\Type\CollectionType as BaseCollectionType;
-use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-
-class BuilderType extends AbstractType
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function buildView(FormView $view, FormInterface $form, array $options)
-    {
-        parent::buildView($view, $form, $options);
-
-        $view->vars = array_replace($view->vars, [
-            'allowed_widgets' => $options['allowed_widgets'],
-        ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        parent::configureOptions($resolver);
-
-        $resolver->setDefaults([
-            'compound' => false,
-            'allowed_widgets' => [],
-        ]);
-
-        $resolver->setAllowedTypes('allowed_widgets', 'array');
-    }
-
-    public function getBlockPrefix()
-    {
-        return 'builder';
-    }
-}
diff --git a/src/core/Form/Type/CollectionType.php b/src/core/Form/Type/CollectionType.php
index 5c91d90..166d5d5 100644
--- a/src/core/Form/Type/CollectionType.php
+++ b/src/core/Form/Type/CollectionType.php
@@ -16,25 +16,10 @@ class CollectionType extends BaseCollectionType
     {
         parent::buildView($view, $form, $options);
 
-        $classes = [
-            'add_attr' => 'collection-add',
-            'delete_attr' => 'text-right',
-        ];
-
-        foreach ($classes as $key => $class) {
-            $options[$key]['class'] = $class.' '.($options[$key]['class'] ?? '');
-        }
-
         $view->vars = array_replace($view->vars, [
             'collection_name' => $options['collection_name'],
             'label_add' => $options['label_add'],
             'label_delete' => $options['label_delete'],
-            'allow_add' => $options['allow_add'],
-            'allow_delete' => $options['allow_delete'],
-            'add_attr' => $options['add_attr'],
-            'delete_attr' => $options['delete_attr'],
-            'template_before_item' => $options['template_before_item'],
-            'template_after_item' => $options['template_after_item'],
         ]);
     }
 
@@ -46,10 +31,6 @@ class CollectionType extends BaseCollectionType
             'collection_name' => '',
             'label_add' => 'Add',
             'label_delete' => 'Delete',
-            'template_before_item' => null,
-            'template_after_item' => null,
-            'add_attr' => [],
-            'delete_attr' => [],
         ]);
     }
 
diff --git a/src/core/Maker/MakeBuilderBlock.php b/src/core/Maker/MakeBuilderBlock.php
deleted file mode 100644
index 9027db4..0000000
--- a/src/core/Maker/MakeBuilderBlock.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Core\Maker;
-
-use Doctrine\Common\Annotations\Annotation;
-use Symfony\Bundle\MakerBundle\ConsoleStyle;
-use Symfony\Bundle\MakerBundle\DependencyBuilder;
-use Symfony\Bundle\MakerBundle\Generator;
-use Symfony\Bundle\MakerBundle\InputConfiguration;
-use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
-use Symfony\Bundle\MakerBundle\Str;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Filesystem\Filesystem;
-
-class MakeBuilderBlock extends AbstractMaker
-{
-    public static function getCommandName(): string
-    {
-        return 'make:builder-block';
-    }
-
-    public static function getCommandDescription(): string
-    {
-        return 'Creates a new builder block class';
-    }
-
-    public function configureCommand(Command $command, InputConfiguration $inputConf)
-    {
-        $command
-            ->addArgument(
-                'builder-block-class',
-                InputArgument::OPTIONAL,
-                'Choose a name for your block class (e.g. <fg=yellow>ExampleBlock</>)'
-            )
-            ->setHelp('')
-        ;
-    }
-
-    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator)
-    {
-        $blockClassNameDetails = $generator->createClassNameDetails(
-            $input->getArgument('builder-block-class'),
-            'BuilderBlock\\',
-            'Block'
-        );
-
-        $templatePath = sprintf(
-            'builder_block/%s.html.twig',
-            Str::asSnakeCase(preg_replace('/Block$/', '', $blockClassNameDetails->getShortName()))
-        );
-
-        $options = [
-            'entity' => $blockClassNameDetails->getFullName(),
-            'template' => $templatePath,
-            'label' => Str::asHumanWords($blockClassNameDetails->getShortName())
-        ];
-
-        $blockPath = $generator->generateController(
-            $blockClassNameDetails->getFullName(),
-            __DIR__.'/../Resources/maker/builder/Block.tpl.php',
-            $options
-        );
-
-        $generator->writeChanges();
-        $realTemplatePath = 'templates/'.$templatePath;
-
-        $filesystem = new Filesystem();
-
-        if (!$filesystem->exists($templatePath)) {
-            $filesystem->mkdir(dirname($realTemplatePath));
-            $filesystem->dumpFile($realTemplatePath, $this->getTemplate());
-
-            $io->comment(sprintf('<fg=blue>created</>: %s', $realTemplatePath));
-        }
-
-        $this->writeSuccessMessage($io);
-    }
-
-    protected function getTemplate(): string
-    {
-        return <<< EOF
-<div id="{{ id }}">
-    {% for item in children %}
-        {{ item|block_to_html(context) }}
-    {% endfor %}
-</div>
-
-EOF;
-    }
-
-    public function configureDependencies(DependencyBuilder $dependencies)
-    {
-    }
-}
diff --git a/src/core/Maker/MakeCrudController.php b/src/core/Maker/MakeCrudController.php
index f24e4a1..d8e3f71 100644
--- a/src/core/Maker/MakeCrudController.php
+++ b/src/core/Maker/MakeCrudController.php
@@ -11,7 +11,6 @@ use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Filesystem\Filesystem;
 use function Symfony\Component\String\u;
 
 class MakeCrudController extends AbstractMaker
@@ -104,17 +103,6 @@ class MakeCrudController extends AbstractMaker
             $options
         );
 
-        $views = ['_form.html.twig', '_show.html.twig'];
-        $directory = sprintf('templates/admin/%s_admin/', $options['route']);
-        $filesystem = new Filesystem();
-        $filesystem->mkdir($directory);
-        foreach ($views as $view) {
-            $filesystem->dumpFile(
-                $directory.$view,
-                sprintf("{{ include('@Core/admin/crud/%s') }}\n", $view)
-            );
-        }
-
         $generator->writeChanges();
 
         $this->writeSuccessMessage($io);
diff --git a/src/core/Maker/MakeFactory.php b/src/core/Maker/MakeFactory.php
index 9fd007a..4ed7369 100644
--- a/src/core/Maker/MakeFactory.php
+++ b/src/core/Maker/MakeFactory.php
@@ -11,6 +11,7 @@ use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use function Symfony\Component\String\u;
 
 class MakeFactory extends AbstractMaker
 {
diff --git a/src/core/Maker/MakePage.php b/src/core/Maker/MakePage.php
index 5ea4316..f6bb654 100644
--- a/src/core/Maker/MakePage.php
+++ b/src/core/Maker/MakePage.php
@@ -8,11 +8,11 @@ use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\Maker\AbstractMaker;
-use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Question\Question;
+use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Component\Filesystem\Filesystem;
 
 class MakePage extends AbstractMaker
@@ -92,8 +92,7 @@ class MakePage extends AbstractMaker
 
         $this->writeSuccessMessage($io);
         $io->text('Register the page in <comment>config/packages/app.yaml</comment>: ');
-        $io->text(
-            <<< EOF
+        $io->text(<<< EOF
 
 core:
     site:
@@ -101,18 +100,10 @@ core:
             {$pageClassNameDetails->getFullName()}:
                 name: {$pageClassNameDetails->getShortName()}
                 templates:
-                    - {name: "Default", file: "{$templatePath}"}
+                    - {name: "Default", file: "${templatePath}"}
 
 EOF
-        );
-    }
-
-    public function configureDependencies(DependencyBuilder $dependencies)
-    {
-        $dependencies->addClassDependency(
-            Annotation::class,
-            'doctrine/annotations'
-        );
+);
     }
 
     private function askForNextBlock(ConsoleStyle $io, array $blocks, bool $isFirstField)
@@ -147,9 +138,8 @@ EOF
         $types = [
             'text' => null,
             'textarea' => null,
-            'choice' => 'BlockEntity\\ChoiceBlock::class',
+            'choice' => null,
             'collection' => 'BlockEntity\\CollectionBlock::class',
-            'builder' => 'BlockEntity\\BuilderBlock::class',
             'editor_js_textarea' => null,
             'file' => 'BlockEntity\\FileBlock::class',
             'file_picker' => null,
@@ -193,4 +183,12 @@ EOF
             $io->writeln(sprintf('  * <comment>%s</comment>', $type));
         }
     }
+
+    public function configureDependencies(DependencyBuilder $dependencies)
+    {
+        $dependencies->addClassDependency(
+            Annotation::class,
+            'doctrine/annotations'
+        );
+    }
 }
diff --git a/src/core/Manager/EntityManager.php b/src/core/Manager/EntityManager.php
index 3a7d9e8..c4eb80e 100644
--- a/src/core/Manager/EntityManager.php
+++ b/src/core/Manager/EntityManager.php
@@ -4,6 +4,7 @@ namespace App\Core\Manager;
 
 use App\Core\Entity\EntityInterface;
 use App\Core\Event\EntityManager\EntityManagerEvent;
+use Doctrine\ORM\EntityManager as DoctrineEntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -14,19 +15,23 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
  */
 class EntityManager
 {
-    public function __construct(
-        protected EventDispatcherInterface $eventDispatcher,
-        protected EntityManagerInterface $entityManager
-    ) {
+    protected EventDispatcherInterface $eventDispatcher;
+
+    protected DoctrineEntityManager $entityManager;
+
+    public function __construct(EventDispatcherInterface $eventDispatcher, EntityManagerInterface $entityManager)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+        $this->entityManager = $entityManager;
     }
 
-    public function create(EntityInterface $entity, bool $dispatchEvent = true, bool $flush = true): self
+    public function create(EntityInterface $entity, bool $dispatchEvent = true): self
     {
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::PRE_CREATE_EVENT);
         }
 
-        $this->persist($entity, $flush);
+        $this->persist($entity);
 
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::CREATE_EVENT);
@@ -35,13 +40,13 @@ class EntityManager
         return $this;
     }
 
-    public function update(EntityInterface $entity, bool $dispatchEvent = true, bool $flush = true): self
+    public function update(EntityInterface $entity, bool $dispatchEvent = true): self
     {
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::PRE_UPDATE_EVENT);
         }
 
-        $this->persist($entity, $flush);
+        $this->persist($entity);
 
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::UPDATE_EVENT);
@@ -50,17 +55,14 @@ class EntityManager
         return $this;
     }
 
-    public function delete(EntityInterface $entity, bool $dispatchEvent = true, bool $flush = true): self
+    public function delete(EntityInterface $entity, bool $dispatchEvent = true): self
     {
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::PRE_DELETE_EVENT);
         }
 
         $this->entityManager->remove($entity);
-
-        if ($flush) {
-            $this->flush();
-        }
+        $this->flush();
 
         if ($dispatchEvent) {
             $this->eventDispatcher->dispatch(new EntityManagerEvent($entity), EntityManagerEvent::DELETE_EVENT);
@@ -88,12 +90,9 @@ class EntityManager
         return $this->entityManager;
     }
 
-    protected function persist(EntityInterface $entity, bool $flush = true)
+    protected function persist(EntityInterface $entity)
     {
         $this->entityManager->persist($entity);
-
-        if ($flush) {
-            $this->flush();
-        }
+        $this->flush();
     }
 }
diff --git a/src/core/Manager/TranslatableEntityManager.php b/src/core/Manager/TranslatableEntityManager.php
index 64a7d89..2cb87a0 100644
--- a/src/core/Manager/TranslatableEntityManager.php
+++ b/src/core/Manager/TranslatableEntityManager.php
@@ -11,13 +11,10 @@ use App\Core\Entity\EntityInterface;
  */
 class TranslatableEntityManager extends EntityManager
 {
-    protected function persist(EntityInterface $entity, bool $flush = true)
+    protected function persist(EntityInterface $entity)
     {
-        $this->entityManager->persist($entity, $flush);
+        $this->entityManager->persist($entity);
         $entity->mergeNewTranslations();
-
-        if ($flush) {
-            $this->flush();
-        }
+        $this->flush();
     }
 }
diff --git a/src/core/Murph.php b/src/core/Murph.php
index e46eda8..e920159 100644
--- a/src/core/Murph.php
+++ b/src/core/Murph.php
@@ -3,7 +3,7 @@
 namespace App\Core;
 
 if (!defined('MURPH_VERSION')) {
-    define('MURPH_VERSION', 'v1.27.0');
+    define('MURPH_VERSION', 'v1.17.1');
 }
 
 /**
diff --git a/src/core/Notification/MailNotifier.php b/src/core/Notification/MailNotifier.php
index 397d7d9..e2a71e2 100644
--- a/src/core/Notification/MailNotifier.php
+++ b/src/core/Notification/MailNotifier.php
@@ -2,10 +2,10 @@
 
 namespace App\Core\Notification;
 
-use App\Entity\User;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Twig\Environment as TwigEnvironment;
+use App\Entity\User;
 
 /**
  * class MailNotifier.
@@ -14,6 +14,7 @@ use Twig\Environment as TwigEnvironment;
  */
 class MailNotifier
 {
+    protected MailerInterface $mailer;
     protected array $attachments = [];
     protected array $recipients = [];
     protected array $bccRecipients = [];
@@ -21,8 +22,10 @@ class MailNotifier
     protected ?string $from = null;
     protected ?string $replyTo = null;
 
-    public function __construct(protected MailerInterface $mailer)
+    public function __construct(TwigEnvironment $twig, MailerInterface $mailer)
     {
+        $this->mailer = $mailer;
+        $this->twig = $twig;
     }
 
     public function setMailer(Swift_Mailer $mailer): self
diff --git a/src/core/Repository/Analytic/RefererRepository.php b/src/core/Repository/Analytic/RefererRepository.php
index a24de60..2bd6b73 100644
--- a/src/core/Repository/Analytic/RefererRepository.php
+++ b/src/core/Repository/Analytic/RefererRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|Referer find($id, $lockMode = null, $lockVersion = null)
- * @method null|Referer findOneBy(array $criteria, array $orderBy = null)
+ * @method Referer|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Referer|null findOneBy(array $criteria, array $orderBy = null)
  * @method Referer[]    findAll()
  * @method Referer[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/Analytic/RefererRepositoryQuery.php b/src/core/Repository/Analytic/RefererRepositoryQuery.php
index 579b6e3..3b052be 100644
--- a/src/core/Repository/Analytic/RefererRepositoryQuery.php
+++ b/src/core/Repository/Analytic/RefererRepositoryQuery.php
@@ -3,9 +3,9 @@
 namespace App\Core\Repository\Analytic;
 
 use App\Core\Repository\Analytic\RefererRepository as Repository;
-use App\Core\Repository\RepositoryQuery;
 use Knp\Component\Pager\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
+use App\Core\Repository\RepositoryQuery;
 
 class RefererRepositoryQuery extends RepositoryQuery
 {
diff --git a/src/core/Repository/Analytic/ViewRepository.php b/src/core/Repository/Analytic/ViewRepository.php
index 5cf6cda..4ddf0a3 100644
--- a/src/core/Repository/Analytic/ViewRepository.php
+++ b/src/core/Repository/Analytic/ViewRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|View find($id, $lockMode = null, $lockVersion = null)
- * @method null|View findOneBy(array $criteria, array $orderBy = null)
+ * @method View|null find($id, $lockMode = null, $lockVersion = null)
+ * @method View|null findOneBy(array $criteria, array $orderBy = null)
  * @method View[]    findAll()
  * @method View[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/Analytic/ViewRepositoryQuery.php b/src/core/Repository/Analytic/ViewRepositoryQuery.php
index 49a6058..0fcae6d 100644
--- a/src/core/Repository/Analytic/ViewRepositoryQuery.php
+++ b/src/core/Repository/Analytic/ViewRepositoryQuery.php
@@ -3,9 +3,9 @@
 namespace App\Core\Repository\Analytic;
 
 use App\Core\Repository\Analytic\ViewRepository as Repository;
-use App\Core\Repository\RepositoryQuery;
 use Knp\Component\Pager\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
+use App\Core\Repository\RepositoryQuery;
 
 class ViewRepositoryQuery extends RepositoryQuery
 {
diff --git a/src/core/Repository/FileInformationRepository.php b/src/core/Repository/FileInformationRepository.php
index 288be58..faad05a 100644
--- a/src/core/Repository/FileInformationRepository.php
+++ b/src/core/Repository/FileInformationRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|FileInformation find($id, $lockMode = null, $lockVersion = null)
- * @method null|FileInformation findOneBy(array $criteria, array $orderBy = null)
+ * @method FileInformation|null find($id, $lockMode = null, $lockVersion = null)
+ * @method FileInformation|null findOneBy(array $criteria, array $orderBy = null)
  * @method FileInformation[]    findAll()
  * @method FileInformation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/NavigationSettingRepository.php b/src/core/Repository/NavigationSettingRepository.php
index 8ad84ef..32a8382 100644
--- a/src/core/Repository/NavigationSettingRepository.php
+++ b/src/core/Repository/NavigationSettingRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|NavigationSetting find($id, $lockMode = null, $lockVersion = null)
- * @method null|NavigationSetting findOneBy(array $criteria, array $orderBy = null)
+ * @method NavigationSetting|null find($id, $lockMode = null, $lockVersion = null)
+ * @method NavigationSetting|null findOneBy(array $criteria, array $orderBy = null)
  * @method NavigationSetting[]    findAll()
  * @method NavigationSetting[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/RedirectRepository.php b/src/core/Repository/RedirectRepository.php
index 5fefeae..c6d6070 100644
--- a/src/core/Repository/RedirectRepository.php
+++ b/src/core/Repository/RedirectRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|Redirect find($id, $lockMode = null, $lockVersion = null)
- * @method null|Redirect findOneBy(array $criteria, array $orderBy = null)
+ * @method Redirect|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Redirect|null findOneBy(array $criteria, array $orderBy = null)
  * @method Redirect[]    findAll()
  * @method Redirect[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/RedirectRepositoryQuery.php b/src/core/Repository/RedirectRepositoryQuery.php
index 18ba64d..fcce4a5 100644
--- a/src/core/Repository/RedirectRepositoryQuery.php
+++ b/src/core/Repository/RedirectRepositoryQuery.php
@@ -2,8 +2,9 @@
 
 namespace App\Core\Repository;
 
-use App\Core\Repository\RedirectRepository as Repository;
+use App\Core\Repository\RepositoryQuery;
 use Knp\Component\Pager\PaginatorInterface;
+use App\Core\Repository\RedirectRepository as Repository;
 
 class RedirectRepositoryQuery extends RepositoryQuery
 {
diff --git a/src/core/Repository/RepositoryQuery.php b/src/core/Repository/RepositoryQuery.php
index e2943b0..7d41fdc 100644
--- a/src/core/Repository/RepositoryQuery.php
+++ b/src/core/Repository/RepositoryQuery.php
@@ -18,7 +18,6 @@ abstract class RepositoryQuery
     protected PaginatorInterface $paginator;
     protected string $id;
     protected array $forcedFilterHandlers = [];
-    protected array $caseInsensitiveFilters = [];
 
     public function __construct(ServiceEntityRepository $repository, string $id, PaginatorInterface $paginator = null)
     {
@@ -89,11 +88,7 @@ abstract class RepositoryQuery
                 $this->andWhere('.'.$name.' = :'.$name);
                 $this->setParameter(':'.$name, $value);
             } elseif (is_string($value)) {
-                if (in_array($name, $this->caseInsensitiveFilters)) {
-                    $this->andWhere(sprintf('LOWER ( .%1$s) LIKE LOWER(:%1$s)', $name));
-                } else {
-                    $this->andWhere('.'.$name.' LIKE :'.$name);
-                }
+                $this->andWhere('.'.$name.' LIKE :'.$name);
                 $this->setParameter(':'.$name, '%'.$value.'%');
             } else {
                 $this->filterHandler($name, $value);
@@ -103,26 +98,6 @@ abstract class RepositoryQuery
         return $this;
     }
 
-    public function count()
-    {
-        return $this
-            ->select(sprintf('COUNT(%s.id) as total', $this->id))
-            ->query
-            ->getQuery()
-            ->setMaxResults(1)
-            ->getOneOrNullResult()['total']
-        ;
-    }
-
-    protected function addForcedFilterHandler(string $name): self
-    {
-        if (!in_array($name, $this->forcedFilterHandlers)) {
-            $this->forcedFilterHandlers[] = $name;
-        }
-
-        return $this;
-    }
-
     protected function populateDqlId(&$data)
     {
         if (is_string($data)) {
@@ -147,18 +122,4 @@ abstract class RepositoryQuery
     protected function filterHandler(string $name, $value)
     {
     }
-
-    protected function addCaseInsensitiveFilters(string $name): self
-    {
-        $this->caseInsensitiveFilters[] = $name;
-
-        return $this;
-    }
-
-    protected function addForcedFilterHandlers(string $name): self
-    {
-        $this->forcedFilterHandlers[] = $name;
-
-        return $this;
-    }
 }
diff --git a/src/core/Repository/SettingRepository.php b/src/core/Repository/SettingRepository.php
index 5d4fb72..6976ae2 100644
--- a/src/core/Repository/SettingRepository.php
+++ b/src/core/Repository/SettingRepository.php
@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|Setting find($id, $lockMode = null, $lockVersion = null)
- * @method null|Setting findOneBy(array $criteria, array $orderBy = null)
+ * @method Setting|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Setting|null findOneBy(array $criteria, array $orderBy = null)
  * @method Setting[]    findAll()
  * @method Setting[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
diff --git a/src/core/Repository/Site/NodeRepository.php b/src/core/Repository/Site/NodeRepository.php
index 7f34466..13a5c73 100644
--- a/src/core/Repository/Site/NodeRepository.php
+++ b/src/core/Repository/Site/NodeRepository.php
@@ -18,7 +18,7 @@ class NodeRepository extends NestedTreeRepository
         $query = $this->createQueryBuilder('n')
             ->join('n.menu', 'm')
             ->where('n.url = :url')
-            ->andWhere('n.disableUrl = false')
+            ->andWhere('n.disableUrl = 0')
             ->andWhere('n.aliasNode is null')
             ->andWhere('m.navigation = :navigation')
             ->setParameter(':url', $url)
@@ -32,9 +32,9 @@ class NodeRepository extends NestedTreeRepository
             ;
         }
 
-        return null !== $query->getQuery()
+        return $query->getQuery()
             ->setMaxResults(1)
-            ->getOneOrNullResult()
+            ->getOneOrNullResult() !== null
         ;
     }
 }
diff --git a/src/core/Resources/assets/css/admin.scss b/src/core/Resources/assets/css/admin.scss
index b11c614..1283fd5 100644
--- a/src/core/Resources/assets/css/admin.scss
+++ b/src/core/Resources/assets/css/admin.scss
@@ -10,19 +10,6 @@ $pagination-bg: #ffffff !default;
 $pagination-active-color: #ffffff !default;
 $pagination-active-bg: #343a40 !default;
 
-$sidebar-width: 260px !default;
-
-$input-border-color: map-get($theme-colors, 'dark-blue');
-$input-btn-focus-color: $input-border-color;
-
-$component-active-color: map-get($theme-colors, 'dark-blue');
-
-$nav-tabs-link-active-bg: map-get($theme-colors, 'dark-blue');
-$nav-pills-link-active-bg:  map-get($theme-colors, 'dark-blue');
-$nav-tabs-link-active-color: lighten(map-get($theme-colors, 'dark-blue'), 100%);
-$nav-pills-link-active-color: lighten(map-get($theme-colors, 'dark-blue'), 100%);
-$input-focus-border-color: lighten(map-get($theme-colors, 'dark-blue'), 80%);
-
 @import "~choices.js/src/styles/choices.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 @import "~@fortawesome/fontawesome-free/css/all.css";
@@ -30,29 +17,9 @@ $input-focus-border-color: lighten(map-get($theme-colors, 'dark-blue'), 80%);
 @import '~grapesjs/dist/css/grapes.min.css';
 @import '~grapesjs-component-code-editor/dist/grapesjs-component-code-editor.min.css';
 
-@for $i from 1 through 400 {
-  .miw-#{$i}, .min-width-#{$i} {
-    min-width: #{$i}px;
-  }
-
-  .min-width-#{$i}p {
-    min-width: #{$i}#{"%"};
-  }
-
-  .maw-#{$i}, .max-width-#{$i} {
-    max-width: #{$i}px;
-  }
-
-  .max-width-#{$i}p {
-    max-width: #{$i}#{"%"};
-  }
-
-  .width-#{$i} {
-    width: #{$i}px;
-  }
-
-  .width-#{$i}p {
-    width: #{$i}#{"%"};
+@for $i from 1 through 100 {
+  .miw-#{$i*5} {
+    min-width: $i * 5px;
   }
 }
 
@@ -82,11 +49,6 @@ body {
   display: block;
 }
 
-.choices__inner, .is-focused .choices__inner, .is-open .choices__inner {
-  border: 1px solid map-get($theme-colors, 'dark-blue');
-  background: #fff;
-}
-
 .dropdown-toggle-hide-after {
   &::after {
     display: none;
@@ -146,7 +108,6 @@ body {
 .table .thead-light {
   a, th {
     color: map-get($theme-colors, 'dark-blue');
-    background: lighten(map-get($theme-colors, 'dark-blue'), 80%);
   }
 }
 
@@ -212,7 +173,7 @@ tr.table-primary-light {
 
 
 .sidebar {
-  width: $sidebar-width;
+  width: 260px;
   display: inline-block;
 
   .sidebar-toggler {
@@ -292,8 +253,8 @@ tr.table-primary-light {
 
 .body {
   padding-top: 60px;
-  width: calc(100% - $sidebar-width);
-  margin-left: $sidebar-width;
+  width: calc(100% - 260px);
+  margin-left: 260px;
   display: inline-block;
 
   .nav {
@@ -439,21 +400,6 @@ th {
   margin-right: 4px;
 }
 
-.form-color {
-  display: inline-block;
-  line-height: 0;
-  border-radius: 25%;
-
-  input {
-    padding: 0;
-    border: 0;
-    height: auto;
-    width: 30px;
-    aspect-ratio: 1/1;
-    display: inline-block;
-  }
-}
-
 #form-main {
   > .tab-content {
     @media screen and (min-width: 500px) {
@@ -619,11 +565,7 @@ fieldset.form-group {
 
   &-filter {
     padding-right: 20px;
-    padding-bottom: 15px;
-
-    .pagination {
-      margin-bottom: 0;
-    }
+    padding-bottom: 20px;
 
     @media screen and (max-width: 769px) {
       padding-right: 10px;
@@ -654,20 +596,8 @@ fieldset.form-group {
   }
 }
 
-.table {
-  .crud-batch-column {
-    width: 1%;
-  }
-
-  .crud-action-column {
-    text-align: right;
-    white-space: nowrap;
-    width: 1px;
-  }
-}
-
-.no-wrap {
-  white-space: nowrap;
+.table .crud-batch-column {
+  width: 1%;
 }
 
 form {
@@ -725,16 +655,6 @@ form {
   }
 }
 
-label.required::after {
-  content: '*';
-  margin-left: 3px;
-  color: #b41215;
-}
-
-.invalid-feedback {
-  margin-top: -3px;
-}
-
 .gjs-editor-cont {
   border-radius: 10px;
   overflow: hidden !important;
@@ -744,156 +664,6 @@ label.required::after {
   background: map-get($theme-colors, 'dark-blue');
 }
 
-.tox {
-  &.tox-silver-sink.tox-tinymce-aux {
-    z-index: 3000 !important;
-  }
-
-  &.tox-tinymce {
-    border-color: $input-border-color;
-    border-radius: 5px;
-  }
-}
-
-.field-boolean {
-  color: #49555b;
-  font-size: 20px;
-}
-
-.builder-widget {
-  .container {
-    max-width: 100%;
-  }
-
-  .block {
-    box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
-    padding: 15px;
-    border-radius: 4px;
-    background: rgba(map-get($theme-colors, 'dark-blue'), 0.02);
-  }
-
-  > .block {
-    box-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
-  }
-
-  .block-header {
-    .block-header-item {
-      font-size: 12px;
-      display: inline-block;
-      padding: 2px 6px;
-      border-radius: 4px;
-      margin-right: 2px;
-      cursor: pointer;
-    }
-  }
-
-  .block .block-icon {
-    > * {
-      display: inline-block;
-      margin-right: 3px;
-    }
-  }
-
-  .builder-add {
-    &-top {
-      margin-top: 7px;
-    }
-
-    &-button {
-      cursor: pointer;
-      background: rgba(map-get($theme-colors, 'dark-blue'), 0.1);
-      text-align: center;
-      padding-bottom: 5px;
-      margin: 8px 0;
-      border-radius: 4px;
-
-      &:hover {
-        background: rgba(map-get($theme-colors, 'dark-blue'), 0.2);
-      }
-
-      .btn {
-        font-size: 12px;
-        line-height: 14px;
-        padding: 3px 5px;
-      }
-    }
-  }
-
-  .block-root {
-      border: 1px solid map-get($theme-colors, 'dark-blue');
-      box-shadow: none;
-  }
-
-  .block-root > .container .builder-add {
-    margin-top: 0;
-  }
-
-  .block-settings {
-    padding: 4px;
-    margin-top: 10px;
-    margin-bottom: 5px;
-
-    .form-control {
-      margin-top: 0.5rem !important;
-    }
-  }
-
-  .block-id {
-    font-size: 12px;
-    margin-right: 5px;
-  }
-
-  .block-show-dropzone {
-    .block-dropzone {
-      min-height: 40px;
-    }
-  }
-
-  .block-preview {
-    white-space: nowrap;
-    max-width: 30%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-
-  .builder-code-editor {
-    border: 0;
-    padding: 0;
-    background: none;
-    position: fixed;
-    top: 15px;
-
-    textarea {
-      font-family: Monospace;
-      min-height: 50vh;
-    }
-  }
-
-  .dragger {
-    cursor: pointer;
-    color: #6c757d;
-    border-color: #6c757d;
-    text-align: center;
-    vertical-align: middle;
-  }
-
-  $block-colors: #E183F5 #E3F7C6 #82DDF5 #F5BA82 #A088A6;
-  $block-colors-length: length($block-colors);
-
-  @for $i from 1 through 100 {
-    $block-color-index: ($block-colors-length + $i) % $block-colors-length + 1;
-
-    .block-depth-#{$i} {
-      .block-label {
-        background: nth($block-colors, $block-color-index);
-        border: 1px solid darken(nth($block-colors, $block-color-index), 50%);
-        color: darken(nth($block-colors, $block-color-index), 50%);
-      }
-
-      .builder-add-button:hover {
-        background: nth($block-colors, $block-color-index);
-        color: darken(nth($block-colors, $block-color-index), 50%);
-      }
-    }
-  }
+.tox.tox-silver-sink.tox-tinymce-aux {
+  z-index: 3000 !important;
 }
diff --git a/src/core/Resources/assets/js/admin.js b/src/core/Resources/assets/js/admin.js
index c1c988d..b619439 100644
--- a/src/core/Resources/assets/js/admin.js
+++ b/src/core/Resources/assets/js/admin.js
@@ -1,7 +1,6 @@
 import '../../../../../../../../assets/css/admin.scss';
 
 require('../../../../../../../../node_modules/bootstrap/dist/js/bootstrap.min.js')
-require('./modules/sidebar.js')()
 require('./modules/table-fixed.js')()
 require('./modules/form-confirm.js')()
 require('./modules/form-file.js')()
@@ -28,5 +27,5 @@ require('./modules/file-manager.js')()
 require('./modules/file-picker.js')()
 require('./modules/analytics.js')()
 require('./modules/page.js')()
+require('./modules/sidebar.js')()
 require('./modules/node.js')()
-require('./modules/builder-block.js')()
diff --git a/src/core/Resources/assets/js/components/builder-block/BuilderBlock.vue b/src/core/Resources/assets/js/components/builder-block/BuilderBlock.vue
deleted file mode 100644
index b13233c..0000000
--- a/src/core/Resources/assets/js/components/builder-block/BuilderBlock.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <div
-    class="block block-root"
-    v-if="Object.keys(widgets).length && value !== null"
-  >
-    <div class="container">
-      <BuilderBlockCreate
-        :container="value"
-        :widgets="widgets"
-        :openedBlocks="openedBlocks"
-        :allowedWidgets="allowedWidgets"
-        v-if="value.length > 0"
-        position="top"
-      />
-    </div>
-    <Draggable
-      v-model="value"
-      :key="blockKey"
-      :animation="200"
-      group="children"
-      ghost-class="ghost"
-      @start="dragStart"
-      @end="dragEnd"
-      handle=".dragger"
-      :class="{'block-show-dropzone': showDragDrop}"
-    >
-      <BuilderBlockItem
-        v-for="(block, key) in value"
-        :key="block.id + '-' + key"
-        :item="block"
-        :widgets="widgets"
-        :openedBlocks="openedBlocks"
-        :depth="1"
-        @remove-item="removeBlock(key)"
-        @drag-start="dragStart"
-        @drag-end="dragEnd"
-      >
-        <template #action v-if="(key+1) !== value.length">
-          <BuilderBlockCreate
-            :container="value"
-            :widgets="widgets"
-            :openedBlocks="openedBlocks"
-            :allowedWidgets="allowedWidgets"
-            :position="key"
-          />
-        </template>
-      </BuilderBlockItem>
-      <div class="container">
-        <BuilderBlockCreate
-          :container="value"
-          :widgets="widgets"
-          :openedBlocks="openedBlocks"
-          :allowedWidgets="allowedWidgets"
-          position="bottom"
-        />
-        <div class="text-right">
-          <div>
-            <BuilderBlockCodeEditor
-              ref="dialog"
-              :value="value"
-              :widgets="widgets"
-              @update="codeUpdate"
-            />
-          </div>
-        </div>
-      </div>
-      <textarea :name="name" class="d-none">{{ toJson(value) }}</textarea>
-    </Draggable>
-  </div>
-</template>
-
-<script>
-import BuilderBlockItem from './BuilderBlockItem'
-import BuilderBlockCodeEditor from './BuilderBlockCodeEditor'
-import BuilderBlockCreate from './BuilderBlockCreate'
-import Routing from '../../../../../../../../../friendsofsymfony/jsrouting-bundle/Resources/public/js/router.min.js'
-import Draggable from 'vuedraggable'
-
-const axios = require('axios').default
-const routes = require('../../../../../../../../../../public/js/fos_js_routes.json')
-Routing.setRoutingData(routes)
-
-export default {
-  name: 'BuilderBlock',
-  components: {
-    BuilderBlockItem,
-    BuilderBlockCreate,
-    Draggable,
-    BuilderBlockCodeEditor,
-  },
-  props: {
-    id: {
-      type: String,
-      required: true,
-    },
-    name: {
-      type: String,
-      required: true,
-    },
-    initialValue: {
-      type: Array,
-      required: false,
-    },
-    allowedWidgets: {
-      type: Array,
-      required: false,
-      default: [],
-    }
-  },
-  data() {
-    return {
-      value: null,
-      nextValue: null,
-      widgets: {},
-      openedBlocks: {},
-      blockKey: 0,
-      showDragDrop: false,
-    }
-  },
-  methods: {
-    toJson(value) {
-      return JSON.stringify(value)
-    },
-    triggerBuilderBlockEvent() {
-      document.querySelector('body').dispatchEvent(new Event('builder_block.update'))
-    },
-    codeUpdate(nextValue) {
-      this.value = nextValue
-    },
-    removeBlock(key) {
-      let newValue = []
-
-      this.value.forEach((v, k) => {
-        if (k !== key) {
-          newValue.push(v)
-        }
-      })
-
-      this.value = newValue
-
-      ++this.blockKey
-    },
-    dragStart() {
-      this.showDragDrop = true
-    },
-    dragEnd() {
-      this.showDragDrop = false
-
-      ++this.blockKey
-    },
-    fixSettings(data) {
-      if (Array.isArray(data)) {
-        data.forEach((value, key) => {
-          data[key] = this.fixSettings(value)
-        })
-      } else {
-        const widget = this.widgets[data.widget]
-
-        if (!widget) {
-          return data
-        }
-
-        const nextSettings = {}
-
-        for (let setting in widget.settings) {
-          if (data.settings.hasOwnProperty(setting)) {
-            nextSettings[setting] = data.settings[setting]
-          } else {
-            nextSettings[setting] = widget.settings[setting].default
-          }
-        }
-
-        data.settings = nextSettings
-        data.children = this.fixSettings(data.children)
-      }
-
-      return data
-    },
-  },
-  mounted() {
-    const that = this
-
-    axios.get(Routing.generate('admin_editor_builder_block_widgets'))
-      .then((response) => {
-        that.widgets = response.data
-        that.value = that.fixSettings(that.initialValue)
-      })
-  },
-  created() {
-    this.triggerBuilderBlockEvent()
-  },
-  updated() {
-    this.triggerBuilderBlockEvent()
-  }
-}
-</script>
diff --git a/src/core/Resources/assets/js/components/builder-block/BuilderBlockCodeEditor.vue b/src/core/Resources/assets/js/components/builder-block/BuilderBlockCodeEditor.vue
deleted file mode 100644
index 4b6f586..0000000
--- a/src/core/Resources/assets/js/components/builder-block/BuilderBlockCodeEditor.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div>
-    <button
-      type="button"
-      class="btn btn-sm"
-      v-on:click="open"
-    >
-      <i class="fas fa-code"></i>
-    </button>
-    <dialog ref="dialog" class="modal-dialog modal-dialog-large builder-code-editor">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">Code editor</h5>
-          <button
-            type="button"
-            class="close"
-            v-on:click="close"
-          >
-            <span aria-hidden="true">×</span>
-          </button>
-        </div>
-        <div class="modal-body">
-          <div class="form-group">
-            <textarea
-              class="form-control"
-              rows="10"
-              ref="codeEditor"
-              v-model="nextValue"
-            >
-            </textarea>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button
-            type="button"
-            class="btn btn-secondary"
-            v-on:click="close"
-          >
-            Close
-          </button>
-          <button
-            type="button"
-            class="btn btn-primary"
-            v-on:click="checkAndSaveNextValue"
-          >
-            Save
-          </button>
-        </div>
-      </div>
-    </dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'BuilderBlockCodeEditor',
-  props: {
-    value: {
-      type: Array,
-      required: true,
-    },
-    widgets: {
-      type: Object,
-      required: true
-    },
-  },
-  data() {
-    return {
-      nextValue: null
-    }
-  },
-  methods: {
-    toJson(value) {
-      return JSON.stringify(value, null, 2)
-    },
-    open() {
-      this.nextValue = this.toJson(this.value)
-      this.$refs.dialog.showModal()
-    },
-    close() {
-      this.$refs.codeEditor.classList.toggle('is-invalid', false)
-      this.$refs.dialog.close()
-    },
-    isNextValueItemValueValid(item) {
-      const hasId = typeof item.id === 'string'
-      const hasWidget = typeof item.widget === 'string' && this.widgets[item.widget]
-      const hasSettings = typeof item.settings === 'object'
-      const hasChildren = Array.isArray(item.children)
-
-      if (!hasId || !hasWidget || !hasSettings || !hasChildren) {
-        return false
-      }
-
-      for (let child of item.children) {
-        if (!this.isNextValueItemValueValid(child)) {
-          return false
-        }
-      }
-
-      return true
-    },
-    updateNextValueRecursiveIds(data) {
-      if (Array.isArray(data)) {
-        data.forEach((value, key) => {
-          data[key] = this.updateNextValueRecursiveIds(value)
-        })
-      } else {
-        data.id = this.makeId()
-        data.children = this.updateNextValueRecursiveIds(data.children)
-      }
-
-      return data
-    },
-    checkAndSaveNextValue() {
-      this.$refs.codeEditor.classList.toggle('is-invalid', false)
-      let hasError = false
-
-      try {
-        let data = JSON.parse(this.nextValue)
-
-        if (!Array.isArray(data)) {
-          hasError = true
-        } else {
-          for (let item of data) {
-            if (!this.isNextValueItemValueValid(item)) {
-              hasError = true
-            }
-          }
-        }
-
-        if (!hasError) {
-          this.$emit('update', this.updateNextValueRecursiveIds(data))
-          this.close()
-        }
-
-      } catch (e) {
-        hasError = true
-      }
-
-      return this.$refs.codeEditor.classList.toggle('is-invalid', hasError)
-    },
-    makeId() {
-      let result = ''
-      const characters = 'abcdefghijklmnopqrstuvwxyz0123456789'
-      const charactersLength = characters.length
-
-      for (let i = 0; i < 7; i++) {
-        result += characters.charAt(Math.floor(Math.random() * charactersLength))
-      }
-
-      return `block-${result}`
-    },
-  },
-  components: {
-  },
-  mounted() {
-  },
-  created() {
-  },
-  updated() {
-  }
-}
-</script>
diff --git a/src/core/Resources/assets/js/components/builder-block/BuilderBlockCreate.vue b/src/core/Resources/assets/js/components/builder-block/BuilderBlockCreate.vue
deleted file mode 100644
index 5e035ea..0000000
--- a/src/core/Resources/assets/js/components/builder-block/BuilderBlockCreate.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<style scoped>
-.builder-block-picker {
-  padding: 8px;
-  border: 1px solid #333;
-  border-radius: 4px;
-  background: #fff;
-}
-
-.builder-block-picker-menu {
-  width: 150px;
-}
-
-.builder-block-picker-widgets {
-  width: calc(100% - 150px - 10px);
-  padding-left: 5px;
-}
-
-.nav-item {
-  cursor: pointer;
-  width: 100%;
-}
-
-.widget-icon {
-  margin-right: 3px;
-}
-
-.widget {
-  background: #fff;
-  padding: 10px;
-  border-radius: 4px;
-  cursor: pointer;
-  margin-right: 7px;
-  margin-bottom: 9px;
-  border: 1px solid #b4b4b4;
-  font-weight: bold;
-}
-
-.widget:hover {
-  background: #eee;
-  border: 1px solid #1e2430;
-}
-
-.search {
-  max-width: 300px;
-}
-</style>
-
-<template>
-  <div class="builder-add" :class="{'builder-add-top': position === 'top'}">
-    <div class="builder-add-button" v-on:click="togglePicker">
-        +
-    </div>
-
-    <div class="builder-block-picker mt-2 row" :class="{'d-none': !showPicker}">
-      <div class="col-auto builder-block-picker-menu">
-        <ul class="nav nav-pills pl-0">
-          <li
-            v-for="(category, key) in categories()"
-            v-if="Object.keys(category.widgets).length"
-            class="nav-item d-block"
-          >
-            <a
-              class="nav-link d-block mb-1"
-              :class="{'active': activeCategory == key}"
-              v-on:click="activeCategory = key"
-            >
-              {{ category.label }}
-            </a>
-          </li>
-        </ul>
-      </div>
-      <div
-        v-for="(category, key) in categories()"
-        v-if="Object.keys(category.widgets).length"
-        class="col-auto builder-block-picker-widgets"
-        :class="{'d-none': activeCategory !== key}"
-      >
-        <div class="row">
-          <div class="col-12 mb-4">
-            <input v-model="search" placeholder="Type to search..." class="form-control search">
-          </div>
-          <div
-            v-for="(widget, name) in category.widgets"
-            v-on:click="add(name, widget)"
-            v-if="matchSearch(widget.label) || matchSearch(name)"
-            class="widget col-auto"
-          >
-            <span class="widget-icon" v-if="widget.icon" v-html="widget.icon"></span>
-            {{ widget.label }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'BuilderBlockCreate',
-  props: {
-    container: {
-      type: Array,
-      required: true
-    },
-    widgets: {
-      type: Object,
-      required: true
-    },
-    allowedWidgets: {
-      type: Array,
-      required: true
-    },
-    openedBlocks: {
-      type: Object,
-      required: true
-    },
-    position: {
-      type: [String, Number],
-      required: true
-    },
-  },
-  data() {
-    return {
-      showPicker: false,
-      activeCategory: 'all',
-      search: '',
-    }
-  },
-  methods: {
-    add(name, widget) {
-      let settings = {}
-
-      for (let i in widget.settings) {
-        settings[i] = widget.settings[i].default
-      }
-
-      const block = {
-        id: this.makeId(),
-        widget: name,
-        settings,
-        children: [],
-      }
-
-
-      if (this.position === 'bottom') {
-        this.container.push(block)
-        this.$emit('updateContainer', this.container)
-      } else if (this.position === 'top') {
-        this.container.unshift(block)
-      } else {
-        this.container.splice(this.position+1, 0, block)
-      }
-
-      this.$emit('updateContainer', this.container)
-      this.openedBlocks[block.id] = true
-      this.togglePicker()
-    },
-    makeId() {
-      let result = ''
-      const characters = 'abcdefghijklmnopqrstuvwxyz0123456789'
-      const charactersLength = characters.length
-
-      for (let i = 0; i < 7; i++) {
-        result += characters.charAt(Math.floor(Math.random() * charactersLength))
-      }
-
-      return `block-${result}`
-    },
-    matchSearch(name) {
-      if (!this.search.trim().length) {
-        return true
-      }
-
-      return name.toLowerCase().includes(this.search.toLowerCase())
-    },
-    togglePicker() {
-      this.showPicker = !this.showPicker
-    },
-    categories() {
-      let items = {
-        all: {label: 'All', widgets: {}},
-      }
-
-      for (let widgetName in this.widgets) {
-        let value = this.widgets[widgetName]
-
-        if (!value.category) {
-          value.category = 'all'
-        }
-
-        if (typeof items[value.category] === 'undefined') {
-          items[value.category] = {
-            label: value.category,
-            widgets: {},
-          }
-        }
-
-        if (!this.allowedWidgets.length || this.allowedWidgets.includes(widgetName)) {
-          items[value.category].widgets[widgetName] = value
-          items['all'].widgets[widgetName] = value
-        }
-      }
-
-      return items
-    }
-  },
-}
-</script>
diff --git a/src/core/Resources/assets/js/components/builder-block/BuilderBlockItem.vue b/src/core/Resources/assets/js/components/builder-block/BuilderBlockItem.vue
deleted file mode 100644
index 854eaee..0000000
--- a/src/core/Resources/assets/js/components/builder-block/BuilderBlockItem.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <div>
-    <div
-      class="block"
-      :class="'block-depth-' + depth"
-      v-if="widget"
-      :key="blockKey"
-    >
-      <div class="block-header d-flex justify-content-between">
-        <div>
-          <div
-            class="block-header-item block-label"
-            :title="item.widget"
-          >
-            <span
-              class="block-icon"
-              v-if="widget.icon"
-              v-html="widget.icon"
-            >
-            </span>
-
-            {{ widget.label }}
-          </div>
-
-          <button
-            type="button"
-            class="block-header-item btn btn-sm btn-outline-secondary"
-            v-on:click="toggleSettings"
-            v-if="Object.keys(widget.settings).length"
-          >
-            <span class="fa fa-cog"></span>
-          </button>
-
-          <span class="fa fa-arrows-alt dragger"></span>
-        </div>
-
-        <div
-          v-if="widget.preview && typeof item.settings[widget.preview] == 'string'"
-          class="block-preview"
-        >
-          {{ truncate(item.settings[widget.preview]) }}
-        </div>
-
-        <div>
-          <span class="block-id">
-            {{ item.id }}
-          </span>
-          <button
-            type="button"
-            class="block-header-item btn btn-sm text-white bg-danger"
-            v-on:click="removeMe(item)"
-          >
-            <span class="fa fa-trash"></span>
-          </button>
-        </div>
-      </div>
-
-      <div class="block-settings" v-if="Object.keys(widget.settings).length" :class="{'d-none': !showSettings}">
-        <div class="row">
-          <BuilderBlockSetting
-            class="mb-0"
-            v-for="(params, setting) in widget.settings"
-            :key="item.id + '-' + setting"
-            :class="widget.class"
-            :item="item"
-            :params="params"
-            :setting="setting"
-          />
-        </div>
-      </div>
-
-      <div v-if="widget.isContainer" class="container">
-        <BuilderBlockCreate
-          :container="item.children"
-          :widgets="widgets"
-          :openedBlocks="openedBlocks"
-          :allowedWidgets="widget.widgets"
-          v-if="item.children.length > 0"
-          position="top"
-        />
-      </div>
-
-      <Draggable
-        v-if="widget.isContainer"
-        v-model="item.children"
-        ghost-class="ghost"
-        group="children"
-        @start="dragStart"
-        @end="dragEnd"
-        :animation="200"
-        handle=".dragger"
-        class="block-dropzone"
-      >
-        <template v-if="item.children !== null && item.children.length > 0">
-          <BuilderBlockItem
-            v-for="(child, key) in item.children"
-            :key="child.id"
-            :item="child"
-            :widgets="widgets"
-            :openedBlocks="openedBlocks"
-            :depth="depth + 1"
-            @remove-item="removeBlock(key)"
-            @drag-start="dragStart"
-            @drag-end="dragEnd"
-          >
-            <template #action v-if="(key+1) !== item.children.length">
-              <BuilderBlockCreate
-                :container="item.children"
-                :widgets="widgets"
-                :position="key"
-                :openedBlocks="openedBlocks"
-                :allowedWidgets="widget.widgets"
-              />
-            </template>
-          </BuilderBlockItem>
-        </template>
-      </Draggable>
-
-      <div v-if="widget.isContainer" class="container">
-        <BuilderBlockCreate
-          :container="item.children"
-          :widgets="widgets"
-          :openedBlocks="openedBlocks"
-          :allowedWidgets="widget.widgets"
-          position="bottom"
-        />
-        <div class="text-right">
-          <BuilderBlockCodeEditor
-            ref="dialog"
-            :value="item.children"
-            :widgets="widgets"
-            @update="codeUpdate"
-          />
-        </div>
-      </div>
-    </div>
-    <slot name="action"></slot>
-  </div>
-</template>
-
-<script>
-import BuilderBlockCreate from './BuilderBlockCreate'
-import BuilderBlockCodeEditor from './BuilderBlockCodeEditor'
-import BuilderBlockSetting from './BuilderBlockSetting'
-import Draggable from 'vuedraggable'
-
-export default {
-  name: 'BuilderBlockItem',
-  components: {
-    BuilderBlockCreate,
-    BuilderBlockSetting,
-    BuilderBlockCodeEditor,
-    Draggable,
-  },
-  props: {
-    widgets: {
-      type: Object,
-      required: true
-    },
-    item: {
-      type: Object,
-      required: true
-    },
-    openedBlocks: {
-      type: Object,
-      required: true
-    },
-    depth: {
-      type: Number,
-      required: true
-    },
-  },
-  data() {
-    return {
-      widget: null,
-      showSettings: this.openedBlocks[this.item.id] === true,
-      blockKey: 0,
-    }
-  },
-  methods: {
-    toggleSettings() {
-      this.openedBlocks[this.item.id] = !this.openedBlocks[this.item.id]
-      this.showSettings = !this.showSettings
-    },
-    truncate(value) {
-      return value.replace(/(<([^>]+)>)/ig, '').trim()
-    },
-    removeMe() {
-      this.$emit('remove-item')
-    },
-    codeUpdate(nextValue) {
-      this.item.children = nextValue
-    },
-    removeBlock(key) {
-      let children = []
-
-      this.item.children.forEach((v, k) => {
-        if (k !== key) {
-          children.push(v)
-        }
-      })
-
-      this.item.children = children
-      ++this.blockKey
-    },
-    dragStart() {
-      this.$emit('drag-start')
-    },
-    dragEnd() {
-      this.$emit('drag-end')
-      ++this.blockKey
-    },
-  },
-  mounted() {
-    this.widget = this.widgets[this.item.widget]
-  },
-  updated() {
-    document.querySelector('body').dispatchEvent(new Event('builder_block.update'))
-  }
-}
-</script>
diff --git a/src/core/Resources/assets/js/components/builder-block/BuilderBlockSetting.vue b/src/core/Resources/assets/js/components/builder-block/BuilderBlockSetting.vue
deleted file mode 100644
index 0090545..0000000
--- a/src/core/Resources/assets/js/components/builder-block/BuilderBlockSetting.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <label class="form-group mb-2">
-    <span v-if="params.label && params.type !== 'checkbox'" v-text="params.label"></span>
-
-    <input
-      v-if="['number', 'checkbox', 'text', 'color', 'range'].includes(params.type)"
-      v-model="item.settings[setting]"
-      v-bind="params.attr"
-      :type="params.type"
-      :class="{'form-control': params.type !== 'checkbox'}"
-    />
-
-    <span v-if="params.label && params.type == 'checkbox'" v-text="params.label"></span>
-
-    <textarea
-      v-if="params.type == 'textarea'"
-      v-model="item.settings[setting]"
-      v-bind="params.attr"
-      class="form-control"
-    ></textarea>
-
-    <select
-      v-if="params.type == 'select'"
-      v-model="item.settings[setting]"
-      v-bind="params.attr"
-      class="form-control"
-    >
-      <option :value="v.value" v-for="(v, k) in params.options" :key="k">
-        {{ v.text }}
-      </option>
-    </select>
-  </label>
-</template>
-
-<script>
-export default {
-  name: 'BuilderBlockSetting',
-  props: {
-    item: {
-      type: Object,
-      required: true,
-    },
-    params: {
-      type: Object,
-      required: true,
-    },
-    setting: {
-      type: String,
-      required: true,
-    }
-  },
-}
-</script>
-
-<style scoped>
-label > span {
-  margin-bottom: 3px;
-}
-</style>
diff --git a/src/core/Resources/assets/js/components/file-manager/FileIcon.vue b/src/core/Resources/assets/js/components/file-manager/FileIcon.vue
index c04c6c5..7854860 100644
--- a/src/core/Resources/assets/js/components/file-manager/FileIcon.vue
+++ b/src/core/Resources/assets/js/components/file-manager/FileIcon.vue
@@ -19,7 +19,7 @@ Routing.setRoutingData(routes)
 
 const map = {
   'fa fa-file-pdf': ['application/pdf'],
-  'fa fa-file-image': ['image/png', 'image/jpg', 'image/jpeg', 'image/gif', 'image/webp'],
+  'fa fa-file-image': ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'],
   'fa fa-file-audio': ['application/ogg', 'audio/mp3', 'audio/mpeg', 'audio/wav'],
   'fa fa-file-archive': ['application/zip', 'multipart/x-zip', 'application/rar', 'application/x-rar-compressed', 'application/x-zip-compressed', 'application/tar', 'application/x-tar'],
   'fa fa-file-alt': ['application/rtf'],
@@ -53,7 +53,7 @@ export default {
         return
       }
 
-      if (['image/png', 'image/jpg', 'image/jpeg', 'image/gif', 'image/webp'].indexOf(this.mime) === -1) {
+      if (['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].indexOf(this.mime) === -1) {
         this.thumbnail = null
         return
       }
diff --git a/src/core/Resources/assets/js/components/file-manager/Files.vue b/src/core/Resources/assets/js/components/file-manager/Files.vue
index d59fffb..79509b7 100644
--- a/src/core/Resources/assets/js/components/file-manager/Files.vue
+++ b/src/core/Resources/assets/js/components/file-manager/Files.vue
@@ -25,8 +25,7 @@
                 <div class="breadcrumb mb-0 file-manager-views">
                     <select v-model="sort" class="form-control form-control-sm d-inline w-auto ml-1">
                         <option value="name">Name</option>
-                        <option value="updated_at">Date</option>
-                        <option value="type">Type</option>
+                        <option value="modification_date">Date</option>
                     </select>
                     <select v-model="sortDirection" class="form-control form-control-sm d-inline w-auto ml-1">
                         <option value="asc">ASC</option>
@@ -107,7 +106,7 @@
                     <td width="10">
                         <span class="fa fa-folder text-warning"></span>
                     </td>
-                    <td colspan="2">
+                    <td>
                         ..
                     </td>
                 </tr>
@@ -116,7 +115,7 @@
                     <td width="10">
                         <span class="fa fa-folder text-warning"></span>
                     </td>
-                    <td colspan="2">
+                    <td>
                         <div v-if="item.locked" class="float-right">
                             <span class="btn btn-sm btn-light">
                                 <span class="fa fa-lock"></span>
@@ -139,12 +138,6 @@
 
                         <span v-html="item.basename"></span>
                     </td>
-                    <td class="text-right">
-                      <span class="d-none d-sm-block">
-                        <span class="btn btn-sm btn-light border-light mr-1 mb-1" v-text="readableFilesize(item.size)"></span>
-                        <span class="btn btn-sm btn-light border-light mr-1 mb-1" v-text="item.updated_at"></span>
-                      </span>
-                    </td>
                 </tr>
             </table>
         </div>
@@ -201,8 +194,8 @@ import Routing from '../../../../../../../../../friendsofsymfony/jsrouting-bundl
 import FileIcon from './FileIcon'
 
 const axios = require('axios').default
-const routes = require('../../../../../../../../../../public/js/fos_js_routes.json')
 const $ = require('jquery')
+const routes = require('../../../../../../../../../../public/js/fos_js_routes.json')
 
 Routing.setRoutingData(routes)
 
@@ -330,26 +323,6 @@ export default {
         .catch((e) => {
           alert('An error occured')
         })
-    },
-    readableFilesize (size) {
-      if (size <= 0) {
-          return '0 KB'
-      }
-
-      if (size === 1) {
-          return '1 byte'
-      }
-
-      const mod = 1024
-      const units = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB']
-      let i = 0
-
-      while (size > mod && i < units.length - 1) {
-          size /= mod
-          ++i
-      }
-
-      return `${size.toFixed(2)} ${units[i]}`
     }
   },
   mounted () {
@@ -385,7 +358,7 @@ export default {
 
     $(events).each((k, event) => {
       body.on(event + '.success', () => {
-        $('div[id^=modal-container-]').modal('hide')
+        $('div[id^=modal-container]').modal('hide')
         that.refresh()
       })
     })
@@ -393,10 +366,6 @@ export default {
     body.on('file_manager.info.update.success', () => {
       $('*[data-modal="' + that.modalUrl + '"]').click()
     })
-
-    body.on('file_manager.info.directory.request_open', () => {
-      $('*[data-modal="' + that.modalUrl + '"]').click()
-    })
   },
   watch: {
     directory (directory) {
diff --git a/src/core/Resources/assets/js/modules/batch.js b/src/core/Resources/assets/js/modules/batch.js
index 9e11c9f..2d5c1f2 100644
--- a/src/core/Resources/assets/js/modules/batch.js
+++ b/src/core/Resources/assets/js/modules/batch.js
@@ -8,28 +8,16 @@ module.exports = () => {
   const form = $('#form-batch')
 
   form.submit((e) => {
-    const select = document.querySelector('#form-batch-action')
-    const options = select.querySelectorAll('#form-batch-action option')
-    let doPrevent = true
+    e.preventDefault()
 
-    options.forEach((option) => {
-      if (option.value === select.value && option.getAttribute('data-isglobal') === 'true') {
-        doPrevent = false
-      }
-    })
+    const route = form.attr('action')
+    const datas = form.serialize()
 
-    if (doPrevent) {
-      e.preventDefault()
+    form.addClass('is-loading')
 
-      const route = form.attr('action')
-      const datas = form.serialize()
-
-      form.addClass('is-loading')
-
-      $.post(route, datas)
-        .always(() => {
-          document.location.reload()
-        })
-    }
+    $.post(route, datas)
+      .always(() => {
+        document.location.reload()
+      })
   })
 }
diff --git a/src/core/Resources/assets/js/modules/builder-block.js b/src/core/Resources/assets/js/modules/builder-block.js
deleted file mode 100644
index 1e70e89..0000000
--- a/src/core/Resources/assets/js/modules/builder-block.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const Vue = require('vue').default
-
-const BuilderBlock = require('../components/builder-block/BuilderBlock').default
-
-module.exports = () => {
-  const wrappers = document.querySelectorAll('.builder-widget')
-
-  wrappers.forEach((wrapper) => {
-    const component = wrapper.querySelector('.builder-widget-component')
-
-    return new Vue({
-      el: component,
-      template: `<BuilderBlock
-        :initialValue="value"
-        :allowedWidgets="allowedWidgets"
-        name="${component.getAttribute('data-name')}"
-        id="${component.getAttribute('data-id')}"
-      />`,
-      data() {
-        return {
-          value: JSON.parse(component.getAttribute('data-value')),
-          allowedWidgets: JSON.parse(component.getAttribute('data-allowedwidgets')),
-        }
-      },
-      components: {
-        BuilderBlock
-      }
-    })
-  })
-}
diff --git a/src/core/Resources/assets/js/modules/choices.js b/src/core/Resources/assets/js/modules/choices.js
index 4e86b16..d2da709 100644
--- a/src/core/Resources/assets/js/modules/choices.js
+++ b/src/core/Resources/assets/js/modules/choices.js
@@ -1,10 +1,8 @@
 const Choices = require('choices.js')
+const $ = require('jquery')
 
-module.exports = () => {
-  document.querySelectorAll('*[data-jschoice]').forEach((item) => {
-    return new Choices(item, {
-      searchFields: ['label'],
-      removeItemButton: true,
-    })
+module.exports = function () {
+  $('*[data-jschoice]').each(function (key, item) {
+    return new Choices(item)
   })
 }
diff --git a/src/core/Resources/assets/js/modules/file-picker.js b/src/core/Resources/assets/js/modules/file-picker.js
index 549f817..d537a23 100644
--- a/src/core/Resources/assets/js/modules/file-picker.js
+++ b/src/core/Resources/assets/js/modules/file-picker.js
@@ -36,9 +36,8 @@ const fileManagerBrowser = function (callback) {
 
   const clickCallback = (e) => {
     callback($(e.target).attr('data-value'), {})
-    $('#fm-modal').next('.modal-backdrop').remove()
-    $('#fm-modal').next('div[id^="modal-container-"]').modal('hide')
-    $('#fm-modal').modal('hide')
+    $('div[id^="modal-container-"]').modal('hide')
+    container.modal('hide')
 
     $('body').off('click', '#file-manager-insert', clickCallback)
   }
diff --git a/src/core/Resources/assets/js/modules/modal.js b/src/core/Resources/assets/js/modules/modal.js
index 4caa06b..29bf260 100644
--- a/src/core/Resources/assets/js/modules/modal.js
+++ b/src/core/Resources/assets/js/modules/modal.js
@@ -1,14 +1,12 @@
 const $ = require('jquery')
 
-const openModal = function (url, createModal, dataAttributes) {
+const openModal = function (url, createModal) {
   if (createModal) {
     var id = 'modal-container-' + parseInt(Math.floor(Math.random() * 1000))
   } else {
     var id = 'modal-container'
   }
 
-  dataAttributes = dataAttributes ?? []
-
   let container = $(`#${id}`)
   const body = $('body')
   const doTrigger = true
@@ -17,10 +15,6 @@ const openModal = function (url, createModal, dataAttributes) {
     const doTrigger = false
     container = $(`<div id="${id}" class="modal">`)
 
-    dataAttributes.forEach((attribute) => {
-      container.attr(attribute.name, attribute.value)
-    })
-
     body.append(container)
   }
 
@@ -93,18 +87,8 @@ module.exports = function () {
       const element = $(e.target).is('[data-modal]') ? $(e.target) : $(e.target).parents('*[data-modal]').first()
       const url = element.attr('data-modal')
       const createModal = element.is('[data-modal-create]')
-      const attributes = element[0].attributes
-      const dataAttributes = []
 
-      for (let i = 0, len = attributes.length; i < len; i++) {
-        let item = attributes.item(i)
-
-        if (item.name.startsWith('data-') && !['data-modal', 'data-modal-create'].includes(item.name)) {
-          dataAttributes.push(item)
-        }
-      }
-
-      openModal(url, createModal, dataAttributes)
+      openModal(url, createModal)
     }, 250)
   })
 
diff --git a/src/core/Resources/assets/js/modules/sidebar.js b/src/core/Resources/assets/js/modules/sidebar.js
index 466380e..a93e210 100644
--- a/src/core/Resources/assets/js/modules/sidebar.js
+++ b/src/core/Resources/assets/js/modules/sidebar.js
@@ -1,34 +1,9 @@
 const $ = require('jquery')
 
-const Sidebar = () => {
-  const menu = document.querySelector('.sidebar')
-
-  if (!menu) {
-    return
-  }
-
-  const stickyMenu = menu.querySelector('.sidebar-sticky')
-  const items = stickyMenu.querySelectorAll('a.nav-link')
-  const currentItem = menu.querySelector('.nav-link.active')
-
-  items.forEach((item) => {
-    item.addEventListener('click', () => {
-      localStorage.setItem('sidebar-item-top', stickyMenu.scrollTop)
-    })
+const SidebarOpener = () => {
+  $('.sidebar-toggler .btn').click(() => {
+    $('.sidebar').toggleClass('is-open')
   })
-
-  const toggler = menu.querySelector('.sidebar-toggler .btn')
-
-  toggler.addEventListener('click', () => {
-    menu.classList.toggle('is-open')
-  })
-
-  if (currentItem) {
-    stickyMenu.scrollTo({
-      top: Math.min(currentItem.offsetTop, localStorage.getItem('sidebar-item-top') ?? 0),
-      behavior: 'smooth'
-    })
-  }
 }
 
-module.exports = Sidebar
+module.exports = SidebarOpener
diff --git a/src/core/Resources/assets/js/modules/tinymce.js b/src/core/Resources/assets/js/modules/tinymce.js
index 1f6ab2c..2eb9bca 100644
--- a/src/core/Resources/assets/js/modules/tinymce.js
+++ b/src/core/Resources/assets/js/modules/tinymce.js
@@ -36,7 +36,7 @@ const fileManagerBrowser = function (callback) {
 
   const clickCallback = (e) => {
     callback($(e.target).attr('data-value'), {})
-    $('div[id^="modal-container-"]').modal('hide')
+    $('div[id^="modal-container"]').modal('hide')
     container.modal('hide')
 
     $('body').off('click', '#file-manager-insert', clickCallback)
@@ -53,7 +53,7 @@ const fileManagerBrowser = function (callback) {
   })
 }
 
-const createTinymceConfig = function () {
+if (typeof window.tinymce !== 'undefined') {
   window.tinymce.murph = window.tinymce.murph || {}
   window.tinymce.murph.selector = window.tinymce.murph.selector || '*[data-tinymce]'
   window.tinymce.murph.configurationBase = window.tinymce.murph.configurationBase || {
@@ -74,15 +74,12 @@ const createTinymceConfig = function () {
       })
 
       editor.on('Change', () => {
-        editor.save();
-        editor.getElement().dispatchEvent(new Event('input'));
         window.tinymce.triggerSave(false, true)
       })
     }
   }
 
   window.tinymce.murph.modes = window.tinymce.murph.modes || {}
-  window.tinymceModes = window.tinymceModes || {}
 
   window.tinymce.murph.modes.default = window.tinymce.murph.modes.default || {
     plugins: 'print preview importcss searchreplace visualblocks visualchars fullscreen template table charmap hr pagebreak nonbreaking toc insertdatetime advlist lists wordcount textpattern noneditable help charmap quickbars link image code autoresize',
@@ -98,11 +95,6 @@ const createTinymceConfig = function () {
     toolbar: 'undo redo | bold italic underline'
   }
 
-  window.tinymce.murph.modes = {
-    ...window.tinymce.murph.modes,
-    ...window.tinymceModes
-  }
-
   tinymce.addI18n('fr_FR', {
     Redo: 'R\u00e9tablir',
     Undo: 'Annuler',
@@ -620,27 +612,15 @@ const doInitEditor = () => {
 }
 
 module.exports = function () {
-  document.querySelector('body').addEventListener('builder_block.update', () => {
-    window.setTimeout(() => {
-      createTinymceConfig()
-      doInitEditor()
-    }, 500)
-  })
+  if (typeof tinymce === 'undefined') {
+    return
+  }
+
+  const observer = new MutationObserver(doInitEditor)
+  const config = { attributes: false, childList: true, subtree: true }
+  observer.observe(document.querySelector('body'), config)
 
   $(() => {
-    createTinymceConfig()
     doInitEditor()
-
-    const observer = new MutationObserver(doInitEditor)
-    const config = { attributes: false, childList: true, subtree: true }
-    observer.observe(document.querySelector('body'), config)
-
-    $('body').on('hidden.bs.modal', '.modal', (e) => {
-      if (!$('.tox-dialog').length) {
-        $(e.target).find('.tox-tinymce').each(() => {
-          window.tinymce.remove($(this).prev().attr('id'))
-        })
-      }
-    })
   })
 }
diff --git a/src/core/Resources/maker/builder/Block.tpl.php b/src/core/Resources/maker/builder/Block.tpl.php
deleted file mode 100644
index e1d5afd..0000000
--- a/src/core/Resources/maker/builder/Block.tpl.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php echo "<?php\n"; ?>
-
-namespace <?php echo $namespace; ?>;
-
-use App\Core\BuilderBlock\BuilderBlock;
-use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
-
-#[AutoconfigureTag('builder_block.widget')]
-class <?php echo $class_name; ?> extends BuilderBlock
-{
-    public function configure()
-    {
-        $this
-            ->setName('<?php echo $class_name; ?>')
-            ->setCategory('Custom')
-            ->setTemplate('<?php echo $template; ?>')
-            ->setLabel('<?php echo $label; ?>')
-            // ->setOrder(1)
-            // ->setIsContainer(false)
-            // ->setIcon('<i class="fas fa-pencil-alt"></i>')
-            // ->setClass('col-md-12')
-            // ->addSetting(name: 'value1', label: 'Text', type: 'text', attributes: [], default: '')
-            // ->addSetting(name: 'value2', label: 'Checkbox', type: 'checkbox', attributes: [], default: true)
-            // ->addSetting(name: 'value2', label: 'Number', type: 'checkbox', attributes: [], default: true)
-            // ->addSetting(name: 'value3', label: 'Textarea', type: 'textarea', attributes: [], default: '')
-            // ->addSetting(name: 'value4', label: 'Choice', type: 'select', attributes: [], default: '', extraOptions: [
-            //     'options' => [
-            //         ['text' => 'Choice 1', 'value' => 'choice1'],
-            //         ['text' => 'Choice 2', 'value' => 'choice2'],
-            //     ],
-            // ])
-        ;
-    }
-
-    public function buildVars(array $data, array $context)
-    {
-    }
-}
diff --git a/src/core/Resources/maker/controller/CrudController.tpl.php b/src/core/Resources/maker/controller/CrudController.tpl.php
index e2bf660..2c8d2b1 100644
--- a/src/core/Resources/maker/controller/CrudController.tpl.php
+++ b/src/core/Resources/maker/controller/CrudController.tpl.php
@@ -1,79 +1,68 @@
-<?php echo "<?php\n"; ?>
+<?= "<?php\n" ?>
 
-namespace <?php echo $namespace; ?>;
+namespace <?= $namespace; ?>;
 
 use App\Core\Controller\Admin\Crud\CrudController;
 use App\Core\Crud\CrudConfiguration;
 use App\Core\Crud\Field;
 use App\Core\Entity\EntityInterface;
 use App\Core\Manager\EntityManager;
-use <?php echo $entity; ?> as Entity;
-use <?php echo $factory; ?> as Factory;
-use <?php echo $form; ?> as Type;
-use <?php echo $repository_query; ?> as RepositoryQuery;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
+use <?= $entity ?> as Entity;
+use <?= $factory ?> as Factory;
+use <?= $form ?> as Type;
+use <?= $repository_query ?> as RepositoryQuery;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
 
-class <?php echo $class_name; ?> extends CrudController
+class <?= $class_name; ?> extends CrudController
 {
-    protected ?CrudConfiguration $configuration = null;
+#[Route(path: '/admin/user/edit/{entity}', name: 'admin_user_edit', methods: ['GET', 'POST'])]
 
-    #[Route(path: '/admin/<?php echo $route; ?>/{page}', name: 'admin_<?php echo $route; ?>_index', methods: ['GET'], requirements: ['page' => '\d+'])]
+    #[Route(path: "/admin/<?= $route; ?>/{page}", name: "admin_<?= $route; ?>_index", methods: ['GET'], requirements: ['page' => '\d+'])]
     public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response
     {
         return $this->doIndex($page, $query, $request, $session);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/new', name: 'admin_<?php echo $route; ?>_new', methods: ['GET', 'POST'])]
+    #[Route(path: "/admin/<?= $route; ?>/new", name: "admin_<?= $route; ?>_new", methods: ['GET', 'POST'])]
     public function new(Factory $factory, EntityManager $entityManager, Request $request): Response
     {
         return $this->doNew($factory->create(), $entityManager, $request);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/show/{entity}', name: 'admin_<?php echo $route; ?>_show', methods: ['GET'])]
-    #[IsGranted('show', 'entity')]
+    #[Route(path: "/admin/<?= $route; ?>/show/{entity}", name: "admin_<?= $route; ?>_show", methods: ['GET'])]
     public function show(Entity $entity): Response
     {
         return $this->doShow($entity);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/filter', name: 'admin_<?php echo $route; ?>_filter', methods: ['GET'])]
+    #[Route(path: "/admin/<?= $route; ?>/filter", name: "admin_<?= $route; ?>_filter", methods: ['GET'])]
     public function filter(Session $session): Response
     {
         return $this->doFilter($session);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/edit/{entity}', name: 'admin_<?php echo $route; ?>_edit', methods: ['GET', 'POST'])]
-    #[IsGranted('edit', 'entity')]
+    #[Route(path: "/admin/<?= $route; ?>/edit/{entity}", name: "admin_<?= $route; ?>_edit", methods: ['GET', 'POST'])]
     public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doEdit($entity, $entityManager, $request);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/inline_edit/{entity}/{context}/{label}', name: 'admin_<?php echo $route; ?>_inline_edit', methods: ['GET', 'POST'])]
-    #[IsGranted('edit', 'entity')]
-    public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response
-    {
-        return $this->doInlineEdit($context, $label, $entity, $entityManager, $request);
-    }
-
-    #[Route(path: '/admin/<?php echo $route; ?>/sort/{page}', name: 'admin_<?php echo $route; ?>_sort', methods: ['POST'], requirements: ['page' => '\d+'])]
+    #[Route(path: "/admin/<?= $route; ?>/sort/{page}", name: "admin_<?= $route; ?>_sort", methods: ['POST'], requirements: ['page' => '\d+'])]
     public function sort(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
     {
         return $this->doSort($page, $query, $entityManager, $request, $session);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/batch/{page}', name: 'admin_<?php echo $route; ?>_batch', methods: ['POST'], requirements: ['page' => '\d+'])]
+    #[Route(path: "/admin/<?= $route; ?>/batch/{page}", name: "admin_<?= $route; ?>_batch", methods: ['POST'], requirements: ['page' => '\d+'])]
     public function batch(RepositoryQuery $query, EntityManager $entityManager, Request $request, Session $session, int $page = 1): Response
     {
         return $this->doBatch($page, $query, $entityManager, $request, $session);
     }
 
-    #[Route(path: '/admin/<?php echo $route; ?>/delete/{entity}', name: 'admin_<?php echo $route; ?>_delete', methods: ['DELETE', 'POST'])]
-    #[IsGranted('delete', 'entity')]
+    #[Route(path: "/admin/<?= $route; ?>/delete/{entity}", name: "admin_<?= $route; ?>_delete", methods: ['DELETE'])]
     public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doDelete($entity, $entityManager, $request);
@@ -81,32 +70,23 @@ class <?php echo $class_name; ?> extends CrudController
 
     protected function getConfiguration(): CrudConfiguration
     {
-        if ($this->configuration) {
-            return $this->configuration;
-        }
-
-        return $this->configuration = CrudConfiguration::create()
-            ->setPageTitle('index', 'List of <?php echo $entity; ?>')
+        return CrudConfiguration::create()
+            ->setPageTitle('index', 'List of <?= $entity; ?>')
             ->setPageTitle('edit', 'Edition of {id}')
-            ->setPageTitle('new', 'New <?php echo $entity; ?>')
+            ->setPageTitle('new', 'New <?= $entity; ?>')
             ->setPageTitle('show', 'View of {id}')
 
-            ->setPageRoute('index', 'admin_<?php echo $route; ?>_index')
-            ->setPageRoute('new', 'admin_<?php echo $route; ?>_new')
-            ->setPageRoute('edit', 'admin_<?php echo $route; ?>_edit')
-            ->setPageRoute('inline_edit', 'admin_<?php echo $route; ?>_inline_edit')
-            ->setPageRoute('show', 'admin_<?php echo $route; ?>_show')
-            ->setPageRoute('sort', 'admin_<?php echo $route; ?>_sort')
-            ->setPageRoute('batch', 'admin_<?php echo $route; ?>_batch')
-            ->setPageRoute('delete', 'admin_<?php echo $route; ?>_delete')
-            ->setPageRoute('filter', 'admin_<?php echo $route; ?>_filter')
+            ->setPageRoute('index', 'admin_<?= $route; ?>_index')
+            ->setPageRoute('new', 'admin_<?= $route; ?>_new')
+            ->setPageRoute('edit', 'admin_<?= $route; ?>_edit')
+            ->setPageRoute('show', 'admin_<?= $route; ?>_show')
+            ->setPageRoute('sort', 'admin_<?= $route; ?>_sort')
+            ->setPageRoute('batch', 'admin_<?= $route; ?>_batch')
+            ->setPageRoute('delete', 'admin_<?= $route; ?>_delete')
+            ->setPageRoute('filter', 'admin_<?= $route; ?>_filter')
 
-            ->setForm('edit', Type::class)
+            ->setForm('edit', Type::class, [])
             ->setForm('new', Type::class)
-
-            ->setView('form', 'admin/<?php echo $route; ?>_admin/_form.html.twig')
-            ->setView('show_entity', 'admin/<?php echo $route; ?>_admin/_show.html.twig')
-
             // ->setForm('filter', Type::class)
 
             // ->setMaxPerPage('index', 20)
@@ -118,7 +98,6 @@ class <?php echo $class_name; ?> extends CrudController
             // ->setAction('index', 'show', true)
             // ->setAction('index', 'edit', true)
             // ->setAction('index', 'delete', true)
-            // ->setDoubleClick('index', false)
 
             // ->setAction('edit', 'back', true)
             // ->setAction('edit', 'show', true)
@@ -149,6 +128,6 @@ class <?php echo $class_name; ?> extends CrudController
 
     protected function getSection(): string
     {
-        return '<?php echo $route; ?>';
+        return '<?= $route; ?>';
     }
 }
diff --git a/src/core/Resources/maker/factory/Factory.tpl.php b/src/core/Resources/maker/factory/Factory.tpl.php
index c0f9e0c..3545fbd 100644
--- a/src/core/Resources/maker/factory/Factory.tpl.php
+++ b/src/core/Resources/maker/factory/Factory.tpl.php
@@ -1,11 +1,11 @@
-<?php echo "<?php\n"; ?>
+<?= "<?php\n" ?>
 
-namespace <?php echo $namespace; ?>;
+namespace <?= $namespace; ?>;
 
 use App\Core\Factory\FactoryInterface;
-use <?php echo $entity; ?> as Entity;
+use <?= $entity ?> as Entity;
 
-class <?php echo $class_name; ?> implements FactoryInterface
+class <?= $class_name; ?> implements FactoryInterface
 {
     public function create(): Entity
     {
diff --git a/src/core/Resources/maker/page/PageEntity.tpl.php b/src/core/Resources/maker/page/PageEntity.tpl.php
index 3073890..dbc3d61 100644
--- a/src/core/Resources/maker/page/PageEntity.tpl.php
+++ b/src/core/Resources/maker/page/PageEntity.tpl.php
@@ -1,6 +1,6 @@
-<?php echo "<?php\n"; ?>
+<?= "<?php\n" ?>
 
-namespace <?php echo $namespace; ?>;
+namespace <?= $namespace; ?>;
 
 use App\Core\Entity\Site\Page\Page;
 use App\Core\Entity\Site\Page as BlockEntity;
@@ -9,28 +9,28 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
 
 #[ORM\Entity]
-class <?php echo $class_name; ?> extends Page
+class <?= $class_name; ?> extends Page
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-<?php if (count($blocks)) { ?>        $builder
-<?php foreach ($blocks as $block) { ?>
-            ->add('<?php echo $block['name']; ?>', <?php echo $block['type']; ?>)
-<?php } ?>
+<?php if (count($blocks)): ?>        $builder
+<?php foreach ($blocks as $block): ?>
+            ->add('<?= $block['name'] ?>', <?= $block['type'] ?>)
+<?php endforeach; ?>
         ;
-<?php } ?>
+<?php endif; ?>
     }
 
-<?php foreach ($blocks as $block) { ?>
-    public function set<?php echo $block['camelCase']; ?>(BlockEntity\Block $block)
+<?php foreach ($blocks as $block): ?>
+    public function set<?= $block['camelCase'] ?>(BlockEntity\Block $block)
     {
         return $this->setBlock($block);
     }
 
-    public function get<?php echo $block['camelCase']; ?>()
+    public function get<?= $block['camelCase'] ?>()
     {
-        return $this->getBlock('<?php echo $block['name']; ?>'<?php if ($block['class']) { ?>, <?php echo $block['class']; ?><?php } ?>);
+        return $this->getBlock('<?= $block['name'] ?>'<?php if ($block['class']): ?>, <?= $block['class'] ?><?php endif; ?>);
     }
 
-<?php } ?>
+<?php endforeach; ?>
 }
diff --git a/src/core/Resources/maker/repository/RepositoryQuery.tpl.php b/src/core/Resources/maker/repository/RepositoryQuery.tpl.php
index e8f0174..bec52b1 100644
--- a/src/core/Resources/maker/repository/RepositoryQuery.tpl.php
+++ b/src/core/Resources/maker/repository/RepositoryQuery.tpl.php
@@ -1,15 +1,15 @@
-<?php echo "<?php\n"; ?>
+<?= "<?php\n" ?>
 
-namespace <?php echo $namespace; ?>;
+namespace <?= $namespace; ?>;
 
 use App\Core\Repository\RepositoryQuery;
 use Knp\Component\Pager\PaginatorInterface;
-use <?php echo $repository; ?> as Repository;
+use <?= $repository; ?> as Repository;
 
-class <?php echo $class_name; ?> extends RepositoryQuery
+class <?= $class_name; ?> extends RepositoryQuery
 {
     public function __construct(Repository $repository, PaginatorInterface $paginator)
     {
-        parent::__construct($repository, '<?php echo $id; ?>', $paginator);
+        parent::__construct($repository, '<?= $id; ?>', $paginator);
     }
 }
diff --git a/src/core/Resources/translations/messages.fr.yaml b/src/core/Resources/translations/messages.fr.yaml
index 1586a32..5d4700b 100644
--- a/src/core/Resources/translations/messages.fr.yaml
+++ b/src/core/Resources/translations/messages.fr.yaml
@@ -64,7 +64,7 @@
 "Display name": "Nom d'affichage"
 "Administrator": "Administrateur⋅trice"
 "Writer": "Rédacteur⋅trice"
-"Reference": "Référence"
+"Reference": "Élement de référence"
 "My account": "Mon compte"
 "Logout": "Déconnexion"
 "Dashboard": "Tableau de bord"
@@ -144,7 +144,7 @@
 "Username or e-mail": "Identifiant ou e-mail"
 "Submit": "Soumettre"
 "If the information submitted corresponds to a user account, you will receive an e-mail with the link to initiate the password change procedure.": "Si les informations soumises correspondent à un compte utilisateur, vous allez recevoir un e-mail avec en lien pour enclancher la procédure de changement de mot de passe."
-"Enter your account username or email address. An e-mail will be sent to you to initiate the password change procedure.": "Saisissez le nom d'utilisateur ou l'adresse e-mail de votre compte. Un e-mail vous sera envoyé pour enclancher la procédure de changement de mot de passe."
+"Enter your account username or email address. An e-mail will be sent to you to initiate the password change procedure. ": "Saisissez le nom d'utilisateur ou l'adresse e-mail de votre compte. Un e-mail vous sera envoyé pour enclancher la procédure de changement de mot de passe."
 "Show the login page": "Afficher la page de connexion"
 "A password reset request has been made. If you are the source of this request, click on the link below or copy and paste the address if the link does not work.": "Une demande de réinitialisation de mot de passe a été réalisée. Si vous êtes à l'origine de cette demande, cliquer sur le lien ci-dessous ou copier et coller l'adresse si le lien ne fonctionne pas."
 "Edit the routing": "Éditez le routage"
@@ -163,7 +163,7 @@
 "Filter": "Filtrer"
 "Force this domain": "Forcer ce nom de domaine"
 "Additional domains": "Domaines additionnels"
-"Regular expression: do not add the delimiter": "Expression régulière : ne pas ajouter de délimiteur"
+"Regular expression: do not add the delimiter": "Expréssion régulière : ne pas ajouter de délimiteur"
 "Content type": "Type de contenu"
 'Leave blank equals "text/html"': 'Laissez vide équivaut à "text/html"'
 "Close": "Fermer"
@@ -223,15 +223,3 @@
 "At least one role": "Au moins un rôle"
 "All roles": "Tous les rôles"
 "Enable A/B Testing": "Activer le test A/B"
-"Color": "Couleur"
-"Extra small": "Très petit"
-"Small": "Petit"
-"Medium": "Moyen"
-"Large": "Large"
-"Extra large": "Très large"
-"Level": "Niveau"
-"Insert line breaks": "Ajouter les retours chariot"
-'Allow HTML': "Autoriser l'HTML"
-"Custom class": "Classe personnalisée"
-"Editors": "Éditeurs"
-"All": "Tous"
diff --git a/src/core/Resources/views/account/admin/edit.html.twig b/src/core/Resources/views/account/admin/edit.html.twig
index 2de0219..90d03c4 100644
--- a/src/core/Resources/views/account/admin/edit.html.twig
+++ b/src/core/Resources/views/account/admin/edit.html.twig
@@ -2,7 +2,7 @@
 
 {% import _self as macros %}
 
-{% block title %}{{ 'My account'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ 'My account'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
@@ -12,7 +12,7 @@
     </div>
 
     <div class="row">
-        <div class="col-12 col-md-6">
+        <div class="col-6">
             <form action="{{ path('admin_account_password') }}" method="post">
                 <div class="tab-content">
                     <div class="tab-pane active">
@@ -102,7 +102,7 @@
             </form>
         </div>
 
-        <div class="col-12 col-md-6">
+        <div class="col-6">
             <form action="{{ path('admin_account_2fa') }}" method="post">
                 <div class="tab-content">
                     <div class="tab-pane active">
diff --git a/src/core/Resources/views/admin/crud/_form.html.twig b/src/core/Resources/views/admin/crud/_form.html.twig
index 2b79aa6..993246f 100644
--- a/src/core/Resources/views/admin/crud/_form.html.twig
+++ b/src/core/Resources/views/admin/crud/_form.html.twig
@@ -9,3 +9,4 @@
         {% endfor %}
     </div>
 </div>
+
diff --git a/src/core/Resources/views/admin/crud/_show.html.twig b/src/core/Resources/views/admin/crud/_show.html.twig
index e2a63ce..1c73877 100644
--- a/src/core/Resources/views/admin/crud/_show.html.twig
+++ b/src/core/Resources/views/admin/crud/_show.html.twig
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-md-12 p-3">
-        {% for item in entity_to_array(entity, false, ['id']) %}
+        {% for item in entity_to_array(entity) %}
             <div class="font-weight-bold">{{ item.name|trans }}</div>
             <div class="mb-3">{{ item.value }}</div>
         {% endfor %}
diff --git a/src/core/Resources/views/admin/crud/edit.html.twig b/src/core/Resources/views/admin/crud/edit.html.twig
index 72372a8..027b699 100644
--- a/src/core/Resources/views/admin/crud/edit.html.twig
+++ b/src/core/Resources/views/admin/crud/edit.html.twig
@@ -4,7 +4,7 @@
 
 {% block body_class %}has-form{% endblock %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/crud/field/boolean.html.twig b/src/core/Resources/views/admin/crud/field/boolean.html.twig
deleted file mode 100644
index 2bd8644..0000000
--- a/src/core/Resources/views/admin/crud/field/boolean.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{%- block value -%}
-    {% set value = value|default(options.default_value) %}
-    <span class="field-boolean">
-        {% if options.display == 'checkbox' %}
-            {% block checkbox %}
-                <span class="fa {{ value ? options.checkbox_class_when_true : options.checkbox_class_when_false }}"></span>
-            {% endblock %}
-        {% elseif options.display == 'toggle' %}
-            {% block toggle %}
-                {% if value %}
-                    <span class="rounded-pill pl-3 pr-1 text-white {{ options.toggle_class_when_true }}">
-                        <span class="fa fa-circle"></span>
-                    </span>
-                {% else %}
-                    <span class="rounded-pill pr-3 pl-1 text-white {{ options.toggle_class_when_false }}">
-                        <span class="fa fa-circle"></span>
-                    </span>
-                {% endif %}
-            {% endblock %}
-        {% endif %}
-    </span>
-{%- endblock -%}
diff --git a/src/core/Resources/views/admin/crud/field/date.html.twig b/src/core/Resources/views/admin/crud/field/date.html.twig
index 480ae04..f336616 100644
--- a/src/core/Resources/views/admin/crud/field/date.html.twig
+++ b/src/core/Resources/views/admin/crud/field/date.html.twig
@@ -2,7 +2,7 @@
     {%- if value -%}
         <span class="btn btn-sm btn-light">
             <span class="fa fa-calendar-alt text-black-50 mr-2"></span>
-            {{- value|default(options.default_value)|date(options.format) -}}
+            {{- value|date(options.format) -}}
         </span>
     {%- endif -%}
 {%- endblock -%}
diff --git a/src/core/Resources/views/admin/crud/field/image.html.twig b/src/core/Resources/views/admin/crud/field/image.html.twig
index c838734..82b8e38 100644
--- a/src/core/Resources/views/admin/crud/field/image.html.twig
+++ b/src/core/Resources/views/admin/crud/field/image.html.twig
@@ -1,7 +1,3 @@
 {%- block value -%}
-    {% set value = value|default(options.default_value) %}
-
-    {% if value %}
-        <img {% for k, v in options.image_attr %}{{ k }}="{{ v }}" {% endfor %} src="{{ asset(value) }}">
-    {% endif %}
+    <img {% for k, v in options.image_attr %}{{ k }}="{{ v }}" {% endfor %} src="{{ asset(value) }}">
 {%- endblock -%}
diff --git a/src/core/Resources/views/admin/crud/field/text.html.twig b/src/core/Resources/views/admin/crud/field/text.html.twig
index 1268a59..93377e2 100644
--- a/src/core/Resources/views/admin/crud/field/text.html.twig
+++ b/src/core/Resources/views/admin/crud/field/text.html.twig
@@ -1,7 +1,7 @@
 {%- block value -%}
     {%- if options.raw -%}
-        {{- value|default(options.default_value)|raw -}}
+        {{- value|raw -}}
     {%- else -%}
-        {{- value|default(options.default_value)|trans -}}
+        {{- value|trans -}}
     {%- endif -%}
 {%- endblock -%}
diff --git a/src/core/Resources/views/admin/crud/index.html.twig b/src/core/Resources/views/admin/crud/index.html.twig
index ae40134..352adcd 100644
--- a/src/core/Resources/views/admin/crud/index.html.twig
+++ b/src/core/Resources/views/admin/crud/index.html.twig
@@ -1,9 +1,8 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
 {% set context = context ?? 'index' %}
-{% set pager_render = pager is defined ? knp_pagination_render(pager) : null %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     {% block header %}
@@ -68,17 +67,16 @@
                     <div class="row crud-header-filter">
                         <div class="col-auto ml-auto {% if pager.getPaginationData.pageCount > 1 %}mr-3{% endif %}">
                             <button data-modal="{{ path(configuration.pageRoute('filter'), configuration.pageRouteParams('filter')) }}" class="btn btn-sm btn-secondary">
-                                <span class="fa fa-search mr-1"></span>
                                 {{ 'Filter'|trans }} {% if not filters.isEmpty %}({{ 'yes'|trans }}){% endif %}
                             </button>
                         </div>
                         <div class="col-auto">
-                            {{ pager_render|raw }}
+                            {{ knp_pagination_render(pager) }}
                         </div>
                     </div>
                 {% else %}
                     <div class="crud-header-filter">
-                        {{ pager_render|raw }}
+                        {{ knp_pagination_render(pager) }}
                     </div>
                 {% endif %}
             {% endblock %}
@@ -87,7 +85,6 @@
 
     {% block list %}
         {% set isSortable = configuration.isSortableCollection(context) %}
-        {% set colspan = configuration.fields(context)|length + 1 + (configuration.hasBatchAction(context) ? 1 : 0) %}
 
         <div class="table-responsive">
             <table class="table">
@@ -132,13 +129,10 @@
 
                                                 <a href="{{ url }}">
                                                     {% if icon is defined %}
-                                                        <span class="no-wrap">
-                                                            <span class="{{ icon }}"></span>
-                                                            {{ label|trans }}
-                                                        </span>
-                                                    {% else %}
-                                                        {{ label|trans }}
+                                                        <span class="{{ icon }}"></span>
                                                     {% endif %}
+
+                                                    {{ label|trans }}
                                                 </a>
                                             {% else %}
                                                 {{ label|trans }}
@@ -149,8 +143,8 @@
                                     </th>
                                 {% endblock %}
                             {% endfor %}
-                            {% if configuration.showActions(context) %}
-                                <th class="crud-action-column">
+                            {% if configuration.showActions %}
+                                <th class="crud-action-column col-2 miw-100 text-right">
                                     {{ 'Actions'|trans }}
                                 </th>
                             {% endif %}
@@ -183,49 +177,33 @@
                             {% endif %}
 
                             {% block list_item %}
-                                {%- set dbClick -%}
-                                    {%- if configuration.doubleClick(context) -%}
-                                        {%- if configuration.action(context, 'show', true, [item]) -%}
-                                            {{- path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) -}}
-                                        {%- elseif configuration.action(context, 'edit', true, [item]) -%}
-                                            {{- path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) -}}
-                                        {%- endif -%}
-                                    {%- endif -%}
-                                {%- endset -%}
+                                {%- set dbClick %}
+                                    {% if configuration.action(context, 'show', true, [item]) %}
+                                        {{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}
+                                    {% elseif configuration.action(context, 'edit', true, [item]) %}
+                                        {{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}
+                                    {% endif %}
+                                {% endset -%}
 
-                                {% set rowAttributes = configuration.listRowAttributes(context, item) %}
-                                {% set rowClasses = rowAttributes['class']|default('') %}
-
-                                <tr {{ dataSortableItem|raw }} {% if configuration.doubleClick(context) %}data-dblclick="{{- dbClick -}}"{% endif %} class="{{ loop.index is odd ? 'is-odd' : 'is-even' }} {{ rowClasses }}" {% for attr, attrValue in rowAttributes %}{% if attr != 'class' %}{{ attr }}="{{ attrValue }}" {% endif %}{% endfor %}>
+                                <tr {{ dataSortableItem|raw }} data-dblclick="{{ dbClick }}" class="{{ loop.index is odd ? 'is-odd' : 'is-even' }}">
                                     {% if configuration.hasBatchAction(context) %}
                                         <td class="crud-batch-column">
                                             <input type="checkbox" class="batch_form" name="batch[items][{{ loop.index }}]" form="form-batch" value="{{ loop.index }}">
                                         </td>
                                     {% endif %}
 
-                                    {% for label, config in configuration.fields(context) %}
-                                        {% set attr = config.options.attr ?? [] %}
-                                        {% set action = config.options.action ?? null %}
-                                        {% set inlineForm = config.options.inline_form ?? null %}
+                                    {% for config in configuration.fields(context) %}
+                                        {% set attr = config.options.attr is defined ? config.options.attr : [] %}
+                                        {% set action = config.options.action is defined ? config.options.action : null %}
 
                                         <td {% for key, value in attr %}{{ key }}="{{ value }}"{% endfor %}>
-                                            {% if inlineForm and configuration.action(context, 'edit', true, [item]) %}
-                                                <a href="#" data-modal="{{ path(
-                                                    configuration.pageroute('inline_edit'), {
-                                                        entity: item.id,
-                                                        context: context,
-                                                        label: label,
-                                                        redirectTo: app.request.pathInfo,
-                                                    }|merge(configuration.pagerouteparams('inline_edit'))) }}" data-modal-create>
-                                                    {{ render_field(item, config, configuration.defaultlocale) }}
-                                                </a>
-                                            {% elseif action == 'show' and configuration.action(context, 'show', true, [item]) %}
-                                                <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}">
+                                            {% if action == 'show' %}
+                                                <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}) }}">
                                                     {{ render_field(item, config, configuration.defaultLocale) }}
                                                 </a>
-                                            {% elseif action == 'edit' and configuration.action(context, 'edit', true, [item]) %}
-                                                <a href="{{ path(configuration.pageroute('edit'), {entity: item.id}|merge(configuration.pagerouteparams('edit'))) }}">
-                                                    {{ render_field(item, config, configuration.defaultlocale) }}
+                                            {% elseif action == 'edit' %}
+                                                <a href="{{ path(configuration.pageRoute('edit'), {entity: item.id}) }}">
+                                                    {{ render_field(item, config, configuration.defaultLocale) }}
                                                 </a>
                                             {% else %}
                                                 {{ render_field(item, config, configuration.defaultLocale) }}
@@ -233,42 +211,34 @@
                                         </td>
                                     {% endfor %}
 
-                                    {% if configuration.showActions(context) %}
-                                        <td class="crud-action-column">
-                                            {% block list_item_actions %}
-                                                {% block list_item_actions_before %}{% endblock %}
+                                    {% if configuration.showActions %}
+                                        <td class="crud-action-column col-2 miw-200 text-right">
+                                            {% block list_item_actions_before %}{% endblock %}
 
-                                                {% block list_item_action_show %}
-                                                    {% if configuration.action(context, 'show', true, [item]) %}
-                                                        <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}" class="btn btn-sm btn-secondary mr-1">
-                                                            <span class="fa fa-eye"></span>
-                                                        </a>
-                                                    {% endif %}
-                                                {% endblock %}
+                                            {% if configuration.action(context, 'show', true, [item]) %}
+                                                <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}" class="btn btn-sm btn-secondary mr-1">
+                                                    <span class="fa fa-eye"></span>
+                                                </a>
+                                            {% endif %}
 
-                                                {% block list_item_action_edit %}
-                                                    {% if configuration.action(context, 'edit', true, [item]) %}
-                                                        <a href="{{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('edit'))) }}" class="btn btn-sm btn-primary mr-1">
-                                                            <span class="fa fa-edit"></span>
-                                                        </a>
-                                                    {% endif %}
-                                                {% endblock %}
+                                            {% if configuration.action(context, 'edit', true, [item]) %}
+                                                <a href="{{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('edit'))) }}" class="btn btn-sm btn-primary mr-1">
+                                                    <span class="fa fa-edit"></span>
+                                                </a>
+                                            {% endif %}
 
-                                                {% block list_item_action_delete %}
-                                                    {% if configuration.action(context, 'delete', true, [item]) %}
-                                                        <button type="submit" form="form-delete-{{ item.id }}" class="btn btn-sm btn-danger">
-                                                            <span class="fa fa-trash"></span>
-                                                        </button>
+                                            {% if configuration.action(context, 'delete', true, [item]) %}
+                                                <button type="submit" form="form-delete-{{ item.id }}" class="btn btn-sm btn-danger">
+                                                    <span class="fa fa-trash"></span>
+                                                </button>
 
-                                                        <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: item.id}|merge(configuration.pageRouteParams('delete'))) }}" id="form-delete-{{ item.id }}" data-form-confirm>
-                                                            <input type="hidden" name="_method" value="DELETE">
-                                                            <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ item.id) }}">
-                                                        </form>
-                                                    {% endif %}
-                                                {% endblock %}
+                                                <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: item.id}|merge(configuration.pageRouteParams('delete'))) }}" id="form-delete-{{ item.id }}" data-form-confirm>
+                                                    <input type="hidden" name="_method" value="DELETE">
+                                                    <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ item.id) }}">
+                                                </form>
+                                            {% endif %}
 
-                                                {% block list_item_actions_after %}{% endblock %}
-                                            {% endblock %}
+                                            {% block list_item_actions_after %}{% endblock %}
                                         </td>
                                     {% endif %}
                                 </tr>
@@ -292,24 +262,17 @@
                                                 </div>
                                             {% endif %}
 
-                                            <div class="float-right mr-2">
-                                                {{ pager_render|raw }}
-                                            </div>
-
                                             {% if configuration.hasBatchAction(context) %}
                                                 <div class="mb-2">
-                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {
-                                                        page: pager.currentPageNumber,
-                                                        redirectTo: app.request.uri
-                                                    }|merge(configuration.pageRouteParams('batch'))) }}" id="form-batch" method="POST">
+                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {page: pager.currentPageNumber}|merge(configuration.pageRouteParams('batch'))) }}" id="form-batch" method="POST">
                                                         <select class="form-control my-1 mr-sm-2" name="batch[target]">
                                                             <option value="selection">{{ 'For selection'|trans }}</option>
                                                             <option value="all">{{ 'For all items'|trans }}</option>
                                                         </select>
-                                                        <select class="form-control my-1 mr-sm-2" id="form-batch-action" name="batch[action]">
+                                                        <select class="form-control my-1 mr-sm-2" name="batch[action]">
                                                             <option value=""></option>
                                                             {% for action, conf in configuration.batchActions(context) %}
-                                                                <option value="{{ action }}" {% if conf.isGlobal %}data-isglobal="true"{% endif %}>
+                                                                <option value="{{ action }}">
                                                                     {{ conf.label|trans }}
                                                                 </option>
                                                             {% endfor %}
@@ -330,8 +293,13 @@
                                 {% endblock %}
                             {% endif %}
                         {% else %}
+                            {% set count = configuration.fields(context)|length + 1 %}
+                            {% if configuration.hasBatchAction(context) %}
+                                {% set count = count + 1 %}
+                            {% endif %}
+
                             <tr>
-                                <td class="col-12 text-center p-4 text-black-50" colspan="{{ colspan }}">
+                                <td class="col-12 text-center p-4 text-black-50" colspan="{{ count }}">
                                     <div class="display-1">
                                         <span class="fa fa-search"></span>
                                     </div>
diff --git a/src/core/Resources/views/admin/crud/inline_edit.html.twig b/src/core/Resources/views/admin/crud/inline_edit.html.twig
deleted file mode 100644
index 1c2e218..0000000
--- a/src/core/Resources/views/admin/crud/inline_edit.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="modal-dialog">
-    <div class="modal-content">
-        <div class="modal-header">
-            <h5 class="modal-title">{{ label|trans }}</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <form action="{{ path(configuration.pageRoute('inline_edit'), {entity: entity.id, context: context, label: label, redirectTo: redirectTo}|merge(configuration.pageRouteParams('inline_edit'))) }}" id="form-entity-edit" method="POST">
-                {{ include('@Core/setting/setting_admin/_form.html.twig') }}
-            </form>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Cancel'|trans }}</button>
-            <button type="submit" form="form-entity-edit" class="btn btn-primary">{{ 'Save'|trans }}</button>
-        </div>
-    </div>
-</div>
-
diff --git a/src/core/Resources/views/admin/crud/new.html.twig b/src/core/Resources/views/admin/crud/new.html.twig
index 1936986..f3b8cfe 100644
--- a/src/core/Resources/views/admin/crud/new.html.twig
+++ b/src/core/Resources/views/admin/crud/new.html.twig
@@ -4,7 +4,7 @@
 
 {% block body_class %}has-form{% endblock %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     {% block header %}
diff --git a/src/core/Resources/views/admin/crud/show.html.twig b/src/core/Resources/views/admin/crud/show.html.twig
index d98dd22..365653e 100644
--- a/src/core/Resources/views/admin/crud/show.html.twig
+++ b/src/core/Resources/views/admin/crud/show.html.twig
@@ -2,7 +2,7 @@
 
 {% set context = context ?? 'show' %}
 
-{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ configuration.pageTitle(context)|trans|build_string(entity) }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     {% block header %}
@@ -18,7 +18,7 @@
                             {% block header_actions_before %}{% endblock %}
 
                             {% if configuration.action(context, 'back', true) %}
-                                <a href="{{ path(configuration.pageRoute('index'), configuration.pageRouteParams('index')) }}" class="btn btn-light">
+                                <a href="{{ path(configuration.pageRoute('index')) }}" class="btn btn-light">
                                     <span class="fa fa-list pr-1"></span>
                                     <span class="d-none d-md-inline">
                                         {{ configuration.actionTitle(context, 'back', 'Back to the list')|trans }}
@@ -27,7 +27,7 @@
                             {% endif %}
 
                             {% if configuration.action(context, 'edit', true, [entity]) %}
-                                <a href="{{ path(configuration.pageRoute('edit'), {entity: entity.id}|merge(configuration.pageRouteParams('edit'))) }}" class="btn btn-primary">
+                                <a href="{{ path(configuration.pageRoute('edit'), {entity: entity.id}) }}" class="btn btn-primary">
                                     <span class="fa fa-edit pr-1"></span>
 
                                     <span class="d-none d-md-inline">
diff --git a/src/core/Resources/views/admin/layout.html.twig b/src/core/Resources/views/admin/layout.html.twig
index fd97838..ffd170c 100644
--- a/src/core/Resources/views/admin/layout.html.twig
+++ b/src/core/Resources/views/admin/layout.html.twig
@@ -1,5 +1,4 @@
 {% apply spaceless %}
-{% block html %}
 <!DOCTYPE html>
 <html>
     <head>
@@ -16,9 +15,7 @@
 
         <nav class="navbar fixed-top navbar-expand-md navbar-light bg-light border-bottom">
             <a class="navbar-brand" href="{{ path('admin_dashboard_index') }}">
-                {% if site_logo %}
-                    <img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
-                {% endif %}
+                <img id="logo" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
 
                 <span class="ml-2 d-none d-md-inline">{{ site_name }}</span>
             </a>
@@ -63,5 +60,4 @@
         {% endblock %}
     </body>
 </html>
-{% endblock %}
 {% endapply %}
diff --git a/src/core/Resources/views/admin/module/_menu_item.html.twig b/src/core/Resources/views/admin/module/_menu_item.html.twig
index 7a14375..b8ca1f7 100644
--- a/src/core/Resources/views/admin/module/_menu_item.html.twig
+++ b/src/core/Resources/views/admin/module/_menu_item.html.twig
@@ -1,28 +1,15 @@
-{% set is_disabled = is_disabled|default(false) %}
-{% set disabled_class = is_disabled ? 'text-muted' : '' %}
-
-{% set icon %}
-    <span class="{{ icon }} {{ disabled_class }}"></span>
-{% endset %}
-
-{% set label %}
-    <span class="nav-item-label {{ disabled_class }}">
-        {{- label|trans -}}
-    </span>
-{% endset %}
-
 {% block item %}
-    {% if is_disabled|default(false) %}
-        <li class="nav-item">
-            <span class="nav-link {% if id == section %}active{% endif %}">
-                {{- (icon ~ label)|raw -}}
-            </span>
-        </li>
-    {% else %}
-        <li class="nav-item">
-            <a class="nav-link {% if id == section %}active{% endif %}" href="{{ route }}">
-                {{- (icon ~ label)|raw -}}
-            </a>
-        </li>
-    {% endif %}
+    <li class="nav-item">
+        <a class="nav-link {% if id == section %}active{% endif %}" href="{{ route }}">
+            {%- block icon -%}
+                <span class="{{ icon }}"></span>
+            {%- endblock -%}
+
+            {%- block label -%}
+                <span class="nav-item-label">
+                    {{- label|trans -}}
+                </span>
+            {%- endblock -%}
+        </a>
+    </li>
 {% endblock %}
diff --git a/src/core/Resources/views/admin/module/metas.html.twig b/src/core/Resources/views/admin/module/metas.html.twig
index dfa4845..bcbdcf3 100644
--- a/src/core/Resources/views/admin/module/metas.html.twig
+++ b/src/core/Resources/views/admin/module/metas.html.twig
@@ -1,6 +1,4 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{% if site_logo is defined %}
-    <link rel="shortcut icon" href="{{ asset(site_logo) }}">
-    <link rel="icon" href="{{ asset(site_logo) }}">
-{% endif %}
+<link rel="shortcut icon" href="{{ asset(site_logo) }}">
+<link rel="icon" href="{{ asset(site_logo) }}">
diff --git a/src/core/Resources/views/auth/login.html.twig b/src/core/Resources/views/auth/login.html.twig
index 8745092..e4895a1 100644
--- a/src/core/Resources/views/auth/login.html.twig
+++ b/src/core/Resources/views/auth/login.html.twig
@@ -13,7 +13,7 @@
     <body>
         <div class="container login-container">
             <div class="row shadow rounded">
-                <div class="col-md-{{ site_logo ? '6' : '12' }}">
+                <div class="col-md-6">
                     <div class="login-form">
                         <div class="h3 pb-4">
                             <span class="text-success">
@@ -77,13 +77,11 @@
                         </form>
                     </div>
                 </div>
-                {% if site_logo %}
-                    <div class="col-md-6 bg-light d-flex">
-                        <div class="flex-fill align-self-center text-center p-3">
-                            <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
-                        </div>
+                <div class="col-md-6 bg-light d-flex">
+                    <div class="flex-fill align-self-center text-center p-3">
+                        <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
                     </div>
-                {% endif %}
+                </div>
             </div>
         </div>
 
diff --git a/src/core/Resources/views/auth/resetting_request.html.twig b/src/core/Resources/views/auth/resetting_request.html.twig
index fe97b76..6dbcf39 100644
--- a/src/core/Resources/views/auth/resetting_request.html.twig
+++ b/src/core/Resources/views/auth/resetting_request.html.twig
@@ -13,7 +13,7 @@
     <body>
         <div class="container login-container">
             <div class="row shadow rounded">
-                <div class="col-md-{{ site_logo ? '6' : '12' }}">
+                <div class="col-md-6">
                     <div class="login-form">
                         <div class="h3 pb-4">
                             <span class="text-success">
@@ -58,13 +58,11 @@
                         {% endif %}
                     </div>
                 </div>
-                {% if site_logo %}
-                    <div class="col-md-6 bg-light d-flex">
-                        <div class="flex-fill align-self-center text-center p-3">
-                            <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
-                        </div>
+                <div class="col-md-6 bg-light d-flex">
+                    <div class="flex-fill align-self-center text-center p-3">
+                        <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
                     </div>
-                {% endif %}
+                </div>
             </div>
         </div>
 
diff --git a/src/core/Resources/views/auth/resetting_update.html.twig b/src/core/Resources/views/auth/resetting_update.html.twig
index c46afe1..9ecf5fd 100644
--- a/src/core/Resources/views/auth/resetting_update.html.twig
+++ b/src/core/Resources/views/auth/resetting_update.html.twig
@@ -13,7 +13,7 @@
     <body>
         <div class="container login-container">
             <div class="row shadow rounded">
-                <div class="col-md-{{ site_logo ? '6' : '12' }}">
+                <div class="col-md-6">
                     <div class="login-form">
                         <div class="h3 pb-4">
                             <span class="text-success">
@@ -95,13 +95,11 @@
                         {% endif %}
                     </div>
                 </div>
-                {% if site_logo %}
-                    <div class="col-md-6 bg-light d-flex">
-                        <div class="flex-fill align-self-center text-center p-3">
-                            <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
-                        </div>
+                <div class="col-md-6 bg-light d-flex">
+                    <div class="flex-fill align-self-center text-center p-3">
+                        <img class="login-image" src="{{ asset(site_logo) }}" alt="{{ site_name }}" title="{{ site_name }}">
                     </div>
-                {% endif %}
+                </div>
             </div>
         </div>
 
diff --git a/src/core/Resources/views/builder_block/bootstrap/alert.html.twig b/src/core/Resources/views/builder_block/bootstrap/alert.html.twig
deleted file mode 100644
index bad8bab..0000000
--- a/src/core/Resources/views/builder_block/bootstrap/alert.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="alert {% if settings.level|default(null) %}alert-{{ settings.level }}{% endif %}" id="{{ id }}">
-    {% for item in children %}
-        {{ item|block_to_html(context) }}
-    {% endfor %}
-</div>
diff --git a/src/core/Resources/views/builder_block/bootstrap/column.html.twig b/src/core/Resources/views/builder_block/bootstrap/column.html.twig
deleted file mode 100644
index 8c3cdf9..0000000
--- a/src/core/Resources/views/builder_block/bootstrap/column.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% set sizes = {
-    'col-': settings.size|default(null),
-    'col-xs-': settings.sizeXs|default(null),
-    'col-md-': settings.sizeMd|default(null),
-    'col-lg-': settings.sizeLg|default(null),
-    'col-xl-': settings.sizeXl|default(null),
-} %}
-
-<div class="col {% for i, v in sizes%}{% if v|length %}{{ i }}{{ v }} {% endif %}{% endfor -%} {{ settings.customClass|default(null) }}" id="{{ id }}">
-    {% for item in children %}
-        {{ item|block_to_html(context) }}
-    {% endfor %}
-</div>
diff --git a/src/core/Resources/views/builder_block/bootstrap/container.html.twig b/src/core/Resources/views/builder_block/bootstrap/container.html.twig
deleted file mode 100644
index aacd7d1..0000000
--- a/src/core/Resources/views/builder_block/bootstrap/container.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="container{% if settings.isFluid|default(false) %}-fluid{% endif %}  {{ settings.customClass|default(null) }}" id="{{ id }}">
-    {% for item in children %}
-        {{ item|block_to_html(context) }}
-    {% endfor %}
-</div>
diff --git a/src/core/Resources/views/builder_block/bootstrap/row.html.twig b/src/core/Resources/views/builder_block/bootstrap/row.html.twig
deleted file mode 100644
index 45e54e7..0000000
--- a/src/core/Resources/views/builder_block/bootstrap/row.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row  {{ settings.customClass|default(null) }}" id="{{ id }}">
-    {% for item in children %}
-        {{ item|block_to_html(context) }}
-    {% endfor %}
-</div>
diff --git a/src/core/Resources/views/builder_block/editor/textarea.html.twig b/src/core/Resources/views/builder_block/editor/textarea.html.twig
deleted file mode 100644
index 0e6b482..0000000
--- a/src/core/Resources/views/builder_block/editor/textarea.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{%- if settings.nl2br|default(null) -%}
-    {% if settings.allowHtml|default(null) %}
-        {{- settings.value|default(null)|raw|nl2br -}}
-    {%- else -%}
-        {{- settings.value|default(null)|nl2br -}}
-    {%- endif -%}
-{%- else -%}
-    {% if settings.allowHtml|default(null) %}
-        {{- settings.value|default(null)|raw -}}
-    {%- else -%}
-        {{- settings.value|default(null) -}}
-    {%- endif -%}
-{% endif %}
diff --git a/src/core/Resources/views/builder_block/editor/tinymce.html.twig b/src/core/Resources/views/builder_block/editor/tinymce.html.twig
deleted file mode 100644
index 23fa2e1..0000000
--- a/src/core/Resources/views/builder_block/editor/tinymce.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{{ settings.value|default(null)|file_attributes|murph_url|raw }}
diff --git a/src/core/Resources/views/file_manager/info.html.twig b/src/core/Resources/views/file_manager/info.html.twig
index 1ad23cd..eefadfe 100644
--- a/src/core/Resources/views/file_manager/info.html.twig
+++ b/src/core/Resources/views/file_manager/info.html.twig
@@ -26,7 +26,7 @@
                     </li>
                 {% endif %}
 
-                {% if splInfo.extension|lower in ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'] %}
+                {% if splInfo.extension|lower in ['jpeg', 'jpg', 'gif', 'png', 'svg'] %}
                     <li class="nav-item" role="presentation">
                         <a class="nav-link {% if tab == 'preview' %}active{% endif %}" data-toggle="tab" href="#tab-fm-preview">
                             {{ 'Preview'|trans }}
@@ -117,7 +117,7 @@
                     </div>
                 {% endif %}
 
-                {% if splInfo.extension|lower in ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'] %}
+                {% if splInfo.extension|lower in ['jpeg', 'jpg', 'gif', 'png', 'svg'] %}
                     <div class="tab-pane {% if tab == 'preview' %}show active{% endif %}" id="tab-fm-preview">
                         <div class="card">
                             <div class="card-img-top bg-tiles text-center">
@@ -160,48 +160,37 @@
 
                 </div>
             {% else %}
-                <div class="d-block d-flex">
-                    <div>
+                <div>
+                    {% if not isLocked %}
+                        <button type="submit" form="form-fm-delete" class="btn btn-sm btn-danger">
+                            {{ 'Delete'|trans }}
+                        </button>
+
                         {% if splInfo.isDir %}
-                            <a class="btn btn-sm bg-warning" href="{{ path('admin_file_manager_index', {path: splInfo.relativePathname}) }}">
-                                {{ 'Open'|trans }}
-                            </a>
-                        {% endif %}
-
-                        {% if splInfo.type == 'file' %}
-                            <a class="btn btn-sm btn-success" href="{{ asset(path) }}" target="_blank">
-                                {{ 'Download'|trans }}
-                            </a>
-                        {% endif %}
-
-                        {% if not isLocked %}
-                            <button type="submit" form="form-fm-delete" class="btn btn-sm btn-danger">
-                                {{ 'Delete'|trans }}
+                            <button form="form-file-delete" class="btn btn-sm btn-primary" data-modal="{{ path('admin_file_manager_directory_rename', {file: splInfo.relativePathname}) }}">
+                                {{ 'Rename'|trans }}
                             </button>
-
-                            {% if splInfo.isDir %}
-                                <button form="form-file-delete" class="btn btn-sm btn-primary" data-modal="{{ path('admin_file_manager_directory_rename', {file: splInfo.relativePathname}) }}">
-                                    {{ 'Rename'|trans }}
-                                </button>
-                            {% else %}
-                                <button form="form-file-delete" class="btn btn-sm btn-primary" data-modal="{{ path('admin_file_manager_file_rename', {file: splInfo.relativePathname}) }}">
-                                    {{ 'Rename'|trans }}
-                                </button>
-                            {% endif %}
                         {% else %}
-                            <span class="btn btn-light">
-                                <span class="fa fa-lock"></span>
-                            </span>
+                            <button form="form-file-delete" class="btn btn-sm btn-primary" data-modal="{{ path('admin_file_manager_file_rename', {file: splInfo.relativePathname}) }}">
+                                {{ 'Rename'|trans }}
+                            </button>
                         {% endif %}
-                    </div>
+                    {% else %}
+                        <span class="btn btn-light">
+                            <span class="fa fa-lock"></span>
+                        </span>
+                    {% endif %}
+
+                    {% if splInfo.type == 'file' %}
+                        <a class="btn btn-sm btn-success" href="{{ asset(path) }}" target="_blank">
+                            {{ 'Download'|trans }}
+                        </a>
+                    {% endif %}
                 </div>
 
                 <div>
-                    {% if splInfo.isFile and not isLocked %}
-                        <button type="submit" class="btn btn-primary" form="form-fm-attributes">{{ 'Save'|trans }}</button>
-                    {% endif %}
-
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Close'|trans }}</button>
+                    <button type="submit" class="btn btn-primary" form="form-fm-attributes">{{ 'Save'|trans }}</button>
                 </div>
             {% endif %}
         </div>
diff --git a/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig b/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
index 735bad5..976ba6d 100644
--- a/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
+++ b/src/core/Resources/views/form/bootstrap_4_form_theme.html.twig
@@ -1,20 +1,5 @@
 {% extends 'bootstrap_4_layout.html.twig' %}
 
-{% block builder_widget %}
-    {% set row_attr = row_attr|merge({class: 'builder-widget ' ~ (row_attr.class ?? '')}) %}
-    {% set value = value is iterable ? value|json_encode : value %}
-    {% set allowed_widgets = allowed_widgets is iterable ? allowed_widgets|json_encode : allowed_widgets %}
-
-    {% if value == '' %}
-        {% set value = '[]' %}
-    {% endif %}
-
-    <div {% for attr, value in row_attr %}{{ attr }}="{{ value }}" {% endfor %}>
-        <div class="builder-widget-component" data-value="{{ value }}" data-name="{{ full_name }}" data-id="{{ id }}" data-allowedwidgets="{{ allowed_widgets }}">
-        </div>
-    </div>
-{% endblock %}
-
 {% block grapesjs_widget %}
     <div class="gjs"></div>
     <div class="d-none">
@@ -22,19 +7,10 @@
     </div>
 {% endblock %}
 
-{% block color_widget %}
-    <div class="form-color-container">
-        <div class="form-color">
-            {%- set type = type|default('color') -%}
-            {{ block('form_widget_simple') }}
-        </div>
-    </div>
-{% endblock %}
-
 {% block file_widget -%}
     <div class="row">
         <div class="col-12">
-            {% set data = form.vars.data %}
+            {% set value = form.vars.data %}
 
             {% if form.parent.vars.file_type is defined %}
                 {% set fileType = form.parent.vars.file_type %}
@@ -42,33 +18,31 @@
                 {% set fileType = 'auto' %}
             {% endif %}
 
-            {% if data and form.vars.errors|length == 0 %}
-                {% if not data is iterable %}
-                    {% set data = [data] %}
-                {% endif %}
+            {% if value %}
+                {% if fileType in ['auto', 'image'] and value.extension in ['jpeg', 'jpg', 'gif', 'png', 'svg'] %}
+                    <div class="card">
+                        <div class="card-img-top bg-tiles text-center">
+                            <a href="{{ asset(value.pathname) }}" target="_blank">
+                                <img src="{{ asset(value.pathname) }}" class="img-fluid">
+                            </a>
+                        </div>
+                        <div class="card-body">
+                            {{- parent() -}}
+                        </div>
+                    </div>
+                {% else %}
+                    <div class="card">
+                        <div class="card-body">
+                            {{- parent() -}}
 
-                <div class="card">
-                    {% for item in data %}
-                        {% if fileType in ['auto', 'image'] and item.extension in ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'] %}
-                            <div class="card-img-top bg-tiles text-center">
-                                <a href="{{ asset(item.pathname) }}" target="_blank">
-                                    <img src="{{ asset(item.pathname) }}" class="img-fluid">
+                            <div class="p-2 text-center">
+                                <a class="btn btn-primary" href="{{ asset(value.pathname) }}" target="_blank">
+                                    {{ 'Download'|trans }}
                                 </a>
                             </div>
-                        {% else %}
-                            <div class="card-body">
-                                <div class="p-2 text-center">
-                                    <a class="btn btn-primary" href="{{ asset(item.pathname) }}" target="_blank">
-                                        {{ 'Download'|trans }}
-                                    </a>
-                                </div>
-                            </div>
-                        {% endif %}
-                    {% endfor %}
-                    <div class="card-body">
-                        {{- parent() -}}
+                        </div>
                     </div>
-                </div>
+                {% endif %}
             {% else %}
                 {{- parent() -}}
             {% endif %}
@@ -77,11 +51,6 @@
 {% endblock %}
 
 {% block collection_block_widget %}
-    {% set allow_delete = allow_delete|default(false) %}
-    {% set allow_add = allow_add|default(false) %}
-    {% set add_attr = add_attr|default({}) %}
-    {% set delete_attr = delete_attr|default({}) %}
-
     <div data-collection="collection-{{ collection_name }}">
         {% for item in form.value %}
             <div data-collection-item="{{ loop.index }}">
@@ -89,102 +58,78 @@
                     {{ form_row(child) }}
                 {% endfor %}
 
-                {% if allow_delete %}
-                    <div {% for k, v in delete_attr %}{{ k }}="{{ v }}"{% endfor %}>
-                        <span data-collection-delete-container class="btn btn-sm btn-danger">
-                            <span data-collection-delete="{{ loop.index }}">
-                                <span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
-                                {{ label_delete|trans }}
-                            </span>
+                <div class="text-right">
+                    <span data-collection-delete-container class="btn btn-sm btn-danger">
+                        <span data-collection-delete="{{ loop.index }}">
+                            <span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
+                            {{ label_delete|trans }}
                         </span>
-                    </div>
-                {% endif %}
+                    </span>
+                </div>
             </div>
         {% endfor %}
     </div>
 
-    {% if allow_add %}
-        <div data-collection-add="collection-{{ collection_name }}" {% for k, v in add_attr %}{{ k }}="{{ v }}"{% endfor %}>
-            <span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
-                <span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
-                {{ label_add|trans }}
-            </span>
-        </div>
+    <div data-collection-add="collection-{{ collection_name }}" class="collection-add">
+        <span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
+            <span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
+            {{ label_add|trans }}
+        </span>
+    </div>
 
-        <template type="text/template" id="collection-{{ collection_name }}">
-            <div data-collection-item="__name__">
-                {{ form_rest(form.value.vars.prototype) }}
+    <template type="text/template" id="collection-{{ collection_name }}">
+        <div data-collection-item="__name__">
+            {{ form_rest(form.value.vars.prototype) }}
 
-                {% if allow_delete %}
-                    <div {% for k, v in delete_attr %}{{ k }}="{{ v }}"{% endfor %}>
-                        <span data-collection-delete-container class="btn btn-sm btn-danger">
-                            {{ label_delete|trans }}
-                        </span>
-                    </div>
-                {% endif %}
+            <div class="text-right">
+                <span data-collection-delete-container class="btn btn-sm btn-danger">
+                    {{ label_delete|trans }}
+                </span>
             </div>
-        </template>
-    {% endif %}
+        </div>
+    </template>
 {% endblock %}
 
 {% block murph_collection_widget %}
     {% set attrs = attr|merge({class: 'mb-1 ' ~ (attr.class ?? '')}) %}
-    {% set allow_delete = allow_delete|default(false) %}
-    {% set allow_add = allow_add|default(false) %}
-    {% set add_attr = add_attr|default({}) %}
-    {% set delete_attr = delete_attr|default({}) %}
 
     <div data-collection="collection-{{ collection_name }}" {% for attr, value in row_attr %}{{ attr }}="{{ value }}"{% endfor %}>
         {% for item in form %}
             <div data-collection-item="{{ loop.index }}" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
-                {% if template_before_item %}
-                    {{ include(template_before_item) }}
-                {% endif %}
-
                 {% for child in item %}
                     {{ form_row(child) }}
                 {% endfor %}
 
-                {% if template_after_item %}
-                    {{ include(template_after_item) }}
-                {% endif %}
-
-                {% if allow_delete %}
-                    <div {% for k, v in delete_attr %}{{ k }}="{{ v }}"{% endfor %}>
-                        <span data-collection-delete-container class="btn btn-sm btn-danger">
-                            <span data-collection-delete="{{ loop.index }}">
-                                <span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
-                                {{ label_delete|trans }}
-                            </span>
+                <div class="text-right">
+                    <span data-collection-delete-container class="btn btn-sm btn-danger">
+                        <span data-collection-delete="{{ loop.index }}">
+                            <span data-collection-delete="{{ loop.index }}" class="fa fa-trash"></span>
+                            {{ label_delete|trans }}
                         </span>
-                    </div>
-                {% endif %}
+                    </span>
+                </div>
             </div>
         {% endfor %}
     </div>
 
-    {% if allow_add %}
-        <div data-collection-add="collection-{{ collection_name }}" {% for k, v in add_attr %}{{ k }}="{{ v }}"{% endfor %}>
-            <span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
-                <span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
-                {{ label_add|trans }}
-            </span>
-        </div>
+    <div data-collection-add="collection-{{ collection_name }}" class="collection-add">
+        <span class="btn btn-sm btn-primary" data-collection-add="collection-{{ collection_name }}">
+            <span data-collection-add="collection-{{ collection_name }}" class="fa fa-plus"></span>
+            {{ label_add|trans }}
+        </span>
+    </div>
 
-        <template type="text/template" id="collection-{{ collection_name }}">
-            <div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
-                {{ form_rest(form.vars.prototype) }}
+    <template type="text/template" id="collection-{{ collection_name }}">
+        <div data-collection-item="__name__" {% for attr, value in attrs %}{{ attr }}="{{ value }}"{% endfor %}>
+            {{ form_rest(form.vars.prototype) }}
 
-                {% if allow_delete %}
-                    <div {% for k, v in delete_attr %}{{ k }}="{{ v }}"{% endfor %}>
-                        <span data-collection-delete-container class="btn btn-sm btn-danger">
-                            {{ label_delete|trans }}
-                        </span>
-                    </div>
-                {% endif %}
+            <div class="text-right">
+                <span data-collection-delete-container class="btn btn-sm btn-danger">
+                    {{ label_delete|trans }}
+                </span>
             </div>
-        </template>
-    {% endif %}
+        </div>
+    </template>
 {% endblock %}
 
 {% block file_picker_widget %}
@@ -193,14 +138,14 @@
 
         <div class="card">
             {% if value %}
-                {% if value.extension is defined and value.extension in ['jpeg', 'jpg', 'gif', 'png', 'svg', 'webp'] %}
+                {% if value.extension is defined and value.extension in ['jpeg', 'jpg', 'gif', 'png', 'svg'] %}
                     <div class="card-img-top bg-tiles text-center">
                         <a href="{{ asset(value.pathname) }}" target="_blank">
                             <img src="{{ asset(value.pathname) }}" class="img-fluid">
                         </a>
                     </div>
                 {% else %}
-                    {% for extension in ['.jpeg', '.jpg', '.gif', '.png', '.svg', '.webp'] %}
+                    {% for extension in ['.jpeg', '.jpg', '.gif', '.png', '.svg'] %}
                         {% if value ends with extension %}
                             <div class="card-img-top bg-tiles text-center">
                                 <a href="{{ asset(value) }}" target="_blank">
@@ -275,51 +220,3 @@
         {{- form_help(form) -}}
     </{{ element|default('div') }}>
 {%- endblock form_row %}
-
-
-{% block form_label -%}
-    {% if label is not same as(false) -%}
-        {%- if compound is defined and compound -%}
-            {%- set element = 'legend' -%}
-            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' col-form-label')|trim}) -%}
-        {%- else -%}
-            {%- set label_attr = label_attr|merge({for: id}) -%}
-        {%- endif -%}
-        {% if required -%}
-            {% set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' required')|trim}) %}
-        {%- endif -%}
-        {% if label is empty -%}
-            {%- if label_format is not empty -%}
-                {% set label = label_format|replace({
-                    '%name%': name,
-                    '%id%': id,
-                }) %}
-            {%- else -%}
-                {% set label = name|humanize %}
-            {%- endif -%}
-        {%- endif -%}
-        <{{ element|default('label') }}{% if label_attr %}{% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}{% endif %}>
-        {%- if translation_domain is same as(false) -%}
-            {%- if label_html is same as(false) -%}
-                {{- label -}}
-            {%- else -%}
-                {{- label|raw -}}
-            {%- endif -%}
-        {%- else -%}
-            {%- if label_html is same as(false) -%}
-                {{- label|trans(label_translation_parameters, translation_domain) -}}
-            {%- else -%}
-                {{- label|trans(label_translation_parameters, translation_domain)|raw -}}
-            {%- endif -%}
-        {%- endif -%}
-        </{{ element|default('label') }}>
-        {% block form_label_errors %}{{- form_errors(form) -}}{% endblock form_label_errors %}
-    {%- else -%}
-        {%- if errors|length > 0 -%}
-        <div id="{{ id }}_errors" class="mb-2">
-            {{- form_errors(form) -}}
-        </div>
-        {%- endif -%}
-    {%- endif -%}
-{%- endblock form_label %}
-
diff --git a/src/core/Resources/views/setting/navigation_setting_admin/edit.html.twig b/src/core/Resources/views/setting/navigation_setting_admin/edit.html.twig
index e1488ef..4a05a3a 100644
--- a/src/core/Resources/views/setting/navigation_setting_admin/edit.html.twig
+++ b/src/core/Resources/views/setting/navigation_setting_admin/edit.html.twig
@@ -1,77 +1,20 @@
-{% extends '@Core/admin/layout.html.twig' %}
-
-{% set view = entity.options['view']|default('modal') %}
-
-{% block html %}
-    {% if view == 'modal' %}
-        <div class="modal-dialog {% if options['view']|default('') == 'large' %}modal-dialog-large{% endif %}">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">{{ entity.section|trans }}</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form action="{{ path('admin_navigation_setting_edit', {entity: entity.id, redirectTo: redirectTo}) }}" id="form-entity-edit" method="POST">
-                        {{ include('@Core/setting/navigation_setting_admin/_form.html.twig') }}
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Cancel'|trans }}</button>
-                    <button type="submit" form="form-entity-edit" class="btn btn-primary">{{ 'Save'|trans }}</button>
-                </div>
-            </div>
+<div class="modal-dialog {% if options['view']|default('') == 'large' %}modal-dialog-large{% endif %}">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h5 class="modal-title">{{ entity.section|trans }}</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
         </div>
-    {% else %}
-        {{ parent() }}
-    {% endif %}
-{% endblock %}
-
-{% block body_class %}has-form{% endblock %}
-
-{% block title %}{{ entity.label }}{% endblock %}
-
-{% block body %}
-    {% block header %}
-        <div class="bg-light">
-            <div class="crud-header">
-                {% block header_title %}
-                    <h1 class="crud-header-title">{{ entity.label }}</h1>
-                {% endblock %}
-
-                {% block header_actions %}
-                    <div class="crud-header-actions">
-                        <div class="btn-group">
-                            <a href="{{ path('admin_setting_index') }}" class="btn btn-light">
-                                <span class="fa fa-list pr-1"></span>
-                                <span class="d-none d-md-inline">
-                                    {{ 'Back to the list'|trans }}
-                                </span>
-                            </a>
-
-                            <button type="submit" form="form-main" class="btn btn-primary">
-                                <span class="fa fa-save pr-1"></span>
-                                <span class="d-none d-md-inline">
-                                    {{ 'Save'|trans|build_string(entity) }}
-                                </span>
-                            </button>
-                        </div>
-                    </div>
-                {% endblock %}
-            </div>
+        <div class="modal-body">
+            <form action="{{ path('admin_navigation_setting_edit', {entity: entity.id}) }}" id="form-entity-edit" method="POST">
+                {{ include('@Core/setting/navigation_setting_admin/_form.html.twig') }}
+            </form>
         </div>
-    {% endblock %}
+        <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Cancel'|trans }}</button>
+            <button type="submit" form="form-entity-edit" class="btn btn-primary">{{ 'Save'|trans }}</button>
+        </div>
+    </div>
+</div>
 
-    {% block form %}
-        <form action="{{ app.request.uri }}" method="post" id="form-main" enctype="multipart/form-data">
-            <div class="tab-content">
-                <div class="tab-pane active">
-                    <div class="tab-form">
-                        {{ include('@Core/setting/navigation_setting_admin/_form.html.twig') }}
-                    </div>
-                </div>
-            </div>
-        </form>
-    {% endblock %}
-{% endblock %}
diff --git a/src/core/Resources/views/setting/setting_admin/edit.html.twig b/src/core/Resources/views/setting/setting_admin/edit.html.twig
index 3836be1..c134587 100644
--- a/src/core/Resources/views/setting/setting_admin/edit.html.twig
+++ b/src/core/Resources/views/setting/setting_admin/edit.html.twig
@@ -1,77 +1,20 @@
-{% extends '@Core/admin/layout.html.twig' %}
-
-{% set view = entity.options['view']|default('modal') %}
-
-{% block html %}
-    {% if view == 'modal' %}
-        <div class="modal-dialog {% if options['view']|default('') == 'large' %}modal-dialog-large{% endif %}">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">{{ entity.section|trans }}</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form action="{{ path('admin_setting_edit', {entity: entity.id, redirectTo: redirectTo}) }}" id="form-entity-edit" method="POST">
-                        {{ include('@Core/setting/setting_admin/_form.html.twig') }}
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Cancel'|trans }}</button>
-                    <button type="submit" form="form-entity-edit" class="btn btn-primary">{{ 'Save'|trans }}</button>
-                </div>
-            </div>
+<div class="modal-dialog {% if options['view']|default('') == 'large' %}modal-dialog-large{% endif %}">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h5 class="modal-title">{{ entity.section|trans }}</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
         </div>
-    {% else %}
-        {{ parent() }}
-    {% endif %}
-{% endblock %}
-
-{% block body_class %}has-form{% endblock %}
-
-{% block title %}{{ entity.label }}{% endblock %}
-
-{% block body %}
-    {% block header %}
-        <div class="bg-light">
-            <div class="crud-header">
-                {% block header_title %}
-                    <h1 class="crud-header-title">{{ entity.label }}</h1>
-                {% endblock %}
-
-                {% block header_actions %}
-                    <div class="crud-header-actions">
-                        <div class="btn-group">
-                            <a href="{{ path('admin_setting_index') }}" class="btn btn-light">
-                                <span class="fa fa-list pr-1"></span>
-                                <span class="d-none d-md-inline">
-                                    {{ 'Back to the list'|trans }}
-                                </span>
-                            </a>
-
-                            <button type="submit" form="form-main" class="btn btn-primary">
-                                <span class="fa fa-save pr-1"></span>
-                                <span class="d-none d-md-inline">
-                                    {{ 'Save'|trans|build_string(entity) }}
-                                </span>
-                            </button>
-                        </div>
-                    </div>
-                {% endblock %}
-            </div>
+        <div class="modal-body">
+            <form action="{{ path('admin_setting_edit', {entity: entity.id}) }}" id="form-entity-edit" method="POST">
+                {{ include('@Core/setting/setting_admin/_form.html.twig') }}
+            </form>
         </div>
-    {% endblock %}
+        <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'Cancel'|trans }}</button>
+            <button type="submit" form="form-entity-edit" class="btn btn-primary">{{ 'Save'|trans }}</button>
+        </div>
+    </div>
+</div>
 
-    {% block form %}
-        <form action="{{ app.request.uri }}" method="post" id="form-main" enctype="multipart/form-data">
-            <div class="tab-content">
-                <div class="tab-pane active">
-                    <div class="tab-form">
-                        {{ include('@Core/setting/setting_admin/_form.html.twig') }}
-                    </div>
-                </div>
-            </div>
-        </form>
-    {% endblock %}
-{% endblock %}
diff --git a/src/core/Resources/views/setting/setting_admin/index.html.twig b/src/core/Resources/views/setting/setting_admin/index.html.twig
index 1ce4fe8..23ed354 100644
--- a/src/core/Resources/views/setting/setting_admin/index.html.twig
+++ b/src/core/Resources/views/setting/setting_admin/index.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Settings'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ 'Settings'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
@@ -22,35 +22,21 @@
             </thead>
             <tbody>
                 {% for item in pager %}
-                    {% set view = item.options['view']|default('modal') %}
-                    {% set edit = path('admin_setting_edit', {entity: item.id, redirectTo: app.request.pathInfo}) %}
+                    {% set edit = path('admin_setting_edit', {entity: item.id}) %}
 
                     <tr>
                         <td class="col-5">
-                            {% if view == 'modal' %}
-                                <a href="#" data-modal="{{ edit }}" data-modal-create class="font-weight-bold text-body d-block">
-                                    {{ item.label }}
-                                </a>
-                            {% else %}
-                                <a href="{{ edit }}" class="font-weight-bold text-body d-block">
-                                    {{ item.label }}
-                                </a>
-                            {% endif %}
+                            <a href="#" data-modal="{{ edit }}" class="font-weight-bold text-body d-block">
+                                {{ item.label|trans }}
+                            </a>
                         </td>
                         <td class="col-5">
                             <span class="btn btn-light">{{ item.section|trans }}</span>
                         </td>
                         <td class="col-2 miw-100 text-right">
-                            {% if view == 'modal' %}
-                                <span data-modal="{{ edit }}" data-modal-create class="btn btn-sm btn-primary mr-1">
-                                    <span data-modal="{{ edit }}" class="fa fa-edit"></span>
-                                </span>
-                            {% else %}
-                                <a href="{{ edit }}" class="btn btn-sm btn-primary mr-1">
-                                    <span class="fa fa-edit"></span>
-                                </a>
-                            {% endif %}
-
+                            <span data-modal="{{ edit }}" class="btn btn-sm btn-primary mr-1">
+                                <span data-modal="{{ edit }}" class="fa fa-edit"></span>
+                            </span>
                             <button type="submit" form="form-delete-{{ item.id }}" class="btn btn-sm btn-danger">
                                 <span class="fa fa-trash"></span>
                             </button>
diff --git a/src/core/Resources/views/site/navigation_admin/_form.html.twig b/src/core/Resources/views/site/navigation_admin/_form.html.twig
index 6149756..d3ad5f1 100644
--- a/src/core/Resources/views/site/navigation_admin/_form.html.twig
+++ b/src/core/Resources/views/site/navigation_admin/_form.html.twig
@@ -1,7 +1,7 @@
 <div class="row">
     <div class="col-12 p-3">
         <div class="row">
-            {% for item in ['label', 'locale', 'code', 'color'] %}
+            {% for item in ['label', 'locale', 'code'] %}
                 <div class="col-12">
                     {{ form_row(form[item]) }}
                 </div>
diff --git a/src/core/Resources/views/site/navigation_admin/_show.html.twig b/src/core/Resources/views/site/navigation_admin/_show.html.twig
index 54566de..d55624b 100644
--- a/src/core/Resources/views/site/navigation_admin/_show.html.twig
+++ b/src/core/Resources/views/site/navigation_admin/_show.html.twig
@@ -4,17 +4,22 @@
     <div class="col-12 p-3">
         <ul class="list-group">
             <li class="list-group-item">
-                <span class="font-weight-bold pb-2 d-block">{{ 'Label'|trans }}</span>
-                {{ entity.label }}
-            </li>
-            <li class="list-group-item">
-                <span class="font-weight-bold pb-2 d-block">{{ 'Locale'|trans }}</span>
-                {{ entity.locale }}
-            </li>
-            <li class="list-group-item">
-                <span class="font-weight-bold pb-2 d-block">{{ 'Code'|trans }}</span>
-                {{ entity.code }}
+                <div class="row">
+                    <div class="col-md-4">
+                        <span class="font-weight-bold pb-2 d-block">{{ 'Label'|trans }}</span>
+                        {{ entity.label }}
+                    </div>
+                    <div class="col-md-4">
+                        <span class="font-weight-bold pb-2 d-block">{{ 'Locale'|trans }}</span>
+                        {{ entity.locale }}
+                    </div>
+                    <div class="col-md-4">
+                        <span class="font-weight-bold pb-2 d-block">{{ 'Code'|trans }}</span>
+                        {{ entity.code }}
+                    </div>
+                </div>
             </li>
+
             <li class="list-group-item">
                 <div class="mb-3">
                     <span class="font-weight-bold pb-2 d-block">{{ 'Domain'|trans }}</span>
@@ -54,36 +59,21 @@
             </thead>
             <tbody>
                 {% for item in datas.settings %}
-                    {% set view = item.options['view']|default('modal') %}
-
-                    {% set edit = path('admin_navigation_setting_edit', {entity: item.id, redirectTo: app.request.pathInfo}) %}
+                    {% set edit = path('admin_navigation_setting_edit', {entity: item.id}) %}
 
                     <tr data-dblclick="{{ edit }}">
                         <td class="col-5">
-                            {% if view == 'modal' %}
-                                <a href="#" data-modal="{{ edit }}" data-modal-create class="font-weight-bold text-body d-block">
-                                    {{ item.label }}
-                                </a>
-                            {% else %}
-                                <a href="{{ edit }}" class="font-weight-bold text-body d-block">
-                                    {{ item.label }}
-                                </a>
-                            {% endif %}
+                            <a href="#" data-modal="{{ edit }}" class="font-weight-bold text-body d-block">
+                                {{ item.label|trans }}
+                            </a>
                         </td>
                         <td class="col-5">
                             <span class="btn btn-light">{{ item.section|trans }}</span>
                         </td>
                         <td class="col-2 miw-100 text-right">
-                            {% if view == 'modal' %}
-                                <span data-modal="{{ edit }}" data-modal-create class="btn btn-sm btn-primary mr-1">
-                                    <span data-modal="{{ edit }}" class="fa fa-edit"></span>
-                                </span>
-                            {% else %}
-                                <a href="{{ edit }}" class="btn btn-sm btn-primary mr-1">
-                                    <span class="fa fa-edit"></span>
-                                </a>
-                            {% endif %}
-
+                            <span data-modal="{{ edit }}" class="btn btn-sm btn-primary mr-1">
+                                <span data-modal="{{ edit }}" class="fa fa-edit"></span>
+                            </span>
                             <button type="submit" form="form-delete-{{ item.id }}" class="btn btn-sm btn-danger">
                                 <span class="fa fa-trash"></span>
                             </button>
diff --git a/src/core/Resources/views/site/navigation_admin/field/label.html.twig b/src/core/Resources/views/site/navigation_admin/field/label.html.twig
deleted file mode 100644
index 50a78d1..0000000
--- a/src/core/Resources/views/site/navigation_admin/field/label.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends '@Core/admin/crud/field/text.html.twig' %}
-
-{% block value %}
-    {{ navigation_color_badge(entity) }}
-    {{ parent() }}
-{% endblock %}
diff --git a/src/core/Resources/views/site/page_admin/_form.html.twig b/src/core/Resources/views/site/page_admin/_form.html.twig
index 62a3f35..38fd00a 100644
--- a/src/core/Resources/views/site/page_admin/_form.html.twig
+++ b/src/core/Resources/views/site/page_admin/_form.html.twig
@@ -1,111 +1,71 @@
-{% set metaFormItemsCount = 0 %}
+{% set formMetas %}
+    {% for item in ['metaTitle', 'metaDescription'] %}
+        {{ form_row(form[item]) }}
+    {% endfor %}
+{% endset %}
 
-{%- set formMetas -%}
-    {%- for item in ['metaTitle', 'metaDescription'] -%}
-        {%- if form[item] is defined -%}
-            {%- set metaFormItemsCount = metaFormItemsCount + 1 -%}
-            {{- form_row(form[item]) -}}
-        {%- endif -%}
-    {%- endfor -%}
-{%- endset -%}
+{% set formOpenGraph %}
+    {% for item in ['ogTitle', 'ogDescription', 'ogImage'] %}
+        {{ form_row(form[item]) }}
+    {% endfor %}
+{% endset %}
 
-{%- set formOpenGraph -%}
-    {%- for item in ['ogTitle', 'ogDescription', 'ogImage'] -%}
-        {%- if form[item] is defined -%}
-            {%- set metaFormItemsCount = metaFormItemsCount + 1 -%}
-            {{- form_row(form[item]) -}}
-        {%- endif -%}
-    {%- endfor -%}
-{%- endset -%}
+{% set formOthers %}
+    {% for item in ['name', 'template'] %}
+        {{ form_row(form[item]) }}
+    {% endfor %}
+{% endset %}
 
-{%- set formOthers -%}
-    {%- for item in ['name', 'template'] -%}
-        {%- if form[item] is defined -%}
-            {%- set metaFormItemsCount = metaFormItemsCount + 1 -%}
-            {{- form_row(form[item]) -}}
-        {%- endif -%}
-    {%- endfor -%}
-{%- endset -%}
-
-{% set hasMetaForm = (formMetas ~ formOpenGraph ~ formOthers)|length > 0 %}
-{% set hasBlockForm = form.children|length > (metaFormItemsCount + 1) %}
-{% set activeMetaForm = formMetas|length ? 'metas' : (formOpenGraph|length ? 'openGraph' : 'others') %}
+{% set formSitemap %}
+{% endset %}
 
 <div class="row">
-    {% set nodes = entity.nodes %}
+    {% set hasBockFrom = form.children|length > 8 %}
 
-    {% if nodes|length %}
-        <div class="col-12">
-            {% for node in nodes %}
-                <a href="{{ path('admin_site_tree_navigation', {
-                    navigation: node.menu.navigation.id,
-                    'data-modal': path('admin_site_node_edit', {entity: node.id}),
-                }) }}" class="btn btn-sm btn-light mr-1" target="_blank">
-                    {{ navigation_color_badge(node.menu.navigation) }}
-                    {{ node.label }} ({{ node.menu.navigation.label }})
-                </a>
-            {% endfor %}
-        </div>
-    {% endif %}
-
-    {% if hasBlockForm %}
-        <div class="{% if hasMetaForm %}col-md-8{% else %}col-md-12{% endif %} p-2" id="page-main-form">
+    {% if hasBockFrom %}
+        <div class="col-md-8 p-2" id="page-main-form">
             {{ form_widget(form, {attr: {class: 'row'}}) }}
         </div>
     {% endif %}
 
-    {% if hasMetaForm %}
-        <div class="{% if hasBlockForm %}col-md-4{% else %}col-md-12{% endif %} p-md-3" id="page-metas-form">
-            <ul class="nav nav-pills">
-                {% if formMetas|length > 0 %}
-                    <li class="nav-item mb-1">
-                        <a class="nav-link {% if activeMetaForm == 'metas' %}active{% endif %}" data-toggle="tab" href="#form-page-metas">
-                            <span class="fa fa-code"></span>
-                            <span class="d-none d-md-inline">
-                                {{ 'Meta datas'|trans }}
-                            </span>
-                        </a>
-                    </li>
-                {% endif %}
-                {% if formOpenGraph|length > 0 %}
-                    <li class="nav-item mb-1">
-                        <a class="nav-link {% if activeMetaForm == 'openGraph' %}active{% endif %}" data-toggle="tab" href="#form-page-og">
-                            <span class="fa fa-share"></span>
-                            <span class="d-none d-md-inline">
-                                {{ 'OpenGraph'|trans }}
-                            </span>
-                        </a>
-                    </li>
-                {% endif %}
-                {% if formOthers|length > 0 %}
-                    <li class="nav-item">
-                        <a class="nav-link {% if activeMetaForm == 'others' %}active{% endif %}" data-toggle="tab" href="#form-page-others">
-                            <span class="fa fa-cog"></span>
-                            <span class="d-none d-md-inline">
-                                {{ 'Others'|trans }}
-                            </span>
-                        </a>
-                    </li>
-                {% endif %}
-            </ul>
+    <div class="{% if hasBockFrom %}col-md-4{% else %}col-md-12{% endif %} p-md-3" id="page-metas-form">
+        <ul class="nav nav-pills">
+            <li class="nav-item mb-1">
+                <a class="nav-link active" data-toggle="tab" href="#form-page-metas">
+                    <span class="fa fa-code"></span>
+                    <span class="d-none d-md-inline">
+                        {{ 'Meta datas'|trans }}
+                    </span>
+                </a>
+            </li>
+            <li class="nav-item mb-1">
+                <a class="nav-link" data-toggle="tab" href="#form-page-og">
+                    <span class="fa fa-share"></span>
+                    <span class="d-none d-md-inline">
+                        {{ 'OpenGraph'|trans }}
+                    </span>
+                </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#form-page-others">
+                    <span class="fa fa-cog"></span>
+                    <span class="d-none d-md-inline">
+                        {{ 'Others'|trans }}
+                    </span>
+                </a>
+            </li>
+        </ul>
 
-            <div class="tab-content">
-                {% if formMetas|length > 0 %}
-                    <div class="tab-pane {% if activeMetaForm == 'metas' %}show active{% endif %} p-3" id="form-page-metas">
-                        {{ formMetas|raw }}
-                    </div>
-                {% endif %}
-                {% if formOpenGraph|length > 0 %}
-                    <div class="tab-pane {% if activeMetaForm == 'openGraph' %}show active{% endif %} p-3" id="form-page-og">
-                        {{ formOpenGraph|raw }}
-                    </div>
-                {% endif %}
-                {% if formOthers|length > 0 %}
-                    <div class="tab-pane {% if activeMetaForm == 'others' %}show active{% endif %} p-3" id="form-page-others">
-                        {{ formOthers|raw }}
-                    </div>
-                {% endif %}
+        <div class="tab-content">
+            <div class="tab-pane show active p-3" id="form-page-metas">
+                {{ formMetas|raw }}
+            </div>
+            <div class="tab-pane p-3" id="form-page-og">
+                {{ formOpenGraph|raw }}
+            </div>
+            <div class="tab-pane p-3" id="form-page-others">
+                {{ formOthers|raw }}
             </div>
         </div>
-    {% endif %}
+    </div>
 </div>
diff --git a/src/core/Resources/views/site/page_admin/fields/nodes.html.twig b/src/core/Resources/views/site/page_admin/fields/nodes.html.twig
index c76efa5..b49c524 100644
--- a/src/core/Resources/views/site/page_admin/fields/nodes.html.twig
+++ b/src/core/Resources/views/site/page_admin/fields/nodes.html.twig
@@ -3,7 +3,6 @@
         navigation: node.menu.navigation.id,
         'data-modal': path('admin_site_node_edit', {entity: node.id}),
     }) }}" class="btn btn-sm btn-light mr-1">
-        {{ navigation_color_badge(node.menu.navigation) }}
         {{ node.label }} ({{ node.menu.navigation.label }})
     </a>
 {% endfor %}
diff --git a/src/core/Resources/views/site/tree_admin/navigation.html.twig b/src/core/Resources/views/site/tree_admin/navigation.html.twig
index e305d56..a106cf6 100644
--- a/src/core/Resources/views/site/tree_admin/navigation.html.twig
+++ b/src/core/Resources/views/site/tree_admin/navigation.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Tree'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ 'Tree'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
@@ -8,14 +8,12 @@
             <div class="crud-header-title">
                 <button type="button" class="btn btn-outline-dark dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="font-weight-bold">
-                        {{ navigation_color_badge(navigation) }}
                         {{ navigation.label }}
                     </span>
                 </button>
                 <div class="dropdown-menu">
                     {% for item in navigations %}
                         <a href="{{ path('admin_site_tree_navigation', {navigation: item.id}) }}" class="dropdown-item">
-                            {{ navigation_color_badge(item) }}
                             {{ item.label }}
                         </a>
                     {% endfor %}
@@ -81,7 +79,7 @@
                                     <div class="col-6" style="padding-left: {{ (node.treeLevel - 1) * 30 }}px">
                                         {{ node.label }}
 
-                                        <span class="ml-3 btn-group d-none d-md-inline-block no-wrap">
+                                        <span class="ml-3 btn-group d-none d-md-inline-block">
                                             {% if node.aliasNode %}
                                                 <span title="{{ node.aliasNode.label }}" data-toggle="tooltip" data-placement="top" class="btn btn-sm border border-secondary btn-light">
                                                     <span class="fa fa-file-import"></span>
diff --git a/src/core/Resources/views/task/task_admin/index.html.twig b/src/core/Resources/views/task/task_admin/index.html.twig
index 70e0f35..8600eda 100644
--- a/src/core/Resources/views/task/task_admin/index.html.twig
+++ b/src/core/Resources/views/task/task_admin/index.html.twig
@@ -1,6 +1,6 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
-{% block title %}{{ 'Tasks'|trans }} {{ parent() ? ('- ' ~ parent()) : '' }}{% endblock %}
+{% block title %}{{ 'Tasks'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
     <div class="bg-light">
diff --git a/src/core/Router/RedirectBuilder.php b/src/core/Router/RedirectBuilder.php
index 26aaa47..3ad94db 100644
--- a/src/core/Router/RedirectBuilder.php
+++ b/src/core/Router/RedirectBuilder.php
@@ -14,8 +14,11 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class RedirectBuilder
 {
-    public function __construct(protected UrlBuilder $urlBuilder)
+    protected UrlBuilder $urlBuilder;
+
+    public function __construct(UrlBuilder $urlBuilder)
     {
+        $this->urlBuilder = $urlBuilder;
     }
 
     public function buildResponse(Redirect $redirect, Request $request): RedirectResponse
diff --git a/src/core/Router/SiteRouteLoader.php b/src/core/Router/SiteRouteLoader.php
index 9cfc2be..6452cee 100644
--- a/src/core/Router/SiteRouteLoader.php
+++ b/src/core/Router/SiteRouteLoader.php
@@ -15,9 +15,10 @@ use Symfony\Component\Routing\RouteCollection;
  */
 class SiteRouteLoader extends Loader
 {
+    protected NavigationRepositoryQuery $navigationQuery;
     protected $isLoaded = false;
 
-    public function __construct(protected NavigationRepositoryQuery $navigationQuery)
+    public function __construct(NavigationRepositoryQuery $navigationQuery)
     {
         $this->navigationQuery = $navigationQuery;
     }
diff --git a/src/core/Setting/NavigationSettingManager.php b/src/core/Setting/NavigationSettingManager.php
index 0d1a042..cf40b27 100644
--- a/src/core/Setting/NavigationSettingManager.php
+++ b/src/core/Setting/NavigationSettingManager.php
@@ -16,22 +16,24 @@ use App\Core\Repository\Site\NavigationRepositoryQuery;
  */
 class NavigationSettingManager
 {
+    protected EntityManager $entityManager;
+    protected NavigationSettingRepositoryQuery $query;
+    protected NavigationRepositoryQuery $navigationQuery;
+    protected NavigationSettingFactory $factory;
+
     public function __construct(
-        protected EntityManager $entityManager,
-        protected NavigationSettingRepositoryQuery $query,
-        protected NavigationRepositoryQuery $navigationQuery,
-        protected NavigationSettingFactory $factory
+        EntityManager $entityManager,
+        NavigationSettingRepositoryQuery $query,
+        NavigationRepositoryQuery $navigationQuery,
+        NavigationSettingFactory $factory
     ) {
+        $this->entityManager = $entityManager;
+        $this->query = $query;
+        $this->navigationQuery = $navigationQuery;
+        $this->factory = $factory;
     }
 
-    public function init(
-        $navigation,
-        string $code,
-        string $section,
-        string $label,
-        $value = null,
-        array $options = [],
-    )
+    public function init($navigation, string $code, string $section, string $label, $value = null)
     {
         $entity = $this->get($this->getNavigation($navigation), $code);
         $isNew = null === $entity;
@@ -44,7 +46,6 @@ class NavigationSettingManager
         $entity
             ->setSection($section)
             ->setLabel($label)
-            ->setOptions($options)
         ;
 
         if ($isNew) {
diff --git a/src/core/Setting/SettingManager.php b/src/core/Setting/SettingManager.php
index 01e9f7e..597a209 100644
--- a/src/core/Setting/SettingManager.php
+++ b/src/core/Setting/SettingManager.php
@@ -14,20 +14,18 @@ use App\Core\Repository\SettingRepositoryQuery;
  */
 class SettingManager
 {
-    public function __construct(
-        protected EntityManager $entityManager,
-        protected SettingRepositoryQuery $query,
-        protected SettingFactory $factory
-    ) {
+    protected EntityManager $entityManager;
+    protected SettingRepositoryQuery $query;
+    protected SettingFactory $factory;
+
+    public function __construct(EntityManager $entityManager, SettingRepositoryQuery $query, SettingFactory $factory)
+    {
+        $this->entityManager = $entityManager;
+        $this->query = $query;
+        $this->factory = $factory;
     }
 
-    public function init(
-        string $code,
-        string $section,
-        string $label,
-        $value = null,
-        array $options = [],
-    )
+    public function init(string $code, string $section, string $label, $value = null)
     {
         $entity = $this->get($code);
         $isNew = null === $entity;
@@ -40,7 +38,6 @@ class SettingManager
         $entity
             ->setSection($section)
             ->setLabel($label)
-            ->setOptions($options)
         ;
 
         if ($isNew) {
diff --git a/src/core/Site/SiteRequest.php b/src/core/Site/SiteRequest.php
index 8d7d054..e127eeb 100644
--- a/src/core/Site/SiteRequest.php
+++ b/src/core/Site/SiteRequest.php
@@ -6,7 +6,9 @@ use App\Core\Entity\Site\Menu;
 use App\Core\Entity\Site\Navigation;
 use App\Core\Entity\Site\Node;
 use App\Core\Entity\Site\Page\Page;
+use App\Core\Repository\Site\NavigationRepositoryQuery;
 use App\Core\Repository\Site\NodeRepository;
+use App\Core\Repository\Site\Page\PageRepositoryQuery;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -16,10 +18,15 @@ use Symfony\Component\HttpFoundation\RequestStack;
  */
 class SiteRequest
 {
-    public function __construct(
-        protected RequestStack $requestStack,
-        protected NodeRepository $nodeRepository
-    ) {
+    protected RequestStack $requestStack;
+    protected NodeRepository $nodeRepository;
+    protected NavigationRepositoryQuery $navigationRepositoryQuery;
+    protected PageRepositoryQuery $pageRepositoryQuery;
+
+    public function __construct(RequestStack $requestStack, NodeRepository $nodeRepository)
+    {
+        $this->requestStack = $requestStack;
+        $this->nodeRepository = $nodeRepository;
     }
 
     public function getNode(): ?Node
diff --git a/src/core/Site/SiteStore.php b/src/core/Site/SiteStore.php
index 1585d4f..94229b5 100644
--- a/src/core/Site/SiteStore.php
+++ b/src/core/Site/SiteStore.php
@@ -13,10 +13,13 @@ use App\Core\Repository\Site\NavigationRepositoryQuery;
  */
 class SiteStore
 {
-    public function __construct(
-        protected NavigationRepositoryQuery $navigationRepositoryQuery,
-        protected SiteRequest $siteRequest
-    ) {
+    protected NavigationRepositoryQuery $navigationRepositoryQuery;
+    protected SiteRequest $siteRequest;
+
+    public function __construct(NavigationRepositoryQuery $navigationRepositoryQuery, SiteRequest $siteRequest)
+    {
+        $this->navigationRepositoryQuery = $navigationRepositoryQuery;
+        $this->siteRequest = $siteRequest;
     }
 
     public function getNavigations(): array
diff --git a/src/core/Sitemap/SitemapBuilder.php b/src/core/Sitemap/SitemapBuilder.php
index 9815bc9..ab4f43e 100644
--- a/src/core/Sitemap/SitemapBuilder.php
+++ b/src/core/Sitemap/SitemapBuilder.php
@@ -17,11 +17,15 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  */
 class SitemapBuilder
 {
-    public function __construct(
-        protected Reader $annotationReader,
-        protected ContainerInterface $container,
-        protected UrlGeneratorInterface $urlGenerator
-    ) {
+    protected Reader $annotationReader;
+    protected ContainerInterface $container;
+    protected UrlGeneratorInterface $urlGenerator;
+
+    public function __construct(Reader $annotationReader, ContainerInterface $container, UrlGeneratorInterface $urlGenerator)
+    {
+        $this->annotationReader = $annotationReader;
+        $this->container = $container;
+        $this->urlGenerator = $urlGenerator;
     }
 
     public function build(Navigation $navigation, ?string $currentDomain): array
diff --git a/src/core/Slugify/Slugify.php b/src/core/Slugify/Slugify.php
index fc06c47..9985b2b 100644
--- a/src/core/Slugify/Slugify.php
+++ b/src/core/Slugify/Slugify.php
@@ -13,7 +13,7 @@ class Slugify
 {
     public function slugify($data): ?string
     {
-        return $this->create()->slugify((string) $data);
+        return $this->create()->slugify($data);
     }
 
     protected function create(): BaseSlugify
diff --git a/src/core/String/FileInformationBuilder.php b/src/core/String/FileInformationBuilder.php
index 4c3e586..9f3aab6 100644
--- a/src/core/String/FileInformationBuilder.php
+++ b/src/core/String/FileInformationBuilder.php
@@ -2,6 +2,7 @@
 
 namespace App\Core\String;
 
+use App\Core\FileManager\FsFileManager;
 use App\Core\Repository\FileInformationRepositoryQuery;
 
 /**
@@ -11,9 +12,13 @@ use App\Core\Repository\FileInformationRepositoryQuery;
  */
 class FileInformationBuilder
 {
-    public function __construct(
-        protected FileInformationRepositoryQuery $query
-    ) {
+    protected FsFileManager $fsManager;
+    protected FileInformationRepositoryQuery $query;
+
+    public function __construct(FsFileManager $fsManager, FileInformationRepositoryQuery $query)
+    {
+        $this->fsManager = $fsManager;
+        $this->query = $query;
     }
 
     public function replaceTags(string $value)
diff --git a/src/core/String/StringBuilder.php b/src/core/String/StringBuilder.php
index 3e66bab..b749e6d 100644
--- a/src/core/String/StringBuilder.php
+++ b/src/core/String/StringBuilder.php
@@ -34,7 +34,7 @@ class StringBuilder
             return $format;
         }
 
-        preg_match_all('/\{([a-zA-Z0-9\._\[\]]+)\}/i', $format, $matches, PREG_SET_ORDER);
+        preg_match_all('/\{([a-zA-Z0-9\._]+)\}/i', $format, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
             $propertyValue = $this->propertyAccessor->getValue($object, $match[1]);
diff --git a/src/core/String/UrlBuilder.php b/src/core/String/UrlBuilder.php
index 452d1c4..759f187 100644
--- a/src/core/String/UrlBuilder.php
+++ b/src/core/String/UrlBuilder.php
@@ -12,10 +12,13 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
  */
 class UrlBuilder
 {
-    public function __construct(
-        protected UrlGeneratorInterface $urlGenerator,
-        protected SiteRequest $siteRequest
-    ) {
+    protected UrlGeneratorInterface $urlGenerator;
+    protected SiteRequest $siteRequest;
+
+    public function __construct(UrlGeneratorInterface $urlGenerator, SiteRequest $siteRequest)
+    {
+        $this->urlGenerator = $urlGenerator;
+        $this->siteRequest = $siteRequest;
     }
 
     public function replaceTags(string $value): string
diff --git a/src/core/Twig/Extension/AbTestExtension.php b/src/core/Twig/Extension/AbTestExtension.php
index 92c9c66..3727c17 100644
--- a/src/core/Twig/Extension/AbTestExtension.php
+++ b/src/core/Twig/Extension/AbTestExtension.php
@@ -3,14 +3,17 @@
 namespace App\Core\Twig\Extension;
 
 use App\Core\Ab\AbContainer;
-use App\Core\Ab\AbTestInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
+use App\Core\Ab\AbTestInterface;
 
 class AbTestExtension extends AbstractExtension
 {
-    public function __construct(protected AbContainer $container)
+    protected AbContainer $container;
+
+    public function __construct(AbContainer $container)
     {
+        $this->container = $container;
     }
 
     public function getFunctions(): array
diff --git a/src/core/Twig/Extension/BuilderExtension.php b/src/core/Twig/Extension/BuilderExtension.php
deleted file mode 100644
index ea21e50..0000000
--- a/src/core/Twig/Extension/BuilderExtension.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Core\Twig\Extension;
-
-use App\Core\BuilderBlock\BuilderBlockContainer;
-use Twig\Environment;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-class BuilderExtension extends AbstractExtension
-{
-    public function __construct(protected Environment $twig, protected BuilderBlockContainer $container)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('block_to_html', [$this, 'buildHtml'], ['is_safe' => ['html']]),
-        ];
-    }
-
-    public function buildHtml(null|array|string $data, array $context = []): ?string
-    {
-        if (null === $data) {
-            return null;
-        }
-
-        if (is_string($data)) {
-            $data = json_decode($data, true);
-        }
-
-        if (!is_array($data)) {
-            return null;
-        }
-
-        if (isset($data['widget'])) {
-            if (!$this->container->hasWidget($data['widget'])) {
-                return null;
-            }
-
-            $widget = $this->container->getWidget($data['widget']);
-            $widget->buildVars($data, $context);
-
-            return $this->twig->render($widget->getTemplate(), [
-                'id' => $data['id'],
-                'settings' => $data['settings'],
-                'children' => $data['children'],
-                'context' => $context,
-                'vars' => $widget->getVars(),
-            ]);
-        }
-
-        $render = '';
-        foreach ($data as $item) {
-            $render .= $this->buildHtml($item, $context);
-        }
-
-        return $render;
-    }
-}
diff --git a/src/core/Twig/Extension/CrudExtension.php b/src/core/Twig/Extension/CrudExtension.php
index b481440..eb2c015 100644
--- a/src/core/Twig/Extension/CrudExtension.php
+++ b/src/core/Twig/Extension/CrudExtension.php
@@ -12,12 +12,15 @@ use Twig\TwigFunction;
 class CrudExtension extends AbstractExtension
 {
     protected PropertyAccessor $propertyAccessor;
+    protected Environment $twig;
 
-    public function __construct(protected Environment $twig)
+    public function __construct(Environment $twig)
     {
         $this->propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
             ->getPropertyAccessor()
         ;
+
+        $this->twig = $twig;
     }
 
     /**
diff --git a/src/core/Twig/Extension/EditorJsExtension.php b/src/core/Twig/Extension/EditorJsExtension.php
index a320447..406fcd4 100644
--- a/src/core/Twig/Extension/EditorJsExtension.php
+++ b/src/core/Twig/Extension/EditorJsExtension.php
@@ -2,13 +2,15 @@
 
 namespace App\Core\Twig\Extension;
 
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Twig\Environment;
+use App\Core\String\StringBuilder;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
+use Twig\Environment;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 class EditorJsExtension extends AbstractExtension
 {
+    protected Environment $twig;
     protected array $views = [];
     protected array $defaultAllowedBlocks = [
         'paragraph',
@@ -26,8 +28,9 @@ class EditorJsExtension extends AbstractExtension
         'link',
     ];
 
-    public function __construct(protected Environment $twig, ParameterBagInterface $params)
+    public function __construct(Environment $twig, ParameterBagInterface $params)
     {
+        $this->twig = $twig;
         $blocks = $params->get('core')['editor_js']['blocks'] ?? [];
 
         foreach ($blocks as $block => $view) {
@@ -65,23 +68,23 @@ class EditorJsExtension extends AbstractExtension
             $data = json_decode(json_encode($data), true);
         }
 
-        if (null === $data) {
+        if ($data === null) {
             return '';
         }
 
-        if (null === $allowedBlocks) {
+        if ($allowedBlocks === null) {
             $allowedBlocks = $this->defaultAllowedBlocks;
         }
 
         $blocks = $data['blocks'] ?? [];
         $renders = '';
 
-        $blocks = array_filter($data['blocks'] ?? [], function ($block) use ($allowedBlocks) {
+        $blocks = array_filter($data['blocks'] ?? [], function($block) use ($allowedBlocks) {
             return isset($block['type']) && in_array($block['type'], $allowedBlocks);
         });
 
         foreach ($blocks as $block) {
-            $renders .= $this->twig->render($this->views[$block['type']], $block['data'] ?? []);
+            $renders.= $this->twig->render($this->views[$block['type']], $block['data'] ?? []);
         }
 
         return $renders;
diff --git a/src/core/Twig/Extension/EntityExtension.php b/src/core/Twig/Extension/EntityExtension.php
index 2ef09d6..466cf79 100644
--- a/src/core/Twig/Extension/EntityExtension.php
+++ b/src/core/Twig/Extension/EntityExtension.php
@@ -14,8 +14,9 @@ class EntityExtension extends AbstractExtension
 {
     protected PropertyAccessor $propertyAccessor;
 
-    public function __construct(protected EntityManagerInterface $entityManager)
+    public function __construct(EntityManagerInterface $entityManager)
     {
+        $this->entityManager = $entityManager;
         $this->propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
             ->disableExceptionOnInvalidPropertyPath()
             ->getPropertyAccessor()
@@ -32,7 +33,7 @@ class EntityExtension extends AbstractExtension
         ];
     }
 
-    public function toArray(EntityInterface $entity, bool $keepIterable = true, array $except = []): array
+    public function toArray(EntityInterface $entity): array
     {
         $metaData = $this->entityManager->getClassMetadata(get_class($entity));
         $array = [];
@@ -41,14 +42,6 @@ class EntityExtension extends AbstractExtension
             try {
                 $value = $this->propertyAccessor->getValue($entity, $field);
 
-                if (in_array($field, $except)) {
-                    continue;
-                }
-
-                if (is_iterable($value) && !$keepIterable) {
-                    continue;
-                }
-
                 if (is_object($value)) {
                     $value = (string) $value;
                 }
diff --git a/src/core/Twig/Extension/FileInformationExtension.php b/src/core/Twig/Extension/FileInformationExtension.php
index 16688e2..31eb989 100644
--- a/src/core/Twig/Extension/FileInformationExtension.php
+++ b/src/core/Twig/Extension/FileInformationExtension.php
@@ -4,18 +4,24 @@ namespace App\Core\Twig\Extension;
 
 use App\Core\FileManager\FsFileManager;
 use App\Core\Repository\FileInformationRepositoryQuery;
-use App\Core\String\FileInformationBuilder;
 use function Symfony\Component\String\u;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
+use App\Core\String\FileInformationBuilder;
 
 class FileInformationExtension extends AbstractExtension
 {
+    protected FileInformationBuilder $fileInfoBuilder;
+
     public function __construct(
-        protected FileInformationBuilder $fileInfoBuilder,
-        protected FsFileManager $fsManager,
-        protected FileInformationRepositoryQuery $query
-    ) {
+        FileInformationBuilder $fileInfoBuilder,
+        FsFileManager $fsManager,
+        FileInformationRepositoryQuery $query
+    )
+    {
+        $this->fileInfoBuilder = $fileInfoBuilder;
+        $this->fsManager = $fsManager;
+        $this->query = $query;
     }
 
     /**
diff --git a/src/core/Twig/Extension/GrapesJsExtension.php b/src/core/Twig/Extension/GrapesJsExtension.php
index 0f7b76d..0e3c4b9 100644
--- a/src/core/Twig/Extension/GrapesJsExtension.php
+++ b/src/core/Twig/Extension/GrapesJsExtension.php
@@ -2,8 +2,11 @@
 
 namespace App\Core\Twig\Extension;
 
+use App\Core\String\StringBuilder;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
+use Twig\Environment;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 class GrapesJsExtension extends AbstractExtension
 {
diff --git a/src/core/Twig/Extension/NavigationExtension.php b/src/core/Twig/Extension/NavigationExtension.php
deleted file mode 100644
index 6cf015a..0000000
--- a/src/core/Twig/Extension/NavigationExtension.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Core\Twig\Extension;
-
-use App\Core\Entity\Site\Navigation;
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFunction;
-
-class NavigationExtension extends AbstractExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctions()
-    {
-        return [
-            new TwigFunction('navigation_color_badge', [$this, 'navigationColorBadge'], ['is_safe' => ['html']]),
-        ];
-    }
-
-    public function navigationColorBadge(Navigation $entity): ?string
-    {
-        if (!$entity->getColor()) {
-            return null;
-        }
-
-        return sprintf(
-            '<span class="fa fa-square" style="color: %s"></span>',
-            $entity->getColor()
-        );
-    }
-}
diff --git a/src/core/Twig/Extension/RoutingExtension.php b/src/core/Twig/Extension/RoutingExtension.php
index 8608f2e..25e40dc 100644
--- a/src/core/Twig/Extension/RoutingExtension.php
+++ b/src/core/Twig/Extension/RoutingExtension.php
@@ -14,10 +14,13 @@ use Twig\TwigFunction;
 
 class RoutingExtension extends AbstractExtension
 {
-    public function __construct(
-        protected UrlGeneratorInterface $generator,
-        protected SiteRequest $siteRequest
-    ) {
+    protected UrlGeneratorInterface $generator;
+    protected SiteRequest $siteRequest;
+
+    public function __construct(UrlGeneratorInterface $generator, SiteRequest $siteRequest)
+    {
+        $this->generator = $generator;
+        $this->siteRequest = $siteRequest;
     }
 
     /**
@@ -161,8 +164,8 @@ class RoutingExtension extends AbstractExtension
             $argsNode->hasNode(1) ? $argsNode->getNode(1) : null
         );
 
-        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2
-            && (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
+        if (null === $paramsNode || $paramsNode instanceof ArrayExpression && \count($paramsNode) <= 2 &&
+            (!$paramsNode->hasNode(1) || $paramsNode->getNode(1) instanceof ConstantExpression)
         ) {
             return ['html'];
         }
diff --git a/src/core/Twig/Extension/SettingExtension.php b/src/core/Twig/Extension/SettingExtension.php
index d0e7c50..06a5cf4 100644
--- a/src/core/Twig/Extension/SettingExtension.php
+++ b/src/core/Twig/Extension/SettingExtension.php
@@ -2,17 +2,20 @@
 
 namespace App\Core\Twig\Extension;
 
-use App\Core\Setting\NavigationSettingManager;
 use App\Core\Setting\SettingManager;
+use App\Core\Setting\NavigationSettingManager;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
 class SettingExtension extends AbstractExtension
 {
-    public function __construct(
-        protected SettingManager $settingManager,
-        protected NavigationSettingManager $navigationSettingManager
-    ) {
+    private SettingManager $settingManager;
+    private NavigationSettingManager $navigationSettingManager;
+
+    public function __construct(SettingManager $settingManager, NavigationSettingManager $navigationSettingManager)
+    {
+        $this->settingManager = $settingManager;
+        $this->navigationSettingManager = $navigationSettingManager;
     }
 
     /**
diff --git a/src/core/Twig/Extension/StringExtension.php b/src/core/Twig/Extension/StringExtension.php
index 0418199..c7f5c13 100644
--- a/src/core/Twig/Extension/StringExtension.php
+++ b/src/core/Twig/Extension/StringExtension.php
@@ -8,8 +8,11 @@ use Twig\TwigFilter;
 
 class StringExtension extends AbstractExtension
 {
-    public function __construct(protected StringBuilder $stringBuilder)
+    protected StringBuilder $stringBuilder;
+
+    public function __construct(StringBuilder $stringBuilder)
     {
+        $this->stringBuilder = $stringBuilder;
     }
 
     /**
diff --git a/src/core/Twig/Extension/UrlExtension.php b/src/core/Twig/Extension/UrlExtension.php
index 528462f..f541d2f 100644
--- a/src/core/Twig/Extension/UrlExtension.php
+++ b/src/core/Twig/Extension/UrlExtension.php
@@ -2,14 +2,19 @@
 
 namespace App\Core\Twig\Extension;
 
-use App\Core\String\UrlBuilder;
+use App\Core\Site\SiteRequest;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
+use App\Core\String\UrlBuilder;
 
 class UrlExtension extends AbstractExtension
 {
-    public function __construct(protected UrlBuilder $urlBuilder)
+    protected UrlBuilder $urlBuilder;
+
+    public function __construct(UrlBuilder $urlBuilder)
     {
+        $this->urlBuilder = $urlBuilder;
     }
 
     /**