diff --git a/backend/resources/views/admin/templates/index.blade.php b/backend/resources/views/admin/templates/index.blade.php
index 77ca9ea..6ce88f4 100644
--- a/backend/resources/views/admin/templates/index.blade.php
+++ b/backend/resources/views/admin/templates/index.blade.php
@@ -282,12 +282,16 @@
         </div>
     @endif
 
-    <!-- Modal Edit Template -->
-    @foreach ($templates as $template)
-        <div id="modalEdit{{ $template->id }}" class="fixed inset-0 hidden items-center justify-center z-50">
-            <div class="absolute inset-0 bg-black opacity-50 closeEditOverlay" data-id="{{ $template->id }}"></div>
-            <div class="bg-white rounded-lg shadow-lg w-full max-w-md z-50 flex flex-col max-h-[90vh]">
+   <!-- Modal Edit Template - Fixed Version -->
+@foreach ($templates as $template)
+    <div id="modalEdit{{ $template->id }}" class="fixed inset-0 hidden items-center justify-center z-50">
+        <div class="absolute inset-0 bg-black opacity-50 closeEditOverlay" data-id="{{ $template->id }}"></div>
+        <div class="bg-white rounded-lg shadow-lg w-full max-w-md z-50 flex flex-col max-h-[90vh]">
 
+            <!-- PINDAHKAN FORM KE LUAR AGAR MENCAKUP SEMUA ELEMEN -->
+            <form id="editForm{{ $template->id }}" action="{{ route('templates.update', $template->id) }}" method="POST" enctype="multipart/form-data" class="h-full flex flex-col">
+                @csrf @method('PUT')
+                
                 <!-- Header -->
                 <div class="p-4 border-b sticky top-0 bg-white z-10">
                     <h5 class="text-lg font-medium">Edit Template</h5>
@@ -295,109 +299,107 @@
 
                 <!-- Scrollable content -->
                 <div class="p-4 space-y-4 overflow-y-auto flex-1">
