diff --git a/resources/js/Pages/Superuser/Menu/Index.vue b/resources/js/Pages/Superuser/Menu/Index.vue
index 8824b0a..9aef9aa 100644
--- a/resources/js/Pages/Superuser/Menu/Index.vue
+++ b/resources/js/Pages/Superuser/Menu/Index.vue
@@ -9,6 +9,7 @@ import axios from 'axios'
 import Swal from 'sweetalert2'
 import Select from '@vueform/multiselect'
 import Nested from './Nested.vue'
+import Modal from '@/Components/Modal.vue'
 
 const self = getCurrentInstance()
 const { permissions, routes, icons } = defineProps({
@@ -160,150 +161,130 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
     </Card>
   </DashboardLayout>
 
-  <transition
-    enterActiveClass="transition-all duration-500"
-    leaveActiveClass="transition-all duration-500"
-    enterFromClass="opacity-0"
-    leaveToClass="opacity-0">
-    <div v-if="open || icon" class="fixed top-0 left-0 w-full h-screen bg-black bg-opacity-80 overflow-auto z-20 blur-3xl"></div>
-  </transition>
-
-  <transition
-    enterActiveClass="transition-all duration-150"
-    leaveActiveClass="transition-all duration-150"
-    enterFromClass="-translate-y-full opacity-0"
-    leaveToClass="-translate-y-full opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-screen flex justify-center z-20 p-10 overflow-auto">
-      <form @submit.prevent="submit" class="w-full max-w-xl sm:max-w-5xl rounded-md shadow-xl">
-        <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
-          <template #header>
-            <div class="flex items-center space-x-2 p-2 justify-end bg-gray-200 dark:bg-gray-800">
-              <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
-            </div>
-          </template>
-
-          <template #body>
-            <div class="flex flex-col space-y-2 p-4">
-              <div class="flex flex-col space-y-1">
-                <div class="flex items-center space-x-2">
-                  <label for="name" class="lowercase first-letter:capitalize w-1/3">name</label>
-                  <input type="text" name="name" v-model="form.name" ref="name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 border dark:border-gray-800 uppercase placeholder:capitalize" placeholder="name" required>
-                </div>
-
-                <div v-if="form.errors.name" class="text-right text-sm text-red-500">{{ form.errors.name }}</div>
-              </div>
-
-              <div class="flex flex-col space-y-1">
-                <div class="flex items-center space-x-2">
-                  <label for="route_or_url" class="lowercase first-letter:capitalize w-1/3">route name or url</label>
-                  <Select
-                    v-model="form.route_or_url"
-                    :options="routes"
-                    :searchable="true"
-                    :createOption="true"
-                    :value="form.route_or_url"
-                    class="text-gray-800 placeholder:capitalize"
-                    placeholder="route name or url" />
-                </div>
-
-                <div v-if="form.errors.route_or_url" class="text-right text-sm text-red-500">{{ form.errors.route_or_url }}</div>
-              </div>
-
-              <div class="flex flex-col space-y-1">
-                <div class="flex items-center space-x-2">
-                  <label for="actives" class="lowercase first-letter:capitalize w-1/3">actives</label>
-                  <Select
-                    v-model="form.actives"
-                    :options="[...routes, ...form.actives.filter(active => ! routes.includes(active))]"
-                    :searchable="true"
-                    :closeOnSelect="false"
-                    :clearOnSelect="false"
-                    :createTag="true"
-                    mode="tags"
-                    class="text-gray-800 placeholder:capitalize"
-                    placeholder="actives" />
-                </div>
-
-                <div v-if="form.errors.actives" class="text-right text-sm text-red-500">{{ form.errors.actives }}</div>
-              </div>
-
-              <div class="flex flex-col space-y-1">
-                <div class="flex items-center space-x-2">
-                  <label for="permissions" class="lowercase first-letter:capitalize w-1/3">permissions</label>
-                  <Select
-                    v-model="form.permissions"
-                    :options="permissions.map(p => ({
-                      label: p.name,
-                      value: p.id,
-                    }))"
-                    :searchable="true"
-                    :closeOnSelect="false"
-                    :clearOnSelect="false"
-                    mode="tags"
-                    class="text-gray-800 placeholder:capitalize"
-                    placeholder="permissions" />
-                </div>
-
-                <div v-if="form.errors.permissions" class="text-right text-sm text-red-500">{{ form.errors.permissions }}</div>
-              </div>
-
-              <div class="flex items-center space-x-2">
-                <label class="flex-none lowercase first-letter:capitalize w-1/4">icon</label>
-
-                <div class="flex items-center justify-between w-full">
-                  <p class="text-3xl">
-                    <Icon :name="form.icon" class="dark:text-white" />
-                  </p>
-
-                  <p class="text-sm uppercase">{{ form.icon }}</p>
-                  
-                  <button @click.prevent="icon = true" type="button" class="bg-blue-600 hover hover:bg-blue-700 rounded-md px-3 py-1 text-white text-sm transition-all">
-                    <div class="flex items-center space-x-1">
-                      <Icon name="edit" />
-
-                      <p class="uppercase font-semibold">change</p>
-                    </div>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </template>
-
-          <template #footer>
-            <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 py-1 px-2">
-              <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-white text-sm transition-all">
-                <div class="flex items-center space-x-1">
-                  <Icon name="check" />
-                  <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
-                </div>
-              </button>
-            </div>
-          </template>
-        </Card>
-      </form>
-    </div>
-  </transition>
-
-  <transition
-    enterActiveClass="transition-all duration-150"
-    leaveActiveClass="transition-all duration-150"
-    enterFromClass="-translate-y-full opacity-0"
-    leaveToClass="-translate-y-full opacity-0">
-    <div v-if="icon" class="fixed top-0 left-0 w-full h-screen flex justify-center overflow-auto z-20 p-10">
-      <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100 w-full max-w-xl sm:max-w-5xl max-h-96 overflow-auto">
+  <Modal :show="open">
+    <form @submit.prevent="submit" class="w-full max-w-xl sm:max-w-5xl rounded-md shadow-xl">
+      <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
         <template #header>
