diff --git a/Modules/Helpdesk/Livewire/SettingsManager.php b/Modules/Helpdesk/Livewire/SettingsManager.php
index c77975a..ea8a7f2 100644
--- a/Modules/Helpdesk/Livewire/SettingsManager.php
+++ b/Modules/Helpdesk/Livewire/SettingsManager.php
@@ -725,7 +725,7 @@ final class SettingsManager extends Component
 
     public function render(): View
     {
-        return view('helpdesk::livewire.settings-manager', [
+        return view('modules.helpdesk.livewire.settings-manager', [
             'statuses' => $this->orderedStatuses(),
             'priorities' => $this->orderedPriorities(),
             'categories' => $this->orderedCategories(),
@@ -747,7 +747,7 @@ final class SettingsManager extends Component
             'tags' => Tag::query()->orderBy('name')->get(),
             'checklistTemplates' => ChecklistTemplate::query()->orderBy('name')->get(),
             'colourOptions' => Color::options(),
-        ])->layout('helpdesk::layouts.app.sidebar');
+        ])->layout('layouts.app');
     }
 
     private function orderedStatuses(): mixed
diff --git a/Modules/UserManagement/Http/Controllers/UserController.php b/Modules/UserManagement/Http/Controllers/UserController.php
index 8efccfd..12c49f0 100644
--- a/Modules/UserManagement/Http/Controllers/UserController.php
+++ b/Modules/UserManagement/Http/Controllers/UserController.php
@@ -29,7 +29,7 @@ final class UserController extends Controller
                     ->orWhere('email', 'like', '%'.$search.'%'));
             })
             ->orderBy('name')
-            ->paginate(20)
+            ->paginate(5)
             ->withQueryString();
 
         return view('modules.user-management.index', compact('users', 'search'));
@@ -102,10 +102,19 @@ final class UserController extends Controller
 
     public function roles(): View
     {
-        return view('modules.user-management.roles', [
-            'roles' => Role::query()->withCount(['users', 'permissions'])->orderBy('name')->get(),
-            'permissions' => Permission::query()->withCount('roles')->orderBy('name')->get(),
-        ]);
+        $roles = Role::query()
+            ->withCount(['users', 'permissions'])
+            ->orderBy('name')
+            ->paginate(5, ['*'], 'roles_page')
+            ->withQueryString();
+
+        $permissions = Permission::query()
+            ->withCount('roles')
+            ->orderBy('name')
+            ->paginate(5, ['*'], 'permissions_page')
+            ->withQueryString();
+
+        return view('modules.user-management.roles', compact('roles', 'permissions'));
     }
 
     public function createRole(): View
diff --git a/resources/themes/backend/views/modules/user-management/index.blade.php b/resources/themes/backend/views/modules/user-management/index.blade.php
index 905224c..075dec8 100644
--- a/resources/themes/backend/views/modules/user-management/index.blade.php
+++ b/resources/themes/backend/views/modules/user-management/index.blade.php
@@ -55,7 +55,40 @@
                     </tbody>
                 </table>
             </div>
-            <div class="p-4">{{ $users->links() }}</div>
+
+<div class="flex flex-col gap-3 border-t border-zinc-800 px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
+    <div class="text-sm text-zinc-500">
+        Showing
+        <span class="font-semibold text-zinc-300">{{ $users->firstItem() ?? 0 }}</span>
+        –
+        <span class="font-semibold text-zinc-300">{{ $users->lastItem() ?? 0 }}</span>
+        of
+        <span class="font-semibold text-zinc-300">{{ $users->total() }}</span>
+    </div>
+
+    <div class="flex items-center gap-2">
+        @if ($users->onFirstPage())
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Previous</span>
+        @else
+            <a href="{{ $users->previousPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Previous
+            </a>
+        @endif
+
+        <span class="rounded-lg bg-blue-600/15 px-3 py-2 text-sm font-semibold text-blue-300">
+            Page {{ $users->currentPage() }} of {{ max(1, $users->lastPage()) }}
+        </span>
+
+        @if ($users->hasMorePages())
+            <a href="{{ $users->nextPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Next
+            </a>
+        @else
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Next</span>
+        @endif
+    </div>
+</div>
+
         </section>
     </div>
 </x-layouts::app>
diff --git a/resources/themes/backend/views/modules/user-management/roles.blade.php b/resources/themes/backend/views/modules/user-management/roles.blade.php
index ccb2f35..3e27b2a 100644
--- a/resources/themes/backend/views/modules/user-management/roles.blade.php
+++ b/resources/themes/backend/views/modules/user-management/roles.blade.php
@@ -58,6 +58,40 @@
             @endforelse
             </tbody>
         </table></div>
+
+<div class="flex flex-col gap-3 border-t border-zinc-800 px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
+    <div class="text-sm text-zinc-500">
+        Showing
+        <span class="font-semibold text-zinc-300">{{ $roles->firstItem() ?? 0 }}</span>
+        –
+        <span class="font-semibold text-zinc-300">{{ $roles->lastItem() ?? 0 }}</span>
+        of
+        <span class="font-semibold text-zinc-300">{{ $roles->total() }}</span>
+    </div>
+
+    <div class="flex items-center gap-2">
+        @if ($roles->onFirstPage())
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Previous</span>
+        @else
+            <a href="{{ $roles->previousPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Previous
+            </a>
+        @endif
+
+        <span class="rounded-lg bg-blue-600/15 px-3 py-2 text-sm font-semibold text-blue-300">
+            Page {{ $roles->currentPage() }} of {{ max(1, $roles->lastPage()) }}
+        </span>
+
+        @if ($roles->hasMorePages())
+            <a href="{{ $roles->nextPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Next
+            </a>
+        @else
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Next</span>
+        @endif
+    </div>
+</div>
+
     </section>
 
     <section class="hd-panel overflow-hidden">
@@ -94,6 +128,40 @@
             @endforelse
             </tbody>
         </table></div>
+
+<div class="flex flex-col gap-3 border-t border-zinc-800 px-6 py-4 sm:flex-row sm:items-center sm:justify-between">
+    <div class="text-sm text-zinc-500">
+        Showing
+        <span class="font-semibold text-zinc-300">{{ $permissions->firstItem() ?? 0 }}</span>
+        –
+        <span class="font-semibold text-zinc-300">{{ $permissions->lastItem() ?? 0 }}</span>
+        of
+        <span class="font-semibold text-zinc-300">{{ $permissions->total() }}</span>
+    </div>
+
+    <div class="flex items-center gap-2">
+        @if ($permissions->onFirstPage())
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Previous</span>
+        @else
+            <a href="{{ $permissions->previousPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Previous
+            </a>
+        @endif
+
+        <span class="rounded-lg bg-blue-600/15 px-3 py-2 text-sm font-semibold text-blue-300">
+            Page {{ $permissions->currentPage() }} of {{ max(1, $permissions->lastPage()) }}
+        </span>
+
+        @if ($permissions->hasMorePages())
+            <a href="{{ $permissions->nextPageUrl() }}" class="rounded-lg border border-zinc-700 bg-zinc-900 px-3 py-2 text-sm font-medium text-zinc-200 hover:border-blue-500 hover:text-white">
+                Next
+            </a>
+        @else
+            <span class="rounded-lg border border-zinc-800 px-3 py-2 text-sm text-zinc-600">Next</span>
+        @endif
+    </div>
+</div>
+
     </section>
 </div>
 </x-layouts::app>