diff --git a/resources/js/Akaun/BilanganPengadai.vue b/resources/js/Akaun/BilanganPengadai.vue
index fd1cdcf..ffad007 100644
--- a/resources/js/Akaun/BilanganPengadai.vue
+++ b/resources/js/Akaun/BilanganPengadai.vue
@@ -25,16 +25,27 @@
                              </div>
                          </div> 
  
-                           <div class="flex justify-center mb-4">
-                                 <div class="mx-2 radio">
-                                     <input type="radio" id="pekerja" name="radpendser" value="pekerja" class="hidden focus:bg-gray-500" v-model="selected">
-                                     <label for="pekerja" class="cursor-pointer text-gray-500 focus:bg-gray-500 hover:bg-gray-200 focus:bg-purple-500 focus:bg-purple-500 focus:outline-none border px-10 py-4 border-solid border-gray-500 rounded">Pekerjaan</label>
-                                 </div>
-                                 
-                               
+                        <div class="flex justify-center mb-4">
+                            <div class="mx-2 radio">
+                                <input type="radio" id="pekerja" name="radpendser" value="pekerja" class="hidden" v-model="selected">
+                                <label for="pekerja" class="cursor-pointer text-gray-500 hover:bg-gray-200 border px-10 py-4 border-solid border-gray-500 rounded">
+                                    Pekerjaan
+                                </label>
+                            </div>
+                            <div class="mx-2 radio">
+                                <input type="radio" id="agama" name="radpendser" value="agama" class="hidden" v-model="selected">
+                                <label for="agama" class="cursor-pointer text-gray-500 hover:bg-gray-200 border px-10 py-4 border-solid border-gray-500 rounded">
+                                    Agama
+                                </label>
+                            </div>
+                            <div class="mx-2 radio">
+                                <input type="radio" id="bangsa" name="radpendser" value="bangsa" class="hidden" v-model="selected">
+                                <label for="bangsa" class="cursor-pointer text-gray-500 hover:bg-gray-200 border px-10 py-4 border-solid border-gray-500 rounded">
+                                    Bangsa
+                                </label>
+                            </div>
+                        </div>
 
-                                
-                             </div>
                              <br>
 
                             
diff --git a/resources/views/akaun/laporan_bilangan_pengadai.blade.php b/resources/views/akaun/laporan_bilangan_pengadai.blade.php
index a3ff1af..7df3779 100644
--- a/resources/views/akaun/laporan_bilangan_pengadai.blade.php
+++ b/resources/views/akaun/laporan_bilangan_pengadai.blade.php
@@ -1,163 +1,41 @@
 <style>
-    #header {
+    table {
         font-family: Arial, Helvetica, sans-serif;
         border-collapse: collapse;
         width: 100%;
     }
 
-    #header td,
-    #customers th {
-
+    #header td {
         padding: 4px;
         font-size: 10px;
     }
 
-    #header tr:nth-child(even) {
-        background-color: #ffffff;
-    }
-
-    #header tr:hover {
-        background-color: #ddd;
-    }
-
-    #header th {
-        padding-top: 12px;
-        padding-bottom: 12px;
-        text-align: left;
-        padding: 4px;
-        color: black;
-    }
-</style>
-
-
-
-<style>
-    #scan {
-        font-family: Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-    }
-
-    #scan td,
-    #scan th {
-
-        padding: 8px;
-        font-size: 11px;
-
-    }
-
-    #scan tr:nth-child(even) {
-        background-color: #ffffff;
-    }
-
-    #scan tr:hover {
-        background-color: #ddd;
-    }
-
-    #scan th {
-        padding-top: 12px;
-        padding-bottom: 12px;
-        text-align: left;
-        padding: 4px;
-        color: black;
-    }
-</style>
-
-
-<style>
-    #scan {
-        font-family: Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-    }
-
-    #scan td,
-    #scan th {
-        border-collapse: collapse;
+    #scan td, #scan th,
+    #details td, #details th,
+    #sign td, #sign th {
         padding: 8px;
         font-size: 11px;
     }
 
-    #scan tr:nth-child(even) {
-        background-color: #ffffff;
-    }
-
-    #scan tr:hover {
-        background-color: #ddd;
-    }
-
-    #scan th {
-        border-collapse: collapse;
-        padding-top: 12px;
-        padding-bottom: 12px;
-        text-align: left;
-        padding: 4px;
-        color: black;
-    }
-</style>
-
-
-
-<style>
-    #details {
-        font-family: Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-    }
-
-    #details td,
     #details th {
-
-        padding: 8px;
         font-size: 13px;
     }
 
-    #details tr:nth-child(even) {
+    th, td {
+        text-align: left;
+    }
+
+    tr:nth-child(even) {
         background-color: #ffffff;
     }
 
-    #details tr:hover {
+    tr:hover {
         background-color: #ddd;
     }
 
-    #details th {
-        padding-top: 12px;
-        font-style: bold;
-        padding-bottom: 12px;
-        text-align: left;
-        padding: 4px;
-        color: black;
-    }
-</style>
-
-<style>
-    #sign {
-        font-family: Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-    }
-
-    #sign td,
-    #sign th {
-
-        padding: 8px;
-        font-size: 11px;
-        text-align: center;
-    }
-
-    #sign tr:nth-child(even) {
-        background-color: #ffffff;
-    }
-
-    #sign tr:hover {
-        background-color: #ddd;
-    }
-
-    #sign th {
+    th {
         padding-top: 12px;
         padding-bottom: 12px;
-        text-align: left;
-        padding: 4px;
         color: black;
     }
 