-          <div class="flex items-center space-x-2 p-2 justify-end bg-gray-200 dark:bg-gray-800 sticky top-0 left-0">
-            <input type="search" v-model="search" class="py-1 w-full bg-white dark:bg-transparent rounded-md text-sm uppercase" placeholder="search something">
-            <Icon @click.prevent="icon = false" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
+          <div class="flex items-center space-x-2 p-2 justify-end bg-gray-200 dark:bg-gray-800">
+            <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
           </div>
         </template>
 
         <template #body>
-          <div class="flex-wrap p-4">
-            <Icon v-for="(icx, i) in icons.filter(icx => icx.includes(search.trim().toLocaleLowerCase()))" :key="i" @click.prevent="form.icon = icx; icon = false" :name="icx" class="m-1 text-5xl px-2 py-1 text-gray-800 bg-gray-200 hover:bg-gray-100 dark:text-white dark:bg-gray-600 dark:hover:bg-gray-700 rounded-md cursor-pointer transition-all" />
+          <div class="flex flex-col space-y-2 p-4">
+            <div class="flex flex-col space-y-1">
+              <div class="flex items-center space-x-2">
+                <label for="name" class="lowercase first-letter:capitalize w-1/3">name</label>
+                <input type="text" name="name" v-model="form.name" ref="name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 border dark:border-gray-800 uppercase placeholder:capitalize" placeholder="name" required>
+              </div>
+
+              <div v-if="form.errors.name" class="text-right text-sm text-red-500">{{ form.errors.name }}</div>
+            </div>
+
+            <div class="flex flex-col space-y-1">
+              <div class="flex items-center space-x-2">
+                <label for="route_or_url" class="lowercase first-letter:capitalize w-1/3">route name or url</label>
+                <Select
+                  v-model="form.route_or_url"
+                  :options="routes"
+                  :searchable="true"
+                  :createOption="true"
+                  :value="form.route_or_url"
+                  class="text-gray-800 placeholder:capitalize"
+                  placeholder="route name or url" />
+              </div>
+
+              <div v-if="form.errors.route_or_url" class="text-right text-sm text-red-500">{{ form.errors.route_or_url }}</div>
+            </div>
+
+            <div class="flex flex-col space-y-1">
+              <div class="flex items-center space-x-2">
+                <label for="actives" class="lowercase first-letter:capitalize w-1/3">actives</label>
+                <Select
+                  v-model="form.actives"
+                  :options="[...routes, ...form.actives.filter(active => ! routes.includes(active))]"
+                  :searchable="true"
+                  :closeOnSelect="false"
+                  :clearOnSelect="false"
+                  :createTag="true"
+                  mode="tags"
+                  class="text-gray-800 placeholder:capitalize"
+                  placeholder="actives" />
+              </div>
+
+              <div v-if="form.errors.actives" class="text-right text-sm text-red-500">{{ form.errors.actives }}</div>
+            </div>
+
+            <div class="flex flex-col space-y-1">
+              <div class="flex items-center space-x-2">
+                <label for="permissions" class="lowercase first-letter:capitalize w-1/3">permissions</label>
+                <Select
+                  v-model="form.permissions"
+                  :options="permissions.map(p => ({
+                    label: p.name,
+                    value: p.id,
+                  }))"
+                  :searchable="true"
+                  :closeOnSelect="false"
+                  :clearOnSelect="false"
+                  mode="tags"
+                  class="text-gray-800 placeholder:capitalize"
+                  placeholder="permissions" />
+              </div>
+
+              <div v-if="form.errors.permissions" class="text-right text-sm text-red-500">{{ form.errors.permissions }}</div>
+            </div>
+
+            <div class="flex items-center space-x-2">
+              <label class="flex-none lowercase first-letter:capitalize w-1/4">icon</label>
+
+              <div class="flex items-center justify-between w-full">
+                <p class="text-3xl">
+                  <Icon :name="form.icon" class="dark:text-white" />
+                </p>
+
+                <p class="text-sm uppercase">{{ form.icon }}</p>
+                
+                <button @click.prevent="icon = true" type="button" class="bg-blue-600 hover hover:bg-blue-700 rounded-md px-3 py-1 text-white text-sm transition-all">
+                  <div class="flex items-center space-x-1">
+                    <Icon name="edit" />
+
+                    <p class="uppercase font-semibold">change</p>
+                  </div>
+                </button>
+              </div>
+            </div>
+          </div>
+        </template>
+
+        <template #footer>
+          <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 py-1 px-2">
+            <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-white text-sm transition-all">
+              <div class="flex items-center space-x-1">
+                <Icon name="check" />
+                <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
+              </div>
+            </button>
           </div>
         </template>
       </Card>
