diff --git a/resources/views/component/signature-pad.blade.php b/resources/views/component/signature-pad.blade.php
index ab69e15..3b55a2f 100644
--- a/resources/views/component/signature-pad.blade.php
+++ b/resources/views/component/signature-pad.blade.php
@@ -1,6 +1,13 @@
 <!-- resources/views/signatures/components/signature-pad.blade.php -->
 <div class="text-center border">
     <h3 class="signature-title">{{ ucfirst($type) }}</h3>
+    @if (($type === 'penilai' && Auth::user()->sign))
+
+        <img src="{{ $type === 'penilai'
+                    ? asset('storage/signatures/' . Auth::user()->id . '/' . Auth::user()->sign)
+                    : asset('storage/signatures/' . $user->id . '/' . $user->sign) }}"
+            alt="E-Sign" class="signature-pad" style="width: 400px; height: 220px;">
+    @else
     <canvas id="signature-pad-{{ $type }}" class="signature-pad" width="400" height="200"></canvas>
     <div class="button-container py-2">
         <button type="button" id="save-{{ $type }}" class="btn btn-xs btn-primary">Save</button>
@@ -8,4 +15,5 @@
         <button type="button" id="delete-{{$type}}" class="btn  btn-xs btn-danger">Delete</button>
     </div>
     <div id="status-{{ $type }}" class="status-message"></div>
+    @endif
 </div>
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index e968d62..94de629 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -95,18 +95,6 @@
         .border {
             border: 1px solid #000;
         }
-
-        .photo-item {
-            text-align: center;
-            margin-bottom: 20px;
-        }
-
-        .photo-image {
-            max-width: 80%;
-            height: auto;
-            display: block;
-            margin: 0 auto;
-        }
     </style>
 
 </head>
@@ -282,9 +270,14 @@
         <h2 style="text-transform: uppercase;">DESKRIPSI DEVELOPER</h2>
         <table style="width: 100%;">
             <tr>