-                    <form action="{{ route('templates.update', $template->id) }}" method="POST"
-                        enctype="multipart/form-data" class="h-full flex flex-col">
-                        @csrf @method('PUT')
-                        <div class="flex-1 space-y-4">
-                            <div>
-                                <label class="block text-sm font-medium">Nama Template</label>
-                                <input type="text" name="nama_template"
-                                    value="{{ old('nama_template', $template->nama_template) }}"
-                                    class="w-full p-2 border rounded" required>
-                            </div>
-                            <div>
-                                <label class="block text-sm font-medium">Kategori</label>
-                                <select name="kategori_id" id="kategoriSelectEdit{{ $template->id }}"
-                                    class="w-full p-2 border rounded">
-                                    <option value="">-- Pilih Kategori --</option>
-                                    @foreach ($kategoris as $kategoriItem)
-                                        <option value="{{ $kategoriItem->id }}" @selected($kategoriItem->id == old('kategori_id', $template->kategori_id))>
-                                            {{ $kategoriItem->nama }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
+                    <div class="flex-1 space-y-4">
+                        <div>
+                            <label class="block text-sm font-medium">Nama Template</label>
+                            <input type="text" name="nama_template"
+                                value="{{ old('nama_template', $template->nama_template) }}"
+                                class="w-full p-2 border rounded" required>
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium">Kategori</label>
+                            <select name="kategori_id" id="kategoriSelectEdit{{ $template->id }}"
+                                class="w-full p-2 border rounded">
+                                <option value="">-- Pilih Kategori --</option>
+                                @foreach ($kategoris as $kategoriItem)
+                                    <option value="{{ $kategoriItem->id }}" @selected($kategoriItem->id == old('kategori_id', $template->kategori_id))>
+                                        {{ $kategoriItem->nama }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </div>
 
-                            <!-- FITUR -->
-                            <div>
-                                <label class="block text-sm font-medium">Fitur</label>
-                                <div id="fiturContainerEdit{{ $template->id }}"
-                                    class="space-y-3 max-h-64 overflow-auto p-2 border rounded">
-                                    @foreach ($kategoriFiturs as $kategoriFitur)
-                                        <div>
-                                            <p class="font-semibold text-gray-700 mb-1">
-                                                {{ $kategoriFitur->deskripsi }}
-                                            </p>
-                                            <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-                                                @foreach ($fiturs->where('kategori_fitur_id', $kategoriFitur->id) as $fiturItem)
-                                                    <label class="flex items-center space-x-2">
-                                                        <input type="radio" name="fitur_id[{{ $kategoriFitur->id }}]"
-                                                            value="{{ $fiturItem->id }}"
-                                                            data-harga="{{ $fiturItem->harga }}"
-                                                            {{ old("fitur_id.$kategoriFitur->id") == $fiturItem->id || $template->fiturs->contains($fiturItem->id) ? 'checked' : '' }}>
-                                                        <span class="text-sm">
-                                                            {{ \Illuminate\Support\Str::limit($fiturItem->deskripsi, 80) }}
-                                                            (Rp {{ number_format($fiturItem->harga, 0, ',', '.') }})
-                                                        </span>
-                                                    </label>
-                                                @endforeach
-                                            </div>
+                        <!-- FITUR -->
+                        <div>
+                            <label class="block text-sm font-medium">Fitur</label>
+                            <div id="fiturContainerEdit{{ $template->id }}"
+                                class="space-y-3 max-h-64 overflow-auto p-2 border rounded">
+                                @foreach ($kategoriFiturs as $kategoriFitur)
+                                    <div>
+                                        <p class="font-semibold text-gray-700 mb-1">
+                                            {{ $kategoriFitur->deskripsi }}
+                                        </p>
+                                        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                                            @foreach ($fiturs->where('kategori_fitur_id', $kategoriFitur->id) as $fiturItem)
+                                                <label class="flex items-center space-x-2">
+                                                    <input type="radio" name="fitur_id[{{ $kategoriFitur->id }}]"
+                                                        value="{{ $fiturItem->id }}"
+                                                        data-harga="{{ $fiturItem->harga }}"
+                                                        {{ old("fitur_id.$kategoriFitur->id") == $fiturItem->id || $template->fiturs->contains($fiturItem->id) ? 'checked' : '' }}>
+                                                    <span class="text-sm">
+                                                        {{ \Illuminate\Support\Str::limit($fiturItem->deskripsi, 80) }}
+                                                        (Rp {{ number_format($fiturItem->harga, 0, ',', '.') }})
+                                                    </span>
+                                                </label>
+                                            @endforeach
                                         </div>
-                                    @endforeach
+                                    </div>
+                                @endforeach
 
-                                    @if ($fitursTanpaKategori->count())
-                                        <div>
-                                            <p class="font-semibold text-gray-700 mb-1">Fitur Lainnya</p>
-                                            <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-                                                @foreach ($fitursTanpaKategori as $fitur)
-                                                    <label class="flex items-center space-x-2">
-                                                        <input type="checkbox" name="fitur_id[]"
-                                                            value="{{ $fitur->id }}" data-harga="{{ $fitur->harga }}"
-                                                            {{ (is_array(old('fitur_id')) && in_array($fitur->id, old('fitur_id'))) || $template->fiturs->contains($fitur->id) ? 'checked' : '' }}>
-                                                        <span class="text-sm">
-                                                            {{ \Illuminate\Support\Str::limit($fitur->deskripsi, 80) }}
-                                                            (Rp {{ number_format($fitur->harga, 0, ',', '.') }})
-                                                        </span>
-                                                    </label>
-                                                @endforeach
-                                            </div>
-                                        </div>
-                                    @endif
-                                </div>
-                            </div>
-
-                            <div>
-                                <label class="block text-sm font-medium">Harga</label>
-                                <input type="text" name="harga" value="{{ old('harga', $template->harga) }}"
-                                    class="w-full p-2 border rounded" required min="0">
-                            </div>
-                            <div>
-                                <label class="block text-sm font-medium">Foto (opsional)</label>
-                                @if ($template->foto)
-                                    <div class="mb-2">
-                                        <small class="text-gray-500">Foto saat ini:</small>
-                                        <div
-                                            class="w-20 h-20 mt-1 overflow-hidden rounded bg-gray-100 flex items-center justify-center border">
-                                            <img src="{{ asset('storage/' . $template->foto) }}" alt="foto"
-                                                class="max-w-full max-h-full object-contain">
+                                @if ($fitursTanpaKategori->count())
+                                    <div>
+                                        <p class="font-semibold text-gray-700 mb-1">Fitur Lainnya</p>
+                                        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                                            @foreach ($fitursTanpaKategori as $fitur)
+                                                <label class="flex items-center space-x-2">
+                                                    <input type="checkbox" name="fitur_id[]"
+                                                        value="{{ $fitur->id }}" data-harga="{{ $fitur->harga }}"
+                                                        {{ (is_array(old('fitur_id')) && in_array($fitur->id, old('fitur_id'))) || $template->fiturs->contains($fitur->id) ? 'checked' : '' }}>
+                                                    <span class="text-sm">
+                                                        {{ \Illuminate\Support\Str::limit($fitur->deskripsi, 80) }}
+                                                        (Rp {{ number_format($fitur->harga, 0, ',', '.') }})
+                                                    </span>
+                                                </label>
+                                            @endforeach
                                         </div>
                                     </div>
                                 @endif
-                                <input type="file" name="foto" class="w-full p-2 border rounded" accept="image/*">
                             </div>
                         </div>
 
-                    </form>
+                        <div>
+                            <label class="block text-sm font-medium">Harga</label>
+                            <input type="text" name="harga" value="{{ old('harga', $template->harga) }}"
+                                class="w-full p-2 border rounded" required min="0">
+                        </div>
+                        <div>
+                            <label class="block text-sm font-medium">Foto (opsional)</label>
+                            @if ($template->foto)
+                                <div class="mb-2">
+                                    <small class="text-gray-500">Foto saat ini:</small>
+                                    <div
+                                        class="w-20 h-20 mt-1 overflow-hidden rounded bg-gray-100 flex items-center justify-center border">
+                                        <img src="{{ asset('storage/' . $template->foto) }}" alt="foto"
+                                            class="max-w-full max-h-full object-contain">
+                                    </div>
+                                </div>
+                            @endif
+                            <input type="file" name="foto" class="w-full p-2 border rounded" accept="image/*">
+                        </div>
+                    </div>
                 </div>
-                <!-- Footer -->
+                
+                <!-- Footer - SEKARANG DI DALAM FORM -->
                 <div class="p-4 border-t flex justify-end space-x-2 sticky bottom-0 bg-white z-10">
                     <button type="button" class="bg-gray-300 text-black px-3 py-1 rounded closeEditBtn"
                         data-id="{{ $template->id }}">Batal</button>
-                    <button class="bg-blue-600 text-white px-3 py-1 rounded">Simpan Perubahan</button>
+                    <!-- TAMBAHKAN type="submit" -->
+                    <button type="submit" class="bg-blue-600 text-white px-3 py-1 rounded">Simpan Perubahan</button>
                 </div>
-            </div>
+            </form>
         </div>
-    @endforeach
+    </div>
+@endforeach
 
 
     <script>