diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index 5f201e5..e968d62 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -282,18 +282,18 @@
         <h2 style="text-transform: uppercase;">DESKRIPSI DEVELOPER</h2>
         <table style="width: 100%;">
             <tr>
-                <td>{{ $forminspeksi['pengalaman_developer'] ?? '' }}
-                </td>
+                <td>{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
-                <td>{{ $forminspeksi['developer_anggota'] ?? '' }}</td>
+                <td>{!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
+
             @isset($forminspeksi['lainnya_developer'])
                 @foreach ($forminspeksi['lainnya_developer'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -302,42 +302,36 @@
         <h2 style="text-transform: uppercase;">KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN</h2>
         <table style="width: 100%;">
             <tr>
-                <td>{{ $forminspeksi['kapan_mulai_dibangun'] ?? '' }}
-                </td>
+                <td>{!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
             <tr>
-                <td> {{ $forminspeksi['kondisi_perumahan'] ?? '' }}</td>
+                <td>{!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}</td>
+            </tr>
+            <tr>
+                <td>{!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}</td>
             </tr>
 
-            <tr>
-                <td>
-                    {{ $forminspeksi['progres_pembangunan'] ?? '' }}
-
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    {{ $forminspeksi['kontraktor'] ?? '' }}
-                </td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['lingkungan_sekitar'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['komplek_disekitar'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['pusat_keramaian'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>{{ $forminspeksi['transportasi_umum'] ?? '' }}</td>
-            </tr>
 
             @isset($forminspeksi['lainnya_kondisi'])
                 @foreach ($forminspeksi['lainnya_kondisi'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -372,7 +366,7 @@
                 @foreach ($forminspeksi['jumlah_unit'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -384,7 +378,7 @@
                 @foreach ($forminspeksi['batas_batas_perumahan'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -396,7 +390,7 @@
                 @foreach ($forminspeksi['fasus_fasum'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -408,7 +402,7 @@
                 @foreach ($forminspeksi['progres_penjualan'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -420,7 +414,7 @@
                 @foreach ($forminspeksi['harga_unit'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -432,7 +426,7 @@
                 @foreach ($forminspeksi['target_market'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -444,7 +438,7 @@
                 @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item)
                     <tr>
                         <td>
-                            {{ $item }}
+                            {!! nl2br(e($item)) !!}
                         </td>
                     </tr>
                 @endforeach
@@ -512,9 +506,17 @@
                 $imagePathPenilai = storage_path(
                     'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
                 );
+
                 $soUser = User::where('id', $senior_officer->id)->first();
                 $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
 
+                $imagePathEO = storage_path(
+                    'app/public/signatures/' .
+                        User::role('EO Appraisal')->first()->id .
+                        '/' .
+                        User::role('EO Appraisal')->first()->sign,
+                );
+
                 $imagePathDD = storage_path(
                     'app/public/signatures/' .
                         User::role('DD Appraisal')->first()->id .
@@ -523,23 +525,32 @@
                 );
             @endphp
             <tr>
-                <td style="height: 50px;"></td>
-                <td style="height: 50px;">
-                    @if (file_exists($imagePathDD))
-                        <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
-                    @endif
-                </td>
-                <td style="height: 50px;">
-                    @if (file_exists($imagePathSo))
-                        <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
-                    @endif
-                </td>
-                <td style="height: 50px;">
+                <td style=" padding: 4px;height: 50px">
                     @if (file_exists($imagePathPenilai))
                         <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                     @endif
                 </td>
-
+                @if ($permohonan->approval_so != null)
+                    <td style=" padding: 4px;height: 50px">
+                        @if (file_exists($imagePathSo))
+                            <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
+                        @endif
+                    </td>
+                @endif
+                @if ($permohonan->approval_eo != null)
+                    <td style=" padding: 4px;height: 50px">
+                        @if (file_exists($imagePathEO))
+                            <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
+                        @endif
+                    </td>
+                @endif
+                @if ($permohonan->approval_dd != null)
+                    <td style=" padding: 4px;height: 50px">
+                        @if (file_exists($imagePathDD))
+                            <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
+                        @endif
+                    </td>
+                @endif
             </tr>
 
             <tr>
@@ -547,19 +558,32 @@
                 <td>{{ $penilai->userPenilaiTeam->name ?? '' }}
                     <br>{{ ucwords(strtolower('PENILAI')) }}
                 </td>
-                <td>
-                    @if ($permohonan->approval_eo != null)
-                        {{ $senior_officer->name ?? '' }}
-                        <br> {{ ucwords(strtolower('SENIOR OFFICER')) }}
-                    @endif
-                </td>
+                @if ($permohonan->approval_so != null)
+                    <td style=" padding: 4px;">
+                        {{ $senior_officer->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                        </span>
 
-                <td>
-                    @if ($permohonan->approval_dd != null)
-                        {{ User::role('DD Appraisal')->first()->name ?? '' }}
-                        <br>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
-                    @endif
-                </td>
+                    </td>
+                @endif
+                @if ($permohonan->approval_eo != null)
+                    <td style=" padding: 4px;">
+                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                        </span>
+                    </td>
+                @endif
+
+                @if ($permohonan->approval_dd != null)
+                    <td style=" padding: 4px;">
+                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                        <span>
+                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                        </span>
+                    </td>
+                @endif
             </tr>
         </table>
 
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index b442693..52fa692 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -95,7 +95,7 @@
                                     </td>
                                 </tr>
                             @endif
-                            @if (in_array($permohonan->nilai_plafond_id, [1, 4]) && $permohonan->approval_dd != null)
+                            @if (in_array($permohonan->nilai_plafond_id, [1,2, 4]) && $permohonan->approval_dd != null)
                                 <tr>
                                     <td>Disetujui Oleh (DD)</td>
                                     <td>{{ getUser($permohonan->approval_dd)->name ?? 'N/A' }}</td>
@@ -151,7 +151,7 @@
                         @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
                                 $permohonan->approval_eo &&
                                 $permohonan->approval_dd == null &&
-                                in_array($permohonan->nilai_plafond_id, [1, 4]))
+                                in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}