diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index f480a37..f45c59e 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -157,13 +157,31 @@
         </tr>
 
         @if (!empty($memo['lokasi']['address']))
-            <tr>
-                <td style="width: 20%; padding: 2px;">Lokasi Jaminan</td>
-                <td style="width: 1%;  padding: 2px;">:</td>
-                <td style="width: 79%;  padding: 2px;">{{ $memo['lokasi']['address'] ?? '' }},
-                    {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }},
-                    {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }} </td>
-            </tr>
+        <tr>
+            <td width="20%">Terletak di</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['address'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Desa/Kelurahan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['village_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kecamatan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['district_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kabupaten/Kota</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['city_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Provinsi</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['province_code'] ?? '' }}</td>
+        </tr>
         @endif
     </table>
 
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index de39cd0..b6c1bd8 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -1,4 +1,32 @@
 @include('lpj::penilai.components.header')
+@php
+$data = '';
+foreach ($permohonan->documents as $dokumen) {
+    $data .= $dokumen->jenisJaminan->name . ', ';
+
+    $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+    $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+    $teams = $permohonan->region->teams;
+
+    if ($teams) {
+        foreach ($teams as $team) {
+            $team_users = $team->teamsUsers;
+            // print_r($team_users);
+            if ($team_users) {
+                foreach ($team_users as $team_user) {
+                    $user = $team_user->user;
+
+                    if ($user && $user->hasRole('senior-officer')) {
+                        $senior_officer = $user;
+                        break 3;
+                    }
+                }
+            }
+        }
+    }
+}
+$data = rtrim($data, ', ');
+@endphp
 <main class="content">
     <table>
         <tr>
@@ -7,7 +35,7 @@
             </td>
         </tr>
     </table>
-
+ 
     <table style="width: 100%;">
         <tr>
             <td style="width: 20%; padding: 2px; vertical-align: top;">Kepada</td>
@@ -25,10 +53,28 @@
             <td style="width: 79%;  padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal</td>
+            <td style="width: 20%; padding: 2px;">Tanggal Survey</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">
-                {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
+                {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</td>
+        </tr>
+        <tr>
+            <td style="width: 25%; padding: 2px; vertical-align: top;">Cabang/Pemohon</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td style="vertical-align: top;  vertical-align: top;">
+                {{ $permohonan->debiture->branch->name ?? '' }}
+            </td>
+        </tr>
+        <tr>
+            <td style="width: 25%; padding: 2px;">Ao</td>
+            <td style="width: 1%;  padding: 2px;">:</td>
+            <td style="vertical-align: top;  padding: 2px;">{{ $permohonan->user->name ?? '' }}</td>
+        </tr>
+        <tr>
+            <td style="width: 25%; padding: 2px; vertical-align: top;">Perwakilan Developer</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td style="vertical-align: top;">{{ $forminspeksi['asset']['pihak_bank'] ?? '' }}
+            </td>
         </tr>
         <tr>
             <td style="width: 20%; padding: 2px;">Perihal</td>
@@ -38,36 +84,54 @@
     </table>
 
     <div style="border-top: 1px solid black; width: 100%;"></div>
+    <h2 style="text-transform: uppercase;">NAMA DEVELOPER</h2>
+    <table style="width: 100%; ">
+    <tr>
+        <td style="width: 20%; padding: 2px;">Nama</td>
+        <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
+        <td style="width: 79%;">{{ $permohonan->debiture->name ?? '' }}</td>
+    </tr>
+</table>
 
+    <h2 style="text-transform: uppercase;">NAMA PROYEK</h2>
+    <table style="width: 100%; ">
+    <tr>
+        <td style="width: 20%; padding: 2px;">Proyek</td>
+        <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
+        <td style="width: 79%;">{{ $data ?? '' }}</td>
+    </tr>
+</table>
+    <h2 style="text-transform: uppercase;">ALAMAT</h2>
+    <table style="width: 100%; ">
+        <tr>
+            <td width="20%">Terletak di</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['address'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Desa/Kelurahan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['village_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kecamatan</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['district_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Kabupaten/Kota</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $alamat['city_code'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td>Provinsi</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td>{{ $alamat['province_code'] ?? '' }}</td>
+        </tr>
+    </table>
     <h2 style="text-transform: uppercase;">DOKUMEN TERLAMPIR</h2>
     <table style="width: 100%;">
-        @foreach ($permohonan->documents as $dokumen)
-            @php
-                $senior_officer = null;
-                $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
-                $teams = $permohonan->region->teams;
-
-                $teams = $permohonan->region->teams;
-
-                if ($teams) {
-                    foreach ($teams as $team) {
-                        $team_users = $team->teamsUsers;
-                        // print_r($team_users);
-                        if ($team_users) {
-                            foreach ($team_users as $team_user) {
-                                $user = $team_user->user;
-
-                                if ($user && $user->hasRole('senior-officer')) {
-                                    $senior_officer = $user;
-                                    break 3;
-                                }
-                            }
-                        }
-                    }
-                }
-
-            @endphp
-        @endforeach
+       
         @if (@isset($dokumen))
             @foreach ($dokumen->detail as $detail)
                 <tr>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 0e65870..54b8b27 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -144,7 +144,7 @@
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['address'] ?? '' }}</td>
                     </tr>
                     <tr>
-                        <td style=" padding: 2px; vertical-align: top;">Kelurahan</td>
+                        <td style=" padding: 2px; vertical-align: top;">Desa/Kelurahan</td>
                         <td style=" padding: 2px; vertical-align: top;">:</td>
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['village_code'] ?? '' }}</td>
                     </tr>
@@ -154,12 +154,12 @@
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['district_code'] ?? '' }}</td>
                     </tr>
                     <tr>
-                        <td style=" padding: 2px; vertical-align: top;">Kabupaten</td>
+                        <td style=" padding: 2px; vertical-align: top;">Kabupaten/Kota</td>
                         <td style=" padding: 2px; vertical-align: top;">:</td>
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['city_code'] ?? '' }}</td>
                     </tr>
                     <tr>
