diff --git a/resources/views/components/form/checkbox.blade.php b/resources/views/components/form/checkbox.blade.php
index 4d865ad..e8db49b 100644
--- a/resources/views/components/form/checkbox.blade.php
+++ b/resources/views/components/form/checkbox.blade.php
@@ -3,7 +3,8 @@
     'id'    => '',
     'label' => '',
     'value' => '',
-    'selected' => ''
+    'selected' => '',
+    'class' => 'block cursor-pointer',
 ])
 
 @php
@@ -25,7 +26,15 @@
     @endphp
 @endif
 
-<div>
-    <input type='checkbox' name='{{ $name }}' id='{{ $id }}' value='{{ $value }}' @if ($selected === $value) checked='checked' @endif {{ $attributes }}>
-    <label for='{{ $id }}'>{{ $label }}</label>
-</div>
+<label for='{{ $id }}' wire:key="{{ $id }}" class="{{ $class }}">
+    <div class="flex gap-2">
+    <input
+        type="checkbox"
+        name='{{ $name }}'
+        id='{{ $id }}'
+        value='{{ $value }}'
+        @if ($selected === $value) checked='checked' @endif {{ $attributes }}
+    >
+        {{ $label }}
+    </div>
+</label>
diff --git a/resources/views/livewire/admin/audit-trails.blade.php b/resources/views/livewire/admin/audit-trails.blade.php
index 5aca8a5..95f6067 100644
--- a/resources/views/livewire/admin/audit-trails.blade.php
+++ b/resources/views/livewire/admin/audit-trails.blade.php
@@ -91,7 +91,7 @@ class="bg-gray-200 dark:bg-gray-700 rounded-b-md p-5"
             </thead>
             <tbody>
             @foreach($this->userlogs() as $log)
-                <tr>
+                <tr wire:key="{{ $log->id }}">
                     <td>{{ $log->user->name ?? '' }}</td>
                     <td>{{ $log->title }}</td>
                     <td>{{ $log->section }}</td>
diff --git a/resources/views/livewire/admin/notifications-menu.blade.php b/resources/views/livewire/admin/notifications-menu.blade.php
index eea30d3..f794d47 100644
--- a/resources/views/livewire/admin/notifications-menu.blade.php
+++ b/resources/views/livewire/admin/notifications-menu.blade.php
@@ -44,7 +44,7 @@
                                         <li class="p-6">{{ __('No notifications yet.') }}</li>
                                     @else
                                         @foreach($notifications as $notification)
-                                        <li class="px-6 py-5 relative">
+                                        <li wire:key="{{ $notification->id }}" class="px-6 py-5 relative">
                                             <div class="group flex justify-between items-center">
                                                 @if (!empty($notification->link))
                                                     <x-a href="{{ $notification->link }}" class="-m-1 p-1 block">
diff --git a/resources/views/livewire/admin/roles/index.blade.php b/resources/views/livewire/admin/roles/index.blade.php
index bfe1fe7..d102b94 100644
--- a/resources/views/livewire/admin/roles/index.blade.php
+++ b/resources/views/livewire/admin/roles/index.blade.php
@@ -40,7 +40,7 @@
         </thead>
         <tbody>
         @foreach($this->roles() as $role)
-            <tr>
+            <tr wire:key="{{ $role->id }}">
                 <td>{{ $role->label }}</td>
                     <td>
                         <div class="flex space-x-2">
diff --git a/resources/views/livewire/admin/settings/security-settings.blade.php b/resources/views/livewire/admin/settings/security-settings.blade.php
index da0cfc2..adf0fa2 100644
--- a/resources/views/livewire/admin/settings/security-settings.blade.php
+++ b/resources/views/livewire/admin/settings/security-settings.blade.php
@@ -19,7 +19,7 @@
             </tr>
             @foreach($ips as $index => $row)
                 @error("ips.$index.ip")
-                    <tr>
+                    <tr wire:key="{{ $index }}">
                         <td colspan="3">
                             <span class="error">{{ $message }}</span>
                         </td>