-    </div>
-  </transition>
+    </form>
+  </Modal>
+
+  <Modal :show="icon">
+    <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100 w-full max-w-xl sm:max-w-5xl max-h-96 overflow-auto">
+      <template #header>
+        <div class="flex items-center space-x-2 p-2 justify-end bg-gray-200 dark:bg-gray-800 sticky top-0 left-0">
+          <input type="search" v-model="search" class="py-1 w-full bg-white dark:bg-transparent rounded-md text-sm uppercase" placeholder="search something">
+          <Icon @click.prevent="icon = false" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
+        </div>
+      </template>
+
+      <template #body>
+        <div class="flex-wrap p-4">
+          <Icon v-for="(icx, i) in icons.filter(icx => icx.includes(search.trim().toLocaleLowerCase()))" :key="i" @click.prevent="form.icon = icx; icon = false" :name="icx" class="m-1 text-5xl px-2 py-1 text-gray-800 bg-gray-200 hover:bg-gray-100 dark:text-white dark:bg-gray-600 dark:hover:bg-gray-700 rounded-md cursor-pointer transition-all" />
+        </div>
+      </template>
+    </Card>
+  </Modal>
 </template>
\ No newline at end of file
diff --git a/resources/js/Pages/Superuser/Permission/Index.vue b/resources/js/Pages/Superuser/Permission/Index.vue
index 547290a..9983b87 100644
--- a/resources/js/Pages/Superuser/Permission/Index.vue
+++ b/resources/js/Pages/Superuser/Permission/Index.vue
@@ -7,6 +7,7 @@ import DashboardLayout from '@/Layouts/DashboardLayout.vue'
 import Card from '@/Components/Card.vue'
 import Icon from '@/Components/Icon.vue'
 import { Inertia } from '@inertiajs/inertia'
+import Modal from '@/Components/Modal.vue'
 
 const self = getCurrentInstance()
 const permissions = ref([])
@@ -135,56 +136,42 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
       </template>
     </Card>
   </DashboardLayout>
