diff --git a/app/Http/Controllers/Admin/AdminCollectionRegexesController.php b/app/Http/Controllers/Admin/AdminCollectionRegexesController.php
index a6add816b..9adb49e32 100644
--- a/app/Http/Controllers/Admin/AdminCollectionRegexesController.php
+++ b/app/Http/Controllers/Admin/AdminCollectionRegexesController.php
@@ -15,7 +15,7 @@ class AdminCollectionRegexesController extends BasePageController
     public function index(Request $request)
     {
         $this->setAdminPrefs();
-        $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'collection_regexes']);
+        $regexes = new RegexService('collection_regexes');
 
         $meta_title = $title = 'Collections Regex List';
 
diff --git a/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php b/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php
index f95de5354..e80733fc8 100644
--- a/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php
+++ b/app/Http/Controllers/Admin/AdminReleaseNamingRegexesController.php
@@ -15,7 +15,7 @@ class AdminReleaseNamingRegexesController extends BasePageController
     public function index(Request $request)
     {
         $this->setAdminPrefs();
-        $regexes = new Regexes(['Settings' => null, 'Table_Name' => 'release_naming_regexes']);
+        $regexes = new RegexService('release_naming_regexes');
 
         $meta_title = $title = 'Release Naming Regex List';
 
diff --git a/resources/views/admin/regexes/category-list.blade.php b/resources/views/admin/regexes/category-list.blade.php
index 5f36dc520..2469bdc12 100644
--- a/resources/views/admin/regexes/category-list.blade.php
+++ b/resources/views/admin/regexes/category-list.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.admin')
 
 @section('content')
-<div class="max-w-full px-4 py-6">
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm">
+<div class="container mx-auto px-4 py-6">
+    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
         <!-- Header -->
         <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
             <div class="flex justify-between items-center">
@@ -174,4 +174,5 @@
         </div>
     </div>
 </div>
+@endsection
 {{-- Regex management functions moved to resources/js/csp-safe.js --}}
diff --git a/resources/views/admin/regexes/collection-list.blade.php b/resources/views/admin/regexes/collection-list.blade.php
index 73762ef22..e9d588c08 100644
--- a/resources/views/admin/regexes/collection-list.blade.php
+++ b/resources/views/admin/regexes/collection-list.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.admin')
 
 @section('content')
-<div class="max-w-full px-4 py-6">
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm">
+<div class="container mx-auto px-4 py-6">
+    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
         <!-- Header -->
         <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
             <div class="flex justify-between items-center">
@@ -173,4 +173,5 @@
         </div>
     </div>
 </div>
+@endsection
 {{-- Regex management functions moved to resources/js/csp-safe.js --}}
diff --git a/resources/views/admin/regexes/release-naming-list.blade.php b/resources/views/admin/regexes/release-naming-list.blade.php
index 53c67340f..09c218c1b 100644
--- a/resources/views/admin/regexes/release-naming-list.blade.php
+++ b/resources/views/admin/regexes/release-naming-list.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.admin')
 
 @section('content')
-<div class="max-w-full px-4 py-6">
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm">
+<div class="container mx-auto px-4 py-6">
+    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
         <!-- Header -->
         <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
             <div class="flex justify-between items-center">
@@ -173,4 +173,5 @@
         </div>
     </div>
 </div>
+@endsection
 {{-- Regex management functions moved to resources/js/csp-safe.js --}}