-                <td>{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Pengalaman Developer & Proyek Yang Pernah
+                    Dibuat</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
+                <td style="width: 79%;  padding: 2px;">{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td>Apakah Developer Anggota REI</td>
+                <td>:</td>
                 <td>{!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
@@ -292,6 +285,8 @@
             @isset($forminspeksi['lainnya_developer'])
                 @foreach ($forminspeksi['lainnya_developer'] as $item)
                     <tr>
+                        <td>Lainnya</td>
+                        <td>:</td>
                         <td>
                             {!! nl2br(e($item)) !!}
                         </td>
@@ -302,27 +297,44 @@
         <h2 style="text-transform: uppercase;">KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN</h2>
         <table style="width: 100%;">
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kapan Mulai Dibangun & Target Penyelesaian
+                </td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kondisi Perumahan Saat Ini</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Progress Pembangunan</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Kontraktor (internal/eksternal)</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Lingkungan Sekitar</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Komplek Lain Disekitar Lokasi</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Pusat Keramaian Dekat Lokasi</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
+                <td style="vertical-align: top; width: 20%;  padding: 2px;">Transportasi Umum Yang Tersedia</td>
+                <td style="width: 1%;  padding: 2px;">:</td>
                 <td>{!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
@@ -330,6 +342,8 @@
             @isset($forminspeksi['lainnya_kondisi'])
                 @foreach ($forminspeksi['lainnya_kondisi'] as $item)
                     <tr>
+                        <td style="vertical-align: top; width: 20%;  padding: 2px;">Lainnya</td>
+                        <td style="width: 1%;  padding: 2px;">:</td>
                         <td>
                             {!! nl2br(e($item)) !!}
                         </td>
@@ -340,16 +354,15 @@
 
         @isset($forminspeksi['partisi'])
             <h2 style="text-transform: uppercase;">PARTISI BANGUNAN</h2>
-            <table>
+            <table style="width: 100%;">
                 @if (is_array($forminspeksi['partisi']))
                     @foreach ($forminspeksi['partisi'] as $key => $item)
                         @if (is_array($item))
                             <tr>
-                                <td>
+                                <td style="vertical-align: top; width: 20%;  padding: 2px;">
                                     {{ $item['nama'] ?? '' }}
                                 </td>
-                            </tr>
-                            <tr>
+                                <td style="width: 1%;  padding: 2px;">:</td>
                                 <td>
                                     {{ $item['value'] ?? '' }}
                                 </td>
@@ -588,6 +601,53 @@
         </table>
 
         <div class="page-break"></div>
+        <div class="section">
+            <div class="judul">
+                <h6 class="border" style="text-align: center;">
+                    PETA
+                </h6>
+            </div>
+            <div class="photo-container">
+                @php
+                    $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
+                    // Memindahkan foto_tempat ke depan jika ada
+                    if (($key = array_search('foto_tempat', $fotoTypes)) !== false) {
+                        unset($fotoTypes[$key]);
+                        array_unshift($fotoTypes, 'foto_tempat');
+                    }
+                @endphp
+
+                @if (isset($forminspeksi))
+                    @php $counter = 0; @endphp
+                    @foreach ($fotoTypes as $type)
+                        @php
+                            $imagePath = $forminspeksi[$type] ?? null;
+                        @endphp
+                        @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
+                            @if ($counter % 2 == 0)
+                                <div class="photo-row clearfix"
+                                   >
+                            @endif
+                            <div class="photo-item border"
+                                >
+                                <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
+                                class="photo-image">
+                                <p style="margin: 0; font-size: 14px;">
+                                    {{ Str::title(str_replace('_', ' ', $type)) }}
+                                </p>
+                            </div>
+                            @if ($counter % 2 == 1 || $loop->last)
+                                </div>
+                            @endif
+                            @php $counter++; @endphp
+                        @endif
+                    @endforeach
+                @endif
+            </div>
+        </div>
+
+        <div class="page-break"></div>
+
 
         <div class="section">
             <div class="judul">
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index e5a5bff..3ff92b9 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -1295,7 +1295,7 @@
         </table>
         <div class="section">
             <div class="judul">
-                <h6 class="border" style="text-align: center">
+                <h6 class="border" style="text-align: center;">
                     PETA
                 </h6>
             </div>
@@ -1308,6 +1308,7 @@
                         array_unshift($fotoTypes, 'foto_tempat');
                     }
                 @endphp
+
                 @if (isset($forminspeksi))
                     @php $counter = 0; @endphp
                     @foreach ($fotoTypes as $type)
@@ -1316,12 +1317,13 @@
                         @endphp
                         @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
                             @if ($counter % 2 == 0)
-                                <div class="photo-row clearfix">
+                                <div class="photo-row clearfix"
+                                   >
                             @endif
-                            <div class="photo-items" style="float: left; width: 48%; margin-right: 2%; padding: 5px; text-align: center; border: 1px solid #ddd; page-break-inside: avoid;">
-                                <img src="{{ storage_path('app/public/' . $imagePath) }}"
-                                    alt="{{ $type }}"
-                                    style="width: 50%; height: 40%; object-fit: contain; margin-bottom: 10px;">
+                            <div class="photo-item border"
+                                >
+                                <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
+                                class="photo-image">
                                 <p style="margin: 0; font-size: 14px;">
                                     {{ Str::title(str_replace('_', ' ', $type)) }}
                                 </p>
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index ffa8648..6c153a9 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -1337,7 +1337,7 @@
                             <tr>
                                 <td style="">Nilai Pasar Wajar (Rp)</td>
 
-                                <td style="">Rp. 
+                                <td style="">Rp.
                                     {{$lpjData['asuransi_nilai_2'] ?? '' }}</td>
                             </tr>
                         @else
@@ -1815,15 +1815,14 @@
                     </td>
                 </tr>
             </table>
-
+            <div class="page-break"></div>
             <div class="section">
                 <div class="judul">
-                    <h6 class="border">
+                    <h6 class="border" style="text-align: center;">
                         PETA
                     </h6>
                 </div>
-
-                <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 15px;">
+                <div class="photo-container">
                     @php
                         $fotoTypes = ['foto_gistaru', 'foto_bhumi', 'foto_argis_region', 'foto_tempat'];
                         // Memindahkan foto_tempat ke depan jika ada
@@ -1834,20 +1833,28 @@
                     @endphp
 
                     @if (isset($forminspeksi))
+                        @php $counter = 0; @endphp
                         @foreach ($fotoTypes as $type)
                             @php
                                 $imagePath = $forminspeksi[$type] ?? null;
                             @endphp
-
                             @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
-                                <div style="border: 1px solid #ddd; padding: 10px; text-align: center;">
-                                    <img src="{{ storage_path('app/public/' . $imagePath) }}"
-                                        alt="{{ $type }}"
-                                        style="max-width: 100%; height: auto; margin-bottom: 10px;">
+                                @if ($counter % 2 == 0)
+                                    <div class="photo-row clearfix"
+                                       >
+                                @endif
+                                <div class="photo-item border"
+                                    >
+                                    <img src="{{ storage_path('app/public/' . $imagePath) }}" alt="{{ $type }}"
+                                    class="photo-image">
                                     <p style="margin: 0; font-size: 14px;">
                                         {{ Str::title(str_replace('_', ' ', $type)) }}
                                     </p>
                                 </div>
+                                @if ($counter % 2 == 1 || $loop->last)
+                                    </div>
+                                @endif
+                                @php $counter++; @endphp
                             @endif
                         @endforeach
                     @endif
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php
index fa9c821..3872096 100644
--- a/resources/views/surveyor/components/informasi.blade.php
+++ b/resources/views/surveyor/components/informasi.blade.php
@@ -2,7 +2,11 @@
 <div class="card border border-agi-100 w-full ">
     <div class="card-header bg-agi-50">
         <h3 class="card-title uppercase">
-            Informasi Dinas Tata Ruang
+            @if (strtolower($permohonan->tujuanPenilaian->name) == 'rap')
+                ATURAN TATA KOTA
+            @else
+                Informasi Dinas Tata Ruang
+            @endif
         </h3>
     </div>
     <div class="card-body">