diff --git a/app/Http/Controllers/Admin/AdminBookController.php b/app/Http/Controllers/Admin/AdminBookController.php
index 9a789ad58..ab8737894 100644
--- a/app/Http/Controllers/Admin/AdminBookController.php
+++ b/app/Http/Controllers/Admin/AdminBookController.php
@@ -5,15 +5,17 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\BasePageController;
 use App\Models\BookInfo;
 use Blacklight\Books;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
+use Illuminate\View\View;
 
 class AdminBookController extends BasePageController
 {
     /**
-     * @throws \Exception
+     * Display a listing of books
      */
-    public function index(): void
+    public function index(): View
     {
         $this->setAdminPrefs();
 
@@ -21,21 +23,13 @@ class AdminBookController extends BasePageController
 
         $bookList = BookInfo::query()->orderByDesc('created_at')->paginate(config('nntmux.items_per_page'));
 
-        $this->smarty->assign('booklist', $bookList);
-
-        $content = $this->smarty->fetch('book-list.tpl');
-
-        $this->smarty->assign(compact('title', 'meta_title', 'content'));
-
-        $this->adminrender();
+        return view('admin.books.index', compact('bookList', 'title', 'meta_title'));
     }
 
     /**
-     * @return \Illuminate\Http\RedirectResponse|void
-     *
-     * @throws \Exception
+     * Show the form for editing a book
      */
-    public function edit(Request $request)
+    public function edit(Request $request): View|RedirectResponse
     {
         $this->setAdminPrefs();
         $book = new Books;
@@ -50,38 +44,44 @@ class AdminBookController extends BasePageController
             $b = $book->getBookInfo($id);
 
             if (! $b) {
-                $this->show404();
+                abort(404);
             }
 
             switch ($action) {
                 case 'submit':
                     $coverLoc = storage_path('covers/book/'.$id.'.jpg');
 
-                    if ($_FILES['cover']['size'] > 0) {
-                        $tmpName = $_FILES['cover']['tmp_name'];
-                        $file_info = getimagesize($tmpName);
+                    if ($request->hasFile('cover') && $request->file('cover')->isValid()) {
+                        $uploadedFile = $request->file('cover');
+                        $file_info = getimagesize($uploadedFile->getRealPath());
                         if (! empty($file_info)) {
-                            move_uploaded_file($_FILES['cover']['tmp_name'], $coverLoc);
+                            $uploadedFile->move(storage_path('covers/book'), $id.'.jpg');
                         }
                     }
 
-                    $request->merge(['cover' => file_exists($coverLoc) ? 1 : 0]);
-                    $request->merge(['publishdate' => (empty($request->input('publishdate')) || ! strtotime($request->input('publishdate'))) ? $con['publishdate'] : Carbon::parse($request->input('publishdate'))->timestamp]);
-                    $book->update($id, $request->input('title'), $request->input('asin'), $request->input('url'), $request->input('author'), $request->input('publisher'), $request->input('publishdate'), $request->input('cover'));
+                    $hasCover = file_exists($coverLoc) ? 1 : 0;
+                    $publishdate = (empty($request->input('publishdate')) || ! strtotime($request->input('publishdate')))
+                        ? ($b['publishdate'] ?? null)
+                        : Carbon::parse($request->input('publishdate'))->timestamp;
 
-                    return redirect()->to('admin/book-list');
-                    break;
+                    $book->update(
+                        $id,
+                        $request->input('title'),
+                        $request->input('asin'),
+                        $request->input('url'),
+                        $request->input('author'),
+                        $request->input('publisher'),
+                        $publishdate,
+                        $hasCover
+                    );
+
+                    return redirect()->route('admin.book-list')->with('success', 'Book updated successfully');
                 case 'view':
                 default:
-                    $this->smarty->assign('book', $b);
-                    break;
+                    return view('admin.books.edit', compact('book', 'title', 'meta_title'))->with('book', $b);
             }
         }
 
-        $content = $this->smarty->fetch('book-edit.tpl');
-
-        $this->smarty->assign(compact('title', 'meta_title', 'content'));
-
-        $this->adminrender();
+        return redirect()->route('admin.book-list');
     }
 }