+  
+  <Modal :show="open">
+    <form @submit.prevent="submit" class="w-full max-w-xl shadow-xl">
+      <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100 border dark:border-gray-700">
+        <template #header>
+          <div class="flex items-center space-x-2 justify-end bg-gray-200 dark:bg-gray-800 dark:text-gray-50 p-2">
+            <Icon @click.prevent="close" name="times" class="border border-transparent dark:bg-gray-700 px-2 py-1 rounded-md cursor-pointer transition-all bg-gray-300 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:border-gray-600" />
+          </div>
+        </template>
 
-  <transition
-    enterActiveClass="transition-all duration-500"
-    leaveActiveClass="transition-all duration-500"
-    enterFromClass="opacity-0"
-    leaveToClass="opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-screen bg-black bg-opacity-80 z-20 overflow-hidden blur-3xl"></div>
-  </transition>
-
-  <transition
-    enterActiveClass="transition-all duration-150"
-    leaveActiveClass="transition-all duration-150"
-    enterFromClass="-translate-y-full opacity-0"
-    leaveToClass="-translate-y-full opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-screen flex justify-center overflow-auto z-20 p-10">
-      <form @submit.prevent="submit" class="w-full max-w-xl shadow-xl">
-        <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100 border dark:border-gray-700">
-          <template #header>
-            <div class="flex items-center space-x-2 justify-end bg-gray-200 dark:bg-gray-800 dark:text-gray-50 p-2">
-              <Icon @click.prevent="close" name="times" class="border border-transparent dark:bg-gray-700 px-2 py-1 rounded-md cursor-pointer transition-all bg-gray-300 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:border-gray-600" />
-            </div>
-          </template>
-
-          <template #body>
-            <div class="flex flex-col space-y-4 p-4">
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="name" class="lowercase first-letter:capitalize flex-none w-1/4">name</label>
-                  <input ref="name" type="text" v-model="form.name" class="bg-transparent w-full rounded-md px-3 py-1 text-sm placeholder:capitalize" placeholder="name">
-                </div>
-                
-                <transition name="fade">
-                  <div v-if="form.errors.name" class="text-red-400 text-sm text-right">{{ form.errors.name }}</div>
-                </transition>
+        <template #body>
+          <div class="flex flex-col space-y-4 p-4">
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="name" class="lowercase first-letter:capitalize flex-none w-1/4">name</label>
+                <input ref="name" type="text" v-model="form.name" class="bg-transparent w-full rounded-md px-3 py-1 text-sm placeholder:capitalize" placeholder="name">
               </div>
+              
+              <transition name="fade">
+                <div v-if="form.errors.name" class="text-red-400 text-sm text-right">{{ form.errors.name }}</div>
+              </transition>
             </div>
-          </template>
+          </div>
+        </template>
 
-          <template #footer>
-            <div class="flex items-center space-x-2 justify-end bg-gray-200 dark:bg-gray-800 text-white px-2 py-1">
-              <button type="submit" class="bg-green-600 rounded-md px-3 py-1 text-sm transition-all hover:bg-green-700">
-                <div class="flex items-center space-x-1">
-                  <Icon name="check" />
-                  <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
-                </div>
-              </button>
-            </div>
-          </template>
-        </Card>
-      </form>
-    </div>
-  </transition>
+        <template #footer>
+          <div class="flex items-center space-x-2 justify-end bg-gray-200 dark:bg-gray-800 text-white px-2 py-1">
+            <button type="submit" class="bg-green-600 rounded-md px-3 py-1 text-sm transition-all hover:bg-green-700">
+              <div class="flex items-center space-x-1">
+                <Icon name="check" />
+                <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
+              </div>
+            </button>
+          </div>
+        </template>
+      </Card>
+    </form>
+  </Modal>
 </template>
\ No newline at end of file
diff --git a/resources/js/Pages/Superuser/Role/Index.vue b/resources/js/Pages/Superuser/Role/Index.vue
index c9318bd..710c46b 100644
--- a/resources/js/Pages/Superuser/Role/Index.vue
+++ b/resources/js/Pages/Superuser/Role/Index.vue
@@ -9,6 +9,7 @@ import Builder from '@/Components/DataTable/Builder.vue'
 import Th from '@/Components/DataTable/Th.vue'
 import Swal from 'sweetalert2'
 import Select from '@vueform/multiselect'