@@ -168,129 +46,100 @@
     }
 </style>
 
-
-
-
-
-
-
-
 <table id="header">
     <tr>
-
-    </tr>
-    <tr>
-        <td style="font-size:16px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+        <td style="font-size:16px; font-weight:bold;">
+            {{ $cawangan_detail['namacaw'] }}
+        </td>
         <td></td>
     </tr>
-
 </table>
+
 <br>
 
 <table id="scan">
-    <tr>
-        @php
+    @php
         $api_url = request()->hostname;
-         @endphp
+         
+        $jenis = request()->radpendser;
+
+
+        $tajukJenis = 'Pekerjaan';
+        if ($jenis == 'agama') {
+            $tajukJenis = 'Agama';
+        } elseif ($jenis == 'bangsa') {
+            $tajukJenis = 'Bangsa';
+        }
+
+        $tajukLaporan = Str::contains($api_url, 'apiv3.arrahn')
+            ? "LAPORAN BILANGAN PELANGGAN (arOSv3)"
+            : "LAPORAN BILANGAN PELANGGAN - " . strtoupper($tajukJenis);
+    @endphp
 
-        @if(Str::contains($api_url, 'apiv3.arrahn'))
-            <th colspan="5"><b>LAPORAN BILANGAN PELANGGAN (arOSv3)</b></th>
-        @else
-        <th> </th>
-        <th colspan="5"><b>LAPORAN BILANGAN PELANGGAN</b></th>
-        @endif 
-        
-        <th> </th>
-        <th> </th>
-        <th></th>
-    </tr>
     <tr>
-        <td style="width:100px"><b> Tarikh Dari: </b></td>
-        <td style="text-align:left;"> @php
-            $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
-            $formattedweddingdate = $myDateTime->format('d-m-Y');
-            echo($formattedweddingdate)
-          @endphp</td>
-          <td style="width:100px"><b> Tarikh Hingga: </b></td>
-          <td style="text-align:left;"> @php
-              $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
-              $formattedweddingdate = $myDateTime->format('d-m-Y');
-              echo($formattedweddingdate)
-            @endphp</td>
-        <td style="width:100px"> <b>Tarikh Cetak: </b></td>
-        <td style="text-align:left;">@php
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp</td>
-      </tr>
+        <th colspan="11"><b>{{ $tajukLaporan }}</b></th>
+    </tr>
 
+    <tr>
+        <td style="width:100px"><b>Tarikh Dari:</b></td>
+        <td>
+            @php
+                echo \Carbon\Carbon::createFromFormat('Y-m-d', $mula_date)->format('d-m-Y');
+            @endphp
+        </td>
+        <td style="width:100px"><b>Tarikh Hingga:</b></td>
+        <td>
+            @php
+                echo \Carbon\Carbon::createFromFormat('Y-m-d', $hingga_date)->format('d-m-Y');
+            @endphp
+        </td>
+        <td style="width:100px"><b>Tarikh Cetak:</b></td>
+        <td>
+            @php
+                echo \Carbon\Carbon::createFromFormat('Y-m-d', $tarikh_cetak)->format('d-m-Y');
+            @endphp
+        </td>
+    </tr>
 </table>
 
 <br>
+
 <table id="details">
     <tr>
-        <th><u>Jenis Pekerjaan</u></th>
+        @php
+            $labelJenis = 'Jenis Pekerjaan';
+            if ($jenis == 'agama') {
+                $labelJenis = 'Agama';
+            } elseif ($jenis == 'bangsa') {
+                $labelJenis = 'Bangsa';
+            }
+        @endphp
+
+        <th><u>{{ $labelJenis }}</u></th>
         <th><u>Bilangan Pembiayaan</u></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-        <th></th>
-
-
-
+        <th></th><th></th><th></th><th></th><th></th>
+        <th></th><th></th><th></th><th></th>
     </tr>
-    @php
-        $totalpengadai = 0;
 
-    @endphp
-    @foreach ($bilpengadai as $index => $item)
-        <td>{{ $item['keterangan'] }}</td>
+    @php $totalpengadai = 0; @endphp
+
+    @foreach ($bilpengadai as $item)
+    <tr>
+        <td>{{ !empty($item['keterangan']) ? $item['keterangan'] : 'Tidak Dikenalpasti' }}</td>
         <td>{{ number_format($item['bilangangadai']) }}</td>
-
+        <td></td><td></td><td></td><td></td><td></td>
+        <td></td><td></td><td></td><td></td>
 
         @php
             $totalpengadai += $item['bilangangadai'];
         @endphp
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-             <td></td>
-
-
-
-
-     </tr>
+    </tr>
     @endforeach
 
     <tr>
-        <td><b>Jumlah <b></td>
-        <td><b>{{number_format($totalpengadai)}} <b></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-
-
-
-
+        <td><b>Jumlah</b></td>
+        <td><b>{{ number_format($totalpengadai) }}</b></td>
+        <td></td><td></td><td></td><td></td><td></td>
+        <td></td><td></td><td></td><td></td>
     </tr>
-
-
-
 </table>