diff --git a/resources/views/admin/books/edit.blade.php b/resources/views/admin/books/edit.blade.php
new file mode 100644
index 000000000..bedc408dc
--- /dev/null
+++ b/resources/views/admin/books/edit.blade.php
@@ -0,0 +1,210 @@
+@extends('layouts.admin')
+
+@section('content')
+<div class="container mx-auto px-4 py-6">
+    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm">
+        <!-- Header -->
+        <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
+            <div class="flex justify-between items-center">
+                <h1 class="text-2xl font-semibold text-gray-800 dark:text-gray-200">
+                    <i class="fas fa-edit mr-2"></i>{{ $title }}
+                </h1>
+                <a href="{{ route('admin.book-list') }}" class="px-4 py-2 bg-gray-600 text-white rounded-lg hover:bg-gray-700">
+                    <i class="fas fa-arrow-left mr-2"></i>Back to List
+                </a>
+            </div>
+        </div>
+
+        <!-- Edit Form -->
+        <div class="p-6">
+            <form method="POST" action="{{ url('admin/book-edit?id=' . $book['id']) }}" enctype="multipart/form-data">
+                @csrf
+                <input type="hidden" name="action" value="submit">
+                <input type="hidden" name="id" value="{{ $book['id'] }}">
+
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    <!-- Left Column -->
+                    <div class="space-y-6">
+                        <!-- Title -->
+                        <div>
+                            <label for="title" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                Title <span class="text-red-500">*</span>
+                            </label>
+                            <input type="text"
+                                   id="title"
+                                   name="title"
+                                   value="{{ $book['title'] ?? '' }}"
+                                   required
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                        </div>
+
+                        <!-- Author -->
+                        <div>
+                            <label for="author" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                Author
+                            </label>
+                            <input type="text"
+                                   id="author"
+                                   name="author"
+                                   value="{{ $book['author'] ?? '' }}"
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                        </div>
+
+                        <!-- Publisher -->
+                        <div>
+                            <label for="publisher" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                Publisher
+                            </label>
+                            <input type="text"
+                                   id="publisher"
+                                   name="publisher"
+                                   value="{{ $book['publisher'] ?? '' }}"
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                        </div>
+
+                        <!-- Publish Date -->
+                        <div>
+                            <label for="publishdate" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                Publish Date
+                            </label>
+                            <input type="date"
+                                   id="publishdate"
+                                   name="publishdate"
+                                   value="{{ isset($book['publishdate']) && $book['publishdate'] ? date('Y-m-d', $book['publishdate']) : '' }}"
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                        </div>
+
+                        <!-- ASIN -->
+                        <div>
+                            <label for="asin" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                ASIN
+                            </label>
+                            <input type="text"
+                                   id="asin"
+                                   name="asin"
+                                   value="{{ $book['asin'] ?? '' }}"
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                        </div>
+
+                        <!-- URL -->
+                        <div>
+                            <label for="url" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                                Amazon URL
+                            </label>
+                            <input type="url"
+                                   id="url"
+                                   name="url"
+                                   value="{{ $book['url'] ?? '' }}"
+                                   class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-200 rounded-md focus:ring-blue-500 focus:border-blue-500">
+                            @if(!empty($book['url']))
+                                <a href="{{ $book['url'] }}" target="_blank" class="text-sm text-blue-600 dark:text-blue-400 hover:underline mt-1 inline-block">
+                                    <i class="fas fa-external-link-alt mr-1"></i>View on Amazon
+                                </a>
+                            @endif
+                        </div>
+                    </div>
+
+                    <!-- Right Column -->
+                    <div class="space-y-6">
+                        <!-- Current Cover -->
+                        <div>
+                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                                Current Cover
+                            </label>
+                            <div class="border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-gray-50 dark:bg-gray-900">
+                                @if(isset($book['cover']) && $book['cover'] == 1)
+                                    <img src="{{ asset('storage/covers/book/' . $book['id'] . '.jpg') }}"
+                                         alt="{{ $book['title'] }}"
+                                         class="max-w-full h-auto mx-auto rounded shadow-lg"
+                                         style="max-height: 400px;"
+                                         onerror="this.src='{{ asset('images/no-cover.png') }}'">
+                                @else
+                                    <div class="flex flex-col items-center justify-center py-12 text-gray-400 dark:text-gray-500">
+                                        <i class="fas fa-book text-6xl mb-3"></i>
+                                        <p>No cover image available</p>
+                                    </div>
+                                @endif
+                            </div>
+                        </div>
+
+                        <!-- Upload New Cover -->
+                        <div>
+                            <label for="cover" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                                Upload New Cover
+                            </label>
+                            <div class="border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg p-4">
+                                <input type="file"
+                                       id="cover"
+                                       name="cover"
+                                       accept="image/*"
+                                       class="w-full text-sm text-gray-500 dark:text-gray-400
+                                              file:mr-4 file:py-2 file:px-4
+                                              file:rounded-md file:border-0
+                                              file:text-sm file:font-semibold
+                                              file:bg-blue-50 file:text-blue-700
+                                              hover:file:bg-blue-100
+                                              dark:file:bg-blue-900 dark:file:text-blue-200">
+                                <p class="mt-2 text-xs text-gray-500 dark:text-gray-400">
+                                    PNG, JPG, GIF up to 10MB
+                                </p>
+                            </div>
+                        </div>
+
+                        <!-- Book Info -->
+                        <div class="bg-gray-50 dark:bg-gray-900 rounded-lg p-4">
+                            <h3 class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">Book Information</h3>
+                            <dl class="space-y-2 text-sm">
+                                <div class="flex justify-between">
+                                    <dt class="text-gray-500 dark:text-gray-400">ID:</dt>
+                                    <dd class="text-gray-900 dark:text-gray-200 font-mono">{{ $book['id'] }}</dd>
+                                </div>
+                                @if(isset($book['created_at']))
+                                <div class="flex justify-between">
+                                    <dt class="text-gray-500 dark:text-gray-400">Created:</dt>
+                                    <dd class="text-gray-900 dark:text-gray-200">{{ $book['created_at'] }}</dd>
+                                </div>
+                                @endif
+                                @if(isset($book['updated_at']))
+                                <div class="flex justify-between">
+                                    <dt class="text-gray-500 dark:text-gray-400">Updated:</dt>
+                                    <dd class="text-gray-900 dark:text-gray-200">{{ $book['updated_at'] }}</dd>
+                                </div>
+                                @endif
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Action Buttons -->
+                <div class="mt-6 flex items-center justify-between border-t border-gray-200 dark:border-gray-700 pt-6">
+                    <a href="{{ route('admin.book-list') }}" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600">
+                        <i class="fas fa-times mr-2"></i>Cancel
+                    </a>
+                    <button type="submit" class="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700">
+                        <i class="fas fa-save mr-2"></i>Save Changes
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+@push('scripts')
+<script>
+    // Preview image before upload
+    document.getElementById('cover')?.addEventListener('change', function(e) {
+        if (e.target.files && e.target.files[0]) {
+            const reader = new FileReader();
+            reader.onload = function(event) {
+                const img = document.querySelector('img[alt="{{ $book['title'] ?? '' }}"]');
+                if (img) {
+                    img.src = event.target.result;
+                }
+            }
+            reader.readAsDataURL(e.target.files[0]);
+        }
+    });
+</script>
+@endpush
+@endsection
+
diff --git a/resources/views/admin/books/index.blade.php b/resources/views/admin/books/index.blade.php
new file mode 100644
index 000000000..2a9d6a666
--- /dev/null
+++ b/resources/views/admin/books/index.blade.php
@@ -0,0 +1,107 @@
+@extends('layouts.admin')
+
+@section('content')
+<div class="container mx-auto px-4 py-6">
+    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm">
+        <!-- Header -->
+        <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700">
+            <div class="flex justify-between items-center">
+                <h1 class="text-2xl font-semibold text-gray-800 dark:text-gray-200">
+                    <i class="fas fa-book mr-2"></i>{{ $title }}
+                </h1>
+                <div class="text-sm text-gray-600 dark:text-gray-400">
+                    Total: {{ $bookList->total() }} books
+                </div>
+            </div>
+        </div>
+
+        <!-- Books Table -->
+        <div class="overflow-x-auto">
+            <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
+                <thead class="bg-gray-50 dark:bg-gray-900">
+                    <tr>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Cover</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Title</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Author</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Publisher</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Published</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Created</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Actions</th>
+                    </tr>
+                </thead>
+                <tbody class="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700">
+                    @forelse($bookList as $book)
+                        <tr class="hover:bg-gray-50 dark:hover:bg-gray-700">
+                            <td class="px-6 py-4 whitespace-nowrap">
+                                @if($book->cover == 1)
+                                    <img src="{{ asset('storage/covers/book/' . $book->id . '.jpg') }}"
+                                         alt="{{ $book->title }}"
+                                         class="h-16 w-12 object-cover rounded shadow"
+                                         onerror="this.src='{{ asset('images/no-cover.png') }}'">
+                                @else
+                                    <div class="h-16 w-12 bg-gray-200 dark:bg-gray-700 rounded flex items-center justify-center">
+                                        <i class="fas fa-book text-gray-400"></i>
+                                    </div>
+                                @endif
+                            </td>
+                            <td class="px-6 py-4">
+                                <div class="text-sm font-medium text-gray-900 dark:text-gray-200">
+                                    {{ $book->title ?? 'N/A' }}
+                                </div>
+                                @if($book->asin)
+                                    <div class="text-xs text-gray-500 dark:text-gray-400">
+                                        ASIN: {{ $book->asin }}
+                                    </div>
+                                @endif
+                            </td>
+                            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-200">
+                                {{ $book->author ?? '—' }}
+                            </td>
+                            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-gray-200">
+                                {{ $book->publisher ?? '—' }}
+                            </td>
+                            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400">
+                                @if($book->publishdate)
+                                    {{ date('Y-m-d', $book->publishdate) }}
+                                @else
+                                    —
+                                @endif
+                            </td>
+                            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400">
+                                {{ $book->created_at ? $book->created_at->format('Y-m-d') : '—' }}
+                            </td>
+                            <td class="px-6 py-4 whitespace-nowrap text-sm font-medium">
+                                <a href="{{ url('admin/book-edit?id=' . $book->id) }}"
+                                   class="text-blue-600 dark:text-blue-400 hover:text-blue-900 dark:hover:text-blue-300"
+                                   title="Edit">
+                                    <i class="fas fa-edit"></i>
+                                </a>
+                                @if($book->url)
+                                    <a href="{{ $book->url }}"
+                                       target="_blank"
+                                       class="ml-3 text-green-600 dark:text-green-400 hover:text-green-900 dark:hover:text-green-300"
+                                       title="View on Amazon">
+                                        <i class="fas fa-external-link-alt"></i>
+                                    </a>
+                                @endif
+                            </td>
+                        </tr>
+                    @empty
+                        <tr>
+                            <td colspan="7" class="px-6 py-4 text-center text-gray-500 dark:text-gray-400">
+                                No books found.
+                            </td>
+                        </tr>
+                    @endforelse
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Pagination -->
+        <div class="px-6 py-4 bg-gray-50 dark:bg-gray-900 border-t border-gray-200 dark:border-gray-700">
+            {{ $bookList->links() }}
+        </div>
+    </div>
+</div>
+@endsection
+
diff --git a/resources/views/partials/admin-menu.blade.php b/resources/views/partials/admin-menu.blade.php
index 6be71cbe7..b4443efe2 100644
--- a/resources/views/partials/admin-menu.blade.php
+++ b/resources/views/partials/admin-menu.blade.php
@@ -101,6 +101,20 @@
         </div>
     </div>
 
+    <!-- Books -->
+    <div class="mb-4">
+        <button type="button" class="flex items-center justify-between w-full text-left text-gray-300 dark:text-gray-400 hover:text-white dark:hover:text-white transition" onclick="toggleAdminSubmenu('books-menu')">
+            <div class="flex items-center space-x-3">
+                <i class="fas fa-book"></i>
+                <span>Books</span>
+            </div>
+            <i class="fas fa-chevron-down text-sm transform transition-transform" id="books-menu-icon"></i>
+        </button>
+        <div id="books-menu" class="hidden mt-2 ml-6 space-y-1">
+            <a href="{{ url('/admin/book-list') }}" class="block py-2 px-3 text-gray-400 dark:text-gray-500 hover:text-white dark:hover:text-white hover:bg-gray-800 dark:hover:bg-gray-800 rounded transition">Book List</a>
+        </div>
+    </div>
+
 
     <!-- Blacklist -->
     <div class="mb-4">