+import Modal from '@/Components/Modal.vue'
 
 const self = getCurrentInstance()
 const { permissions } = defineProps({
@@ -31,7 +32,6 @@ const show = () => {
 const close = () => {
   open.value = false
   form.reset()
-  tableRefresh.value && tableRefresh.value()
 }
 
 const detach = async (role, permission, refresh) => {
@@ -190,73 +190,59 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
     </Card>
   </DashboardLayout>
 
-  <transition
-    enterActiveClass="transition-all duration-500"
-    leaveActiveClass="transition-all duration-500"
-    enterFromClass="opacity-0"
-    leaveToClass="opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-full bg-black bg-opacity-80 z-20 overflow-hidden blur-3xl"></div>
-  </transition>
+  <Modal :show="open">
+    <form @submit.prevent="submit" class="w-full max-w-xl shadow-xl">
+      <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
+        <template #header>
+          <div class="flex items-center justify-end bg-gray-200 dark:bg-gray-800 p-2">
+            <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
+          </div>
+        </template>
 
-  <transition
-    enterActiveClass="transition-all duration-150"
-    leaveActiveClass="transition-all duration-150"
-    enterFromClass="-translate-y-full opacity-0"
-    leaveToClass="-translate-y-full opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-full flex justify-center overflow-auto z-20 p-10">
-      <form @submit.prevent="submit" class="w-full max-w-xl shadow-xl">
-        <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
-          <template #header>
-            <div class="flex items-center justify-end bg-gray-200 dark:bg-gray-800 p-2">
-              <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
-            </div>
-          </template>
-
-          <template #body>
-            <div class="flex flex-col space-y-4 p-4">
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="name" class="w-1/3 lowercase first-letter:capitalize">name</label>
-                  <input ref="name" type="text" name="name" v-model="form.name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="name" required>
-                </div>
-
-                <p v-if="form.errors.name" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.name }}</p>
+        <template #body>
+          <div class="flex flex-col space-y-4 p-4">
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="name" class="w-1/3 lowercase first-letter:capitalize">name</label>
+                <input ref="name" type="text" name="name" v-model="form.name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="name" required>
               </div>
 
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="permissions" class="w-1/3 lowercase first-letter:capitalize">permissions</label>
-                  <Select
-                    v-model="form.permissions"
-                    :options="permissions.map(p => ({
-                      label: p.name,
-                      value: p.id,
-                    }))"
-                    :searchable="true"
-                    :clearOnSelect="false"
-                    :closeOnSelect="false"
-                    class="text-gray-800 uppercase"
-                    mode="tags" />
-                </div>
+              <p v-if="form.errors.name" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.name }}</p>
+            </div>
 
-                <p v-if="form.errors.permissions" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.permissions }}</p>
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="permissions" class="w-1/3 lowercase first-letter:capitalize">permissions</label>
+                <Select
+                  v-model="form.permissions"
+                  :options="permissions.map(p => ({
+                    label: p.name,
+                    value: p.id,
+                  }))"
+                  :searchable="true"
+                  :clearOnSelect="false"
+                  :closeOnSelect="false"
+                  class="text-gray-800 uppercase"
+                  mode="tags" />
               </div>
-            </div>
-          </template>
 
-          <template #footer>
-            <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 px-2 py-1">
-              <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-sm text-white transition-all">
-                <div class="flex items-center space-x-1">
-                  <Icon name="check" />
-
-                  <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
-                </div>
-              </button>
+              <p v-if="form.errors.permissions" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.permissions }}</p>
             </div>
-          </template>
-        </Card>
-      </form>
-    </div>
-  </transition>
+          </div>
+        </template>
+
+        <template #footer>
+          <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 px-2 py-1">
+            <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-sm text-white transition-all">
+              <div class="flex items-center space-x-1">
+                <Icon name="check" />
+
+                <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
+              </div>
+            </button>
+          </div>
+        </template>
+      </Card>
+    </form>
+  </Modal>
 </template>