-                        <td style=" padding: 2px; vertical-align: top;">Propinsi</td>
+                        <td style=" padding: 2px; vertical-align: top;">Provinsi</td>
                         <td style=" padding: 2px; vertical-align: top;">:</td>
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td>
                     </tr>
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index 22016d1..f2e13e0 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -129,7 +129,7 @@
             <td> {{ $alamat['address'] ?? '' }}</td>
         </tr>
         <tr>
-            <td>Kelurahan</td>
+            <td>Desa/Kelurahan</td>
             <td style="width: 1%; vertical-align: top;">:</td>
             <td>{{ $alamat['village_code'] ?? '' }}</td>
         </tr>
@@ -139,12 +139,12 @@
             <td>{{ $alamat['district_code'] ?? '' }}</td>
         </tr>
         <tr>
-            <td>Kotamadya</td>
+            <td>Kabupaten/Kota</td>
             <td style="width: 1%; vertical-align: top;">:</td>
             <td> {{ $alamat['city_code'] ?? '' }}</td>
         </tr>
         <tr>
-            <td>Propinsi</td>
+            <td>Provinsi</td>
             <td style="width: 1%; vertical-align: top;">:</td>
             <td>{{ $alamat['province_code'] ?? '' }}</td>
         </tr>
diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php
index f7db545..55342c9 100644
--- a/resources/views/penilai/components/print-resume.blade.php
+++ b/resources/views/penilai/components/print-resume.blade.php
@@ -56,16 +56,12 @@
                 <td>{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
             <tr>
-                <td>Aset</td>
-                <td>:</td>
-                <td>{{ $data ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Lokasi Objek</td>
-                <td>:</td>
-                <td>{{ $alamat['village_code'] ?? '' }}, {{ $alamat['district_code'] ?? '' }},
-                    {{ $alamat['city_code'] ?? '' }}, {{ $alamat['province_code'] ?? '' }}</td>
+                <td idth="25%">Aset</td>
+                <td width="1%">:</td>
+                <td >{{ $data ?? '' }}</td>
             </tr>
+            
+           
             <tr>
                 <td style="vertical-align: top;">Legalitas</td>
                 <td style="vertical-align: top;">:</td>
@@ -127,6 +123,31 @@
                     @endforeach
                 @endif
             </tr>
+            <tr>
+                <td width="25%">Terletak di</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td> {{ $alamat['address'] ?? '' }}</td>
+            </tr>
+            <tr>
+                <td>Desa/Kelurahan</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td>{{ $alamat['village_code'] ?? '' }}</td>
+            </tr>
+            <tr>
+                <td>Kecamatan</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td>{{ $alamat['district_code'] ?? '' }}</td>
+            </tr>
+            <tr>
+                <td>Kabupaten/Kota</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td> {{ $alamat['city_code'] ?? '' }}</td>
+            </tr>
+            <tr>
+                <td>Provinsi</td>
+                <td style="width: 1%; vertical-align: top;">:</td>
+                <td>{{ $alamat['province_code'] ?? '' }}</td>
+            </tr>
             <tr>
                 <td>Tanggal Survey</td>
                 <td>:</td>
diff --git a/resources/views/surveyor/index.blade.php b/resources/views/surveyor/index.blade.php
index ef6e383..133e60c 100644
--- a/resources/views/surveyor/index.blade.php
+++ b/resources/views/surveyor/index.blade.php
@@ -77,12 +77,6 @@
                                     </span>
                                 </th>
 
-                                <th class="min-w-[150px]" data-datatable-column="keterangan">
-                                    <span class="sort"><span class="sort-label">Keterangan</span>
-                                        <span class="sort-icon"></span>
-                                    </span>
-                                </th>
-
                                 <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
                             </tr>
                         </thead>
@@ -414,21 +408,22 @@
                 status: {
                     title: 'status',
                     render: (item, data) => {
-                        return `<span class="badge badge-sm badge-default uppercase flex justify-center">${data.status}</span>`;
-                    }
-                },
-                keterangan: {
-                    title: 'Keterangan',
-                    render: (item, data) => {
-                        let actionHtml = '';
-                        if (data.status === 'revisi-laporan') {
-                            actionHtml += `${data.keterangan}`
-                        };
+                        let tooltip = '';
 
-                        if (data.status === 'request-reschedule') {
-                            actionHtml += `${data.penilaian.reschedule_note}`
-                        };
-                        return actionHtml;
+                        if (data.status === 'revisi-laporan') {
+                            tooltip = data.keterangan || '';
+                        } else if (data.status === 'reschedule') {
+                            tooltip = data.penilaian?.reschedule_note || '';
+                        } else {
+                            tooltip = '';
+                        }
+
+                        return `
+                        <button
+                            class="badge badge-sm badge-default uppercase flex justify-center"
+                            title="${tooltip}">
+                            ${data.status}
+                        </button>`;
                     }
                 },
                 actions: {