diff --git a/assets/admin/app.scss b/assets/admin/app.scss
index 6d75ecb..8b1c18b 100644
--- a/assets/admin/app.scss
+++ b/assets/admin/app.scss
@@ -165,6 +165,10 @@ body {
   width: 100%;
 }
 
+.clear-line-height{
+  line-height: 0;
+}
+
 /*======================================================
  Footer
 =======================================================*/
diff --git a/assets/admin/core/components/datepicker/index.vue b/assets/admin/core/components/datepicker/index.vue
index f11b943..9221987 100644
--- a/assets/admin/core/components/datepicker/index.vue
+++ b/assets/admin/core/components/datepicker/index.vue
@@ -8,7 +8,7 @@
                     :id="id + 'start'" :placeholder="placeholder[0] || 'Başlangıç tarihi seçin..'"
                     class="form-control"/>
         <datepicker v-model="pickedProxy.end" :input-format="format" :locale="locale"
-                    :id="id + 'end'" :placeholder="placeholder[0] || 'Başlangıç tarihi seçin..'"
+                    :id="id + 'end'" :placeholder="placeholder[0] || 'Bitiş tarihi seçin..'"
                     class="form-control"/>
     </div>
 </template>
diff --git a/assets/admin/core/components/modal/directive.js b/assets/admin/core/components/modal/directive.js
index d878db5..44287dd 100644
--- a/assets/admin/core/components/modal/directive.js
+++ b/assets/admin/core/components/modal/directive.js
@@ -1,7 +1,6 @@
 export default {
     mounted(el, binding, vnode) {
         el.addEventListener('click', () => {
-            console.log(vnode.dirs);
             vnode.dirs[0].instance[binding.value].instance.show();
         })
     }
diff --git a/assets/admin/src/ajax-form/index.vue b/assets/admin/src/ajax-form/index.vue
index eed51ff..9a70355 100644
--- a/assets/admin/src/ajax-form/index.vue
+++ b/assets/admin/src/ajax-form/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="ajax-form full-form">
-        <off-canvas id="ajaxForm" ref="canvas" @submit.prevent="post">
+        <off-canvas id="ajaxForm" ref="canvas" @submit.prevent="post" :size="size">
             <template v-slot:title>{{ title }}</template>
             <template v-slot:content>
                 <component v-if="content" :is="{ template:content }"/>
@@ -12,7 +12,7 @@
 <script>
 export default {
     name: "AjaxForm",
-    props: ['table', 'message'],
+    props: ['table', 'message', 'size'],
     data() {
         return {
             url: null,
@@ -37,13 +37,16 @@ export default {
             this.$root.http.post(this.url, new FormData(event.target))
                 .then((resp) => {
                     if (typeof this.index === 'number') {
-                        window.Table.$data.data[this.index] = resp.data;
+                        window.Table.$data.data[this.index] = resp.data.data || resp.data;
                     }
                     if (typeof this.index === 'string') {
-                        window.Table.$data.data.push(resp.data);
+                        window.Table.$data.data.push(resp.data.data || resp.data);
+                    }
+
+                    if (this.message) {
+                        this.$root.msg.success(this.message);
                     }
 
-                    this.$root.msg.success(this.message);
                     this.$refs.canvas.instance.hide();
                 })
                 .catch((err) => {
@@ -59,5 +62,15 @@ export default {
     .form-check{
         width: 100% !important;
     }
+
+    .form-container {
+        & > *:nth-child(2n) {
+            margin-left: calc(var(--bs-gutter-x) / -2);
+        }
+
+        & > *:last-of-type > div {
+            padding-left: calc(var(--bs-gutter-x) / 2);
+        }
+    }
 }
 </style>
diff --git a/assets/admin/src/sidebar/index.vue b/assets/admin/src/sidebar/index.vue
index 943eddd..37182b4 100644
--- a/assets/admin/src/sidebar/index.vue
+++ b/assets/admin/src/sidebar/index.vue
@@ -431,6 +431,12 @@ $grid-gutter-width: 1.2rem;
                 padding: $grid-gutter-width / 1.3 $grid-gutter-width;
             }
         }
+
+        &:not(.active) {
+            &:hover {
+                width: 170px !important;
+            }
+        }
     }
 }
 </style>
diff --git a/composer.lock b/composer.lock
index 7815f62..7d3a501 100644
--- a/composer.lock
+++ b/composer.lock
@@ -155,16 +155,16 @@
         },
         {
             "name": "appaydin/pd-user",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appaydin/pd-user.git",
-                "reference": "b9921f64946fa6e195ef330a8f7bbfe94ba696cf"
+                "reference": "bb830275ae295aa6e094b3559a7a834e3d260926"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appaydin/pd-user/zipball/b9921f64946fa6e195ef330a8f7bbfe94ba696cf",
-                "reference": "b9921f64946fa6e195ef330a8f7bbfe94ba696cf",
+                "url": "https://api.github.com/repos/appaydin/pd-user/zipball/bb830275ae295aa6e094b3559a7a834e3d260926",
+                "reference": "bb830275ae295aa6e094b3559a7a834e3d260926",
                 "shasum": ""
             },
             "require": {
@@ -200,9 +200,9 @@
             ],
             "support": {
                 "issues": "https://github.com/appaydin/pd-user/issues",
-                "source": "https://github.com/appaydin/pd-user/tree/3.0.3"
+                "source": "https://github.com/appaydin/pd-user/tree/3.0.4"
             },
-            "time": "2021-05-31T20:14:23+00:00"
+            "time": "2021-06-03T21:35:14+00:00"
         },
         {
             "name": "appaydin/pd-widget",
@@ -867,50 +867,52 @@
         },
         {
             "name": "doctrine/doctrine-bundle",
-            "version": "2.3.2",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "d6b3c37804539a24ba8a7d647a6144cab2f13242"
+                "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d6b3c37804539a24ba8a7d647a6144cab2f13242",
-                "reference": "d6b3c37804539a24ba8a7d647a6144cab2f13242",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/4202ce675d29e70a8b9ee763bec021b6f44caccb",
+                "reference": "4202ce675d29e70a8b9ee763bec021b6f44caccb",
                 "shasum": ""
             },
             "require": {
+                "doctrine/cache": "^1.11 || ^2.0",
                 "doctrine/dbal": "^2.9.0|^3.0",
                 "doctrine/persistence": "^1.3.3|^2.0",
                 "doctrine/sql-formatter": "^1.0.1",
                 "php": "^7.1 || ^8.0",
-                "symfony/cache": "^4.3.3|^5.0",
-                "symfony/config": "^4.3.3|^5.0",
-                "symfony/console": "^3.4.30|^4.3.3|^5.0",
-                "symfony/dependency-injection": "^4.3.3|^5.0",
-                "symfony/doctrine-bridge": "^4.4.7|^5.0",
-                "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0",
+                "symfony/cache": "^4.3.3|^5.0|^6.0",
+                "symfony/config": "^4.4.3|^5.0|^6.0",
+                "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.3.3|^5.0|^6.0",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0",
+                "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
                 "symfony/service-contracts": "^1.1.1|^2.0"
             },
             "conflict": {
-                "doctrine/orm": "<2.6",
+                "doctrine/orm": "<2.9",
                 "twig/twig": "<1.34|>=2.0,<2.4"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
-                "doctrine/orm": "^2.6",
+                "doctrine/coding-standard": "^9.0",
+                "doctrine/orm": "^2.9",
                 "friendsofphp/proxy-manager-lts": "^1.0",
                 "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3",
                 "psalm/plugin-phpunit": "^0.15.1",
-                "psalm/plugin-symfony": "^2.2.4",
-                "symfony/phpunit-bridge": "^5.2",
-                "symfony/property-info": "^4.3.3|^5.0",
-                "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0",
-                "symfony/security-bundle": "^4.4|^5.0",
-                "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0",
-                "symfony/validator": "^3.4.30|^4.3.3|^5.0",
-                "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0",
-                "symfony/yaml": "^3.4.30|^4.3.3|^5.0",
+                "psalm/plugin-symfony": "^2.3.0",
+                "symfony/phpunit-bridge": "^5.2|^6.0",
+                "symfony/property-info": "^4.3.3|^5.0|^6.0",
+                "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0|^6.0",
+                "symfony/security-bundle": "^4.4|^5.0|^6.0",
+                "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0|^6.0",
+                "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0",
+                "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0",
+                "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0",
                 "twig/twig": "^1.34|^2.12|^3.0",
                 "vimeo/psalm": "^4.7"
             },
@@ -957,7 +959,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/DoctrineBundle/issues",
-                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.3.2"
+                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.4.2"
             },
             "funding": [
                 {
@@ -973,7 +975,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-06T19:21:22+00:00"
+            "time": "2021-06-05T13:40:39+00:00"
         },
         {
             "name": "doctrine/doctrine-migrations-bundle",
@@ -3841,16 +3843,16 @@
         },
         {
             "name": "symfony/doctrine-bridge",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/doctrine-bridge.git",
-                "reference": "b2b0193ab3f1db4108f5a445896650803f36bf47"
+                "reference": "29516dcc8165bc7e2339182a9360ea7d3471fb03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/b2b0193ab3f1db4108f5a445896650803f36bf47",
-                "reference": "b2b0193ab3f1db4108f5a445896650803f36bf47",
+                "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/29516dcc8165bc7e2339182a9360ea7d3471fb03",
+                "reference": "29516dcc8165bc7e2339182a9360ea7d3471fb03",
                 "shasum": ""
             },
             "require": {
@@ -3934,7 +3936,7 @@
             "description": "Provides integration for Doctrine with various Symfony components",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/doctrine-bridge/tree/v5.3.0"
+                "source": "https://github.com/symfony/doctrine-bridge/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -3950,7 +3952,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-01T15:43:02+00:00"
         },
         {
             "name": "symfony/doctrine-messenger",
@@ -4884,16 +4886,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "31f25d99b329a1461f42bcef8505b54926a30be6"
+                "reference": "8827b90cf8806e467124ad476acd15216c2fceb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/31f25d99b329a1461f42bcef8505b54926a30be6",
-                "reference": "31f25d99b329a1461f42bcef8505b54926a30be6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8827b90cf8806e467124ad476acd15216c2fceb6",
+                "reference": "8827b90cf8806e467124ad476acd15216c2fceb6",
                 "shasum": ""
             },
             "require": {
@@ -4937,7 +4939,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.3.0"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -4953,20 +4955,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-02T09:32:00+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f"
+                "reference": "74eb022e3bac36b3d3a897951a98759f2b32b864"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f",
-                "reference": "f8e8f5391b6909e2f0ba8c12220ab7af3050eb4f",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/74eb022e3bac36b3d3a897951a98759f2b32b864",
+                "reference": "74eb022e3bac36b3d3a897951a98759f2b32b864",
                 "shasum": ""
             },
             "require": {
@@ -5049,7 +5051,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.3.0"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -5065,7 +5067,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-31T10:44:03+00:00"
+            "time": "2021-06-02T10:07:12+00:00"
         },
         {
             "name": "symfony/intl",
@@ -5870,16 +5872,16 @@
         },
         {
             "name": "symfony/property-info",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-info.git",
-                "reference": "64d7dfb197749b0e00c6d8dcd5629fd6fac352f7"
+                "reference": "6f8bff281f215dbf41929c7ec6f8309cdc0912cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-info/zipball/64d7dfb197749b0e00c6d8dcd5629fd6fac352f7",
-                "reference": "64d7dfb197749b0e00c6d8dcd5629fd6fac352f7",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/6f8bff281f215dbf41929c7ec6f8309cdc0912cf",
+                "reference": "6f8bff281f215dbf41929c7ec6f8309cdc0912cf",
                 "shasum": ""
             },
             "require": {
@@ -5940,7 +5942,7 @@
                 "validator"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-info/tree/v5.3.0"
+                "source": "https://github.com/symfony/property-info/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -5956,7 +5958,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-05-31T12:40:48+00:00"
         },
         {
             "name": "symfony/redis-messenger",
@@ -6296,16 +6298,16 @@
         },
         {
             "name": "symfony/security-core",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/security-core.git",
-                "reference": "cb23eaff3fe09ba81b5c25ffe25c1c5b9b1cdfc5"
+                "reference": "22714af1f701937a0a0bd3e3ec2a761baed3f2d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-core/zipball/cb23eaff3fe09ba81b5c25ffe25c1c5b9b1cdfc5",
-                "reference": "cb23eaff3fe09ba81b5c25ffe25c1c5b9b1cdfc5",
+                "url": "https://api.github.com/repos/symfony/security-core/zipball/22714af1f701937a0a0bd3e3ec2a761baed3f2d0",
+                "reference": "22714af1f701937a0a0bd3e3ec2a761baed3f2d0",
                 "shasum": ""
             },
             "require": {
@@ -6369,7 +6371,7 @@
             "description": "Symfony Security Component - Core Library",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/security-core/tree/v5.3.0"
+                "source": "https://github.com/symfony/security-core/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -6385,7 +6387,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-01T15:43:02+00:00"
         },
         {
             "name": "symfony/security-csrf",
@@ -6527,16 +6529,16 @@
         },
         {
             "name": "symfony/security-http",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/security-http.git",
-                "reference": "6bbbf9c7ed01646937512122fc453976b6fb5161"
+                "reference": "195f7207dec4519ca8b0e407ba921ec239aa5cee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-http/zipball/6bbbf9c7ed01646937512122fc453976b6fb5161",
-                "reference": "6bbbf9c7ed01646937512122fc453976b6fb5161",
+                "url": "https://api.github.com/repos/symfony/security-http/zipball/195f7207dec4519ca8b0e407ba921ec239aa5cee",
+                "reference": "195f7207dec4519ca8b0e407ba921ec239aa5cee",
                 "shasum": ""
             },
             "require": {
@@ -6592,7 +6594,7 @@
             "description": "Symfony Security Component - HTTP Integration",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/security-http/tree/v5.3.0"
+                "source": "https://github.com/symfony/security-http/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -6608,20 +6610,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-01T15:43:02+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "c8b06eeea68ea0fd0878cde880e65d5d6fa01464"
+                "reference": "ebb3dc397af77a08d734eea7305e0b2ec8c5e875"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/c8b06eeea68ea0fd0878cde880e65d5d6fa01464",
-                "reference": "c8b06eeea68ea0fd0878cde880e65d5d6fa01464",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/ebb3dc397af77a08d734eea7305e0b2ec8c5e875",
+                "reference": "ebb3dc397af77a08d734eea7305e0b2ec8c5e875",
                 "shasum": ""
             },
             "require": {
@@ -6636,7 +6638,7 @@
                 "phpdocumentor/type-resolver": "<1.4.0",
                 "symfony/dependency-injection": "<4.4",
                 "symfony/property-access": "<4.4",
-                "symfony/property-info": "<4.4",
+                "symfony/property-info": "<5.3",
                 "symfony/yaml": "<4.4"
             },
             "require-dev": {
@@ -6694,7 +6696,7 @@
             "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v5.3.0"
+                "source": "https://github.com/symfony/serializer/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -6710,7 +6712,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-02T09:36:17+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -7319,16 +7321,16 @@
         },
         {
             "name": "symfony/validator",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "14337bdf9e2e0b2e3385c9e90f13325f0c95a4f9"
+                "reference": "111e71ac585a47358e808bc687dcaf66e568470a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/14337bdf9e2e0b2e3385c9e90f13325f0c95a4f9",
-                "reference": "14337bdf9e2e0b2e3385c9e90f13325f0c95a4f9",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/111e71ac585a47358e808bc687dcaf66e568470a",
+                "reference": "111e71ac585a47358e808bc687dcaf66e568470a",
                 "shasum": ""
             },
             "require": {
@@ -7347,6 +7349,7 @@
                 "symfony/expression-language": "<5.1",
                 "symfony/http-kernel": "<4.4",
                 "symfony/intl": "<4.4",
+                "symfony/property-info": "<5.3",
                 "symfony/translation": "<4.4",
                 "symfony/yaml": "<4.4"
             },
@@ -7408,7 +7411,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v5.3.0"
+                "source": "https://github.com/symfony/validator/tree/v5.3.1"
             },
             "funding": [
                 {
@@ -7424,7 +7427,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-06-02T09:36:17+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -8658,16 +8661,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.4",
+            "version": "9.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741"
+                "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276",
+                "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276",
                 "shasum": ""
             },
             "require": {
@@ -8697,7 +8700,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3",
+                "sebastian/type": "^2.3.2",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -8745,7 +8748,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5"
             },
             "funding": [
                 {
@@ -8757,7 +8760,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-23T07:16:29+00:00"
+            "time": "2021-06-05T04:49:07+00:00"
         },
         {
             "name": "roave/security-advisories",
@@ -8765,12 +8768,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "80f32ef3cff7c3b5b650d8aa823437b43d5c5056"
+                "reference": "9460a22455b82b353d2212fecedebcf73b141baa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/80f32ef3cff7c3b5b650d8aa823437b43d5c5056",
-                "reference": "80f32ef3cff7c3b5b650d8aa823437b43d5c5056",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9460a22455b82b353d2212fecedebcf73b141baa",
+                "reference": "9460a22455b82b353d2212fecedebcf73b141baa",
                 "shasum": ""
             },
             "conflict": {
@@ -8920,6 +8923,7 @@
                 "paypal/merchant-sdk-php": "<3.12",
                 "pear/archive_tar": "<1.4.12",
                 "personnummer/personnummer": "<3.0.2",
+                "phanan/koel": "<5.1.4",
                 "phpfastcache/phpfastcache": ">=5,<5.0.13",
                 "phpmailer/phpmailer": "<6.1.6|>=6.1.8,<6.4.1",
                 "phpmussel/phpmussel": ">=1,<1.6",
@@ -9117,7 +9121,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T16:24:26+00:00"
+            "time": "2021-06-01T22:04:47+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -9976,16 +9980,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.1",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
+                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
-                "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1",
+                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1",
                 "shasum": ""
             },
             "require": {
@@ -10020,7 +10024,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.2"
             },
             "funding": [
                 {
@@ -10028,7 +10032,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:18:59+00:00"
+            "time": "2021-06-04T13:02:07+00:00"
         },
         {
             "name": "sebastian/version",
diff --git a/templates/admin/account/listGroup.html.twig b/templates/admin/account/listGroup.html.twig
index a3c98c4..2d8d89a 100755
--- a/templates/admin/account/listGroup.html.twig
+++ b/templates/admin/account/listGroup.html.twig
@@ -1,7 +1,13 @@
 {# Template Parts #}
 {% extends "admin/layout/base.html.twig" %}
 {% block head_title %}{{ title('accounts.group.title'|trans) }}{% endblock %}
-{% block content_title %}<i class="fas fa-user-shield"></i>{{ 'accounts.group.title'|trans }}{% endblock %}
+{% block content_title %}
+    <i class="fas fa-user-shield"></i>{{ 'accounts.group.title'|trans }}
+
+    {% if is_granted('ROLE_GROUP_CREATE') %}
+        <a @click.prevent="$refs.former.get('{{ path('admin.group_create') }}', '{{ 'accounts.group.add_title'|trans }}', 'append')" class="ms-3 clear-line-height btn btn-sm btn-primary"><i class="fas fa-plus"></i>{{ 'accounts.group.add'|trans }}</a>
+    {% endif %}
+{% endblock %}
 
 {# Content Body #}
 {% block content_body %}
@@ -15,16 +21,21 @@
         ref="table"
     >
         <template v-slot:actions="{item, index, remove}">
-            <li><a class="dropdown-item" @click.prevent="$refs.former.get(route('{{ route('admin.group_edit') }}', {'{group}': item.id}), '{{ 'accounts.group.edit_title'|trans }}', index)"><i class="fas fa-user-edit"></i>{{ 'button.edit'|trans }}</a></li>
-            <li><a class="dropdown-item" @click.prevent="$refs.former.get(route('{{ route('admin.group_roles') }}', {'{group}': item.id}), '{{ 'accounts.group.roles'|trans }}', index)"><i class="fas fa-user-lock"></i>{{ 'accounts.group.roles'|trans }}</a></li>
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item text-danger" v-confirm="'danger'" data-msg="{{ 'confirm.delete'|trans }}"
-                   data-yes="{{ 'button.yes'|trans }}" data-no="{{ 'button.cancel'|trans }}"
-                   @confirmed="del(item, index, remove)"><i class="fas fa-trash"></i>{{ 'button.delete'|trans }}</a>
-            </li>
-        </template>
-        <template v-slot:header-left>
-            <a @click.prevent="$refs.former.get('{{ path('admin.group_create') }}', '{{ 'accounts.group.add_title'|trans }}', 'append')" class="btn btn-sm btn-primary"><i class="fas fa-plus"></i>{{ 'accounts.group.add'|trans }}</a>
+            {% if is_granted('ROLE_GROUP_EDIT') %}
+                <li><a class="dropdown-item" @click.prevent="$refs.former.get(route('{{ route('admin.group_edit') }}', {'{group}': item.id}), '{{ 'accounts.group.edit_title'|trans }}', index)"><i class="fas fa-user-edit"></i>{{ 'button.edit'|trans }}</a></li>
+            {% endif %}
+
+            {% if is_granted('ROLE_GROUP_ROLES') %}
+                <li><a class="dropdown-item" @click.prevent="$refs.former.get(route('{{ route('admin.group_roles') }}', {'{group}': item.id}), '{{ 'accounts.group.roles'|trans }}', index)"><i class="fas fa-user-lock"></i>{{ 'accounts.group.roles'|trans }}</a></li>
+            {% endif %}
+
+            {% if is_granted('ROLE_GROUP_DELETE') %}
+                <li><hr class="dropdown-divider"></li>
+                <li><a class="dropdown-item text-danger" v-confirm="'danger'" data-msg="{{ 'confirm.delete'|trans }}"
+                       data-yes="{{ 'button.yes'|trans }}" data-no="{{ 'button.cancel'|trans }}"
+                       @confirmed="del(item, index, remove)"><i class="fas fa-trash"></i>{{ 'button.delete'|trans }}</a>
+                </li>
+            {% endif %}
         </template>
     </datatable>
 
@@ -32,11 +43,10 @@
         window.vueApp.push({
             methods: {
                 del(item, index, remove) {
-                    this.$root.http.delete(this.route('{{ route('admin.group_delete') }}', {'{group}': item.id}))
-                        .then((resp) => {
-                            remove(index);
-                            this.$root.msg.success('{{ 'message.deleted'|trans }}')
-                        })
+                    this.$root.http.delete(this.route('{{ route('admin.group_delete') }}', {'{group}': item.id})).then((resp) => {
+                        remove(index);
+                        this.$root.msg.success('{{ 'message.deleted'|trans }}')
+                    })
                 }
             }
         })
diff --git a/templates/admin/layout/forms/form_div_layout.html.twig b/templates/admin/layout/forms/form_div_layout.html.twig
index 571f84e..af78cb3 100644
--- a/templates/admin/layout/forms/form_div_layout.html.twig
+++ b/templates/admin/layout/forms/form_div_layout.html.twig
@@ -352,7 +352,7 @@
             {%- endif -%}
         {#</p>#}
 
-        <a class="help-popover" v-popover="{{- h|json_encode -}}" href="#!"><i class="fas fa-question-circle"></i></a>
+        <a class="help-popover" v-popover="'{{ h|escape('js') }}'" href="#!"><i class="fas fa-question-circle"></i></a>
     {%- endif -%}
 {%- endblock form_help %}