\ No newline at end of file
diff --git a/resources/js/Pages/Superuser/User/Index.vue b/resources/js/Pages/Superuser/User/Index.vue
index 45c9668..a7e0532 100644
--- a/resources/js/Pages/Superuser/User/Index.vue
+++ b/resources/js/Pages/Superuser/User/Index.vue
@@ -9,6 +9,7 @@ import Builder from '@/Components/DataTable/Builder.vue'
 import Th from '@/Components/DataTable/Th.vue'
 import Swal from 'sweetalert2'
 import Select from '@vueform/multiselect'
+import Modal from '@/Components/Modal.vue'
 
 const self = getCurrentInstance()
 const { permissions, roles } = defineProps({
@@ -38,7 +39,6 @@ const close = () => {
   open.value = false
   form.reset()
   form.clearErrors()
-  tableRefresh.value && tableRefresh.value()
 }
 
 const store = () => {
@@ -256,120 +256,114 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
     <div v-if="open" class="fixed top-0 left-0 w-full h-full bg-black bg-opacity-80 z-20 overflow-hidden blur-3xl"></div>
   </transition>
 
-  <transition
-    enterActiveClass="transition-all duration-150"
-    leaveActiveClass="transition-all duration-150"
-    enterFromClass="-translate-y-full opacity-0"
-    leaveToClass="-translate-y-full opacity-0">
-    <div v-if="open" class="fixed top-0 left-0 w-full h-full flex justify-center overflow-auto z-20 p-10">
-      <form @submit.prevent="submit" class="w-full max-w-xl sm:max-w-5xl shadow-xl">
-        <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
-          <template #header>
-            <div class="flex items-center justify-end bg-gray-200 dark:bg-gray-800 p-2">
-              <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
+  <Modal :show="open">
+    <form @submit.prevent="submit" class="w-full max-w-xl sm:max-w-5xl shadow-xl">
+      <Card class="bg-gray-50 dark:bg-gray-700 dark:text-gray-100">
+        <template #header>
+          <div class="flex items-center justify-end bg-gray-200 dark:bg-gray-800 p-2">
+            <Icon @click.prevent="close" name="times" class="px-2 py-1 bg-gray-300 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 rounded-md transition-all cursor-pointer" />
+          </div>
+        </template>
+
+        <template #body>
+          <div class="flex flex-col space-y-4 p-4">
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="name" class="w-1/3 lowercase first-letter:capitalize">name</label>
+                <input ref="name" type="text" name="name" v-model="form.name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="name" required>
+              </div>
+
+              <p v-if="form.errors.name" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.name }}</p>
             </div>
-          </template>
 
-          <template #body>
-            <div class="flex flex-col space-y-4 p-4">
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="name" class="w-1/3 lowercase first-letter:capitalize">name</label>
-                  <input ref="name" type="text" name="name" v-model="form.name" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="name" required>
-                </div>
-
-                <p v-if="form.errors.name" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.name }}</p>
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="username" class="w-1/3 lowercase first-letter:capitalize">username</label>
+                <input ref="username" type="text" name="username" v-model="form.username" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="username" required>
               </div>
 
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="username" class="w-1/3 lowercase first-letter:capitalize">username</label>
-                  <input ref="username" type="text" name="username" v-model="form.username" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="username" required>
-                </div>
-
-                <p v-if="form.errors.username" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.username }}</p>
-              </div>
-
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="email" class="w-1/3 lowercase first-letter:capitalize">email</label>
-                  <input ref="email" type="email" name="email" v-model="form.email" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="email" required>
-                </div>
-
-                <p v-if="form.errors.email" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.email }}</p>
-              </div>
-
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="password" class="w-1/3 lowercase first-letter:capitalize">password</label>
-                  <input ref="password" type="password" name="password" v-model="form.password" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="password" :required="form.id === null">
-                </div>
-
-                <p v-if="form.errors.password" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.password }}</p>
-              </div>
-
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="password_confirmation" class="w-1/3 lowercase first-letter:capitalize">password confirmation</label>
-                  <input ref="password_confirmation" type="password" name="password_confirmation" v-model="form.password_confirmation" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="password confirmation" :required="form.id === null">
-                </div>
-
-                <p v-if="form.errors.password_confirmation" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.password_confirmation }}</p>
-              </div>
-
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="permissions" class="w-1/3 lowercase first-letter:capitalize">permissions</label>
-                  <Select
-                    v-model="form.permissions"
-                    :options="permissions.map(p => ({
-                      label: p.name,
-                      value: p.id,
-                    }))"
-                    :clearOnSelect="false"
-                    :closeOnSelect="false"
-                    :searchable="true"
-                    class="text-gray-800 uppercase"
-                    mode="tags" />
-                </div>
-
-                <p v-if="form.errors.permissions" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.permissions }}</p>
-              </div>
-
-              <div class="flex flex-col space-y-2">
-                <div class="flex items-center space-x-2">
-                  <label for="roles" class="w-1/3 lowercase first-letter:capitalize">roles</label>
-                  <Select
-                    v-model="form.roles"
-                    :options="roles.map(r => ({
-                      label: r.name,
-                      value: r.id,
-                    }))"
-                    :searchable="true"
-                    :clearOnSelect="false"
-                    :closeOnSelect="false"
-                    class="text-gray-800 uppercase"
-                    mode="tags" />
-                </div>
-
-                <p v-if="form.errors.roles" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.roles }}</p>
-              </div>
+              <p v-if="form.errors.username" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.username }}</p>
             </div>