@@ -28,7 +28,7 @@
                 <tr>
                     <td><x-form.input wire:model.live="ips.{{ $index }}.ip" label="none">{{ $row['ip'] }}</x-form.input></td>
                     <td><x-form.input wire:model.live="ips.{{ $index }}.comment" label="none">{{ $row['comment'] }}</x-form.input></td>
-                    <td class="flex justify-center pt-2"><button type="button" wire:click="remove({{ $index }})" class="error">X</button></td>
+                    <td class="flex justify-center pt-2"><button type="button" wire:click="remove({{ $index }})" wire:confirm="Are you sure?" class="error">X</button></td>
                 </tr>
             @endforeach
         </table>
diff --git a/resources/views/livewire/admin/users/activity.blade.php b/resources/views/livewire/admin/users/activity.blade.php
index b602a73..6d5191c 100644
--- a/resources/views/livewire/admin/users/activity.blade.php
+++ b/resources/views/livewire/admin/users/activity.blade.php
@@ -78,7 +78,7 @@ class="bg-gray-200 dark:bg-gray-700 rounded-b-md p-5"
                 </thead>
                 <tbody>
                 @foreach($this->userlogs() as $log)
-                    <tr>
+                    <tr wire:key="{{ $log->id }}">
                         <td>{{ $log->title }}</td>
                         <td>{{ $log->section }}</td>
                         <td>{{ $log->type }}</td>
diff --git a/resources/views/livewire/admin/users/edit/roles.blade.php b/resources/views/livewire/admin/users/edit/roles.blade.php
index dcef740..f49d4f9 100644
--- a/resources/views/livewire/admin/users/edit/roles.blade.php
+++ b/resources/views/livewire/admin/users/edit/roles.blade.php
@@ -10,16 +10,12 @@
                 <x-form wire:submit="update" method="put">
 
                     @foreach($roles as $role)
-                        <label class="block cursor-pointer">
-                            <div class="flex gap-2">
-                            <input
-                                type="checkbox"
-                                wire:model.live="roleSelections"
-                                value="{{ $role->id }}"
-                            >
-                                {{ $role->label }}
-                            </div>
-                        </label>
+                        <x-form.checkbox
+                            wire:model.live="roleSelections"
+                            id="{{ $role->id }}"
+                            value="{{ $role->id }}"
+                            label="{{ $role->label }}"
+                        />
                     @endforeach
 
                     <x-button class="mt-5">{{ __('Update Roles') }}</x-button>
@@ -32,4 +28,4 @@
         </x-slot>
     </x-2col>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/livewire/admin/users/index.blade.php b/resources/views/livewire/admin/users/index.blade.php
index aa5098b..fbff98f 100644
--- a/resources/views/livewire/admin/users/index.blade.php
+++ b/resources/views/livewire/admin/users/index.blade.php
@@ -68,7 +68,7 @@ class="bg-gray-200 dark:bg-gray-700 rounded-b-md p-5"
             </thead>
             <tbody>
             @foreach($this->users() as $user)
-                <tr>
+                <tr wire:key="{{ $user->id }}">
                     <td class="flex">
                         <div>
                             @if (storage_exists($user->image))
diff --git a/resources/views/livewire/admin/users/invite.blade.php b/resources/views/livewire/admin/users/invite.blade.php
index 2d321b2..7875655 100644
--- a/resources/views/livewire/admin/users/invite.blade.php
+++ b/resources/views/livewire/admin/users/invite.blade.php
@@ -20,16 +20,12 @@
             @enderror
 
             @foreach($roles as $role)
-                <label class="block cursor-pointer">
-                    <div class="flex gap-2">
-                    <input
-                        type="checkbox"
-                        wire:model="rolesSelected"
-                        value="{{ $role->name }}"
-                    >
-                        {{ $role->label }}
-                    </div>
-                </label>
+                <x-form.checkbox
+                    wire:model.live="rolesSelected"
+                    id="{{ $role->id }}"
+                    value="{{ $role->id }}"
+                    label="{{ $role->label }}"
+                />
             @endforeach
 
         </x-slot>