diff --git a/src/Controllers/Users/PermissionController.php b/src/Controllers/Users/PermissionController.php
index 11c02db..7a8e38d 100644
--- a/src/Controllers/Users/PermissionController.php
+++ b/src/Controllers/Users/PermissionController.php
@@ -109,7 +109,7 @@ public function edit($id)
     public function update($id)
     {
         $validationRules = [
-            'name'        => 'required|max_length[255]|is_unique[auth_permissions.name]',
+            'name'        => "required|max_length[255]|is_unique[auth_permissions.name,id,$id]",
             'description' => 'required|max_length[255]',
         ];
 
diff --git a/src/Views/Permission/index.php b/src/Views/Permission/index.php
index a6a9240..82c27f7 100644
--- a/src/Views/Permission/index.php
+++ b/src/Views/Permission/index.php
@@ -49,7 +49,7 @@
         paging: true,
         lengthChange: true,
         searching: true,
-        ordering: true,
+        ordering: false,
         info: true,
         autoWidth: false,
 
@@ -61,9 +61,14 @@
             { 'data': null },
             { 'data': 'name' },
             { 'data': 'description' },
-            { 
-                'data': function (data) {
-                    return '<button type="button" class="btn btn-primary btn-sm btn-edit" data-id="' + data.id + '"><span class="fa fa-fw fa-pencil-alt"></span></button> <button type="button" class="btn btn-danger btn-sm btn-delete" data-id="' + data.id + '"><span class="fa fa-fw fa-trash"></span></button>';
+            {
+                "data": function(data) {
+                    return `<td class="text-right py-0 align-middle">
+                            <div class="btn-group btn-group-sm">
+                                <button class="btn btn-primary btn-edit" data-id="${data.id}"><i class="fas fa-pencil-alt"></i></button>
+                                <button class="btn btn-danger btn-delete" data-id="${data.id}"><i class="fas fa-trash"></i></button>
+                            </div>
+                            </td>`
                 }
             }
         ]
diff --git a/src/Views/Role/index.php b/src/Views/Role/index.php
index 7758d70..e23da8c 100644
--- a/src/Views/Role/index.php
+++ b/src/Views/Role/index.php
@@ -58,8 +58,13 @@
             { 'data': 'name' },
             { 'data': 'description' },
             {
-                'data': function (data) {
-                    return '<a href="<?= route_to('admin/role') ?>/'+ data.id +'/edit" class="btn btn-primary btn-sm btn-edit"><span class="fa fa-fw fa-pencil-alt"></span></a> <button type="button" class="btn btn-danger btn-sm btn-delete" data-id="' + data.id + '"><span class="fa fa-fw fa-trash"></span></button>';
+                "data": function(data) {
+                    return `<td class="text-right py-0 align-middle">
+                            <div class="btn-group btn-group-sm">
+                                <a href="<?= route_to('admin/role') ?>/${data.id}/edit" class="btn btn-primary btn-edit"><i class="fas fa-pencil-alt"></i></a>
+                                <button class="btn btn-danger btn-delete" data-id="${data.id}"><i class="fas fa-trash"></i></button>
+                            </div>
+                            </td>`
                 }
             }
         ]
diff --git a/src/Views/User/index.php b/src/Views/User/index.php
index de5ce53..409c8fe 100644
--- a/src/Views/User/index.php
+++ b/src/Views/User/index.php
@@ -60,9 +60,14 @@
                     return `<span class="badge ${data.active == 1 ? 'bg-success' : 'bg-danger'}">${data.active == 1 ? '<?= lang('user.active') ?>' : '<?= lang('user.non_active') ?>'}</span>`
                 }
             },
-            { 
-                'data': function (data) {
-                    return `<a href="<?= route_to('admin/user/manage') ?>/${data.id}/edit" class="btn btn-primary btn-sm btn-edit" data-id="${data.id}"><span class="fa fa-fw fa-pencil-alt"></span></a> <button type="button" class="btn btn-danger btn-sm btn-delete" data-id="${data.id}"><span class="fa fa-fw fa-trash"></span></button>`;
+            {
+                "data": function(data) {
+                    return `<td class="text-right py-0 align-middle">
+                            <div class="btn-group btn-group-sm">
+                                <a href="<?= route_to('admin/user/manage') ?>/${data.id}/edit" class="btn btn-primary btn-edit"><i class="fas fa-pencil-alt"></i></a>
+                                <button class="btn btn-danger btn-delete" data-id="${data.id}"><i class="fas fa-trash"></i></button>
+                            </div>
+                            </td>`
                 }
             }
         ]