-          </template>
 
-          <template #footer>
-            <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 px-2 py-1">
-              <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-sm text-white transition-all">
-                <div class="flex items-center space-x-1">
-                  <Icon name="check" />
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="email" class="w-1/3 lowercase first-letter:capitalize">email</label>
+                <input ref="email" type="email" name="email" v-model="form.email" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="email" required>
+              </div>
 
-                  <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
-                </div>
-              </button>
+              <p v-if="form.errors.email" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.email }}</p>
             </div>
-          </template>
-        </Card>
-      </form>
-    </div>
-  </transition>
+
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="password" class="w-1/3 lowercase first-letter:capitalize">password</label>
+                <input ref="password" type="password" name="password" v-model="form.password" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="password" :required="form.id === null">
+              </div>
+
+              <p v-if="form.errors.password" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.password }}</p>
+            </div>
+
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="password_confirmation" class="w-1/3 lowercase first-letter:capitalize">password confirmation</label>
+                <input ref="password_confirmation" type="password" name="password_confirmation" v-model="form.password_confirmation" class="w-full bg-white dark:bg-transparent rounded px-3 py-2 placeholder:capitalize" placeholder="password confirmation" :required="form.id === null">
+              </div>
+
+              <p v-if="form.errors.password_confirmation" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.password_confirmation }}</p>
+            </div>
+
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="permissions" class="w-1/3 lowercase first-letter:capitalize">permissions</label>
+                <Select
+                  v-model="form.permissions"
+                  :options="permissions.map(p => ({
+                    label: p.name,
+                    value: p.id,
+                  }))"
+                  :clearOnSelect="false"
+                  :closeOnSelect="false"
+                  :searchable="true"
+                  class="text-gray-800 uppercase"
+                  mode="tags" />
+              </div>
+
+              <p v-if="form.errors.permissions" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.permissions }}</p>
+            </div>
+
+            <div class="flex flex-col space-y-2">
+              <div class="flex items-center space-x-2">
+                <label for="roles" class="w-1/3 lowercase first-letter:capitalize">roles</label>
+                <Select
+                  v-model="form.roles"
+                  :options="roles.map(r => ({
+                    label: r.name,
+                    value: r.id,
+                  }))"
+                  :searchable="true"
+                  :clearOnSelect="false"
+                  :closeOnSelect="false"
+                  class="text-gray-800 uppercase"
+                  mode="tags" />
+              </div>
+
+              <p v-if="form.errors.roles" class="text-red-500 text-right lowercase first-letter:capitalize">{{ form.errors.roles }}</p>
+            </div>
+          </div>
+        </template>
+
+        <template #footer>
+          <div class="flex items-center justify-end space-x-2 bg-gray-200 dark:bg-gray-800 px-2 py-1">
+            <button type="submit" class="bg-green-600 hover:bg-green-700 rounded-md px-3 py-1 text-sm text-white transition-all">
+              <div class="flex items-center space-x-1">
+                <Icon name="check" />
+
+                <p class="uppercase font-semibold">{{ form.id ? 'update' : 'create' }}</p>
+              </div>
+            </button>
+          </div>
+        </template>
+      </Card>
+    </form>
+  </Modal>
 </template>
\ No newline at end of file