diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index cf911e3..9963b28 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -52,7 +52,7 @@
             if ($validate) {
                 if(auth()->user()->hasRole('admin')){
                        $validate['status'] = "preregister";
-               }
+                }
                 try {
                     // Process file upload
                     $filePath = null;
diff --git a/resources/views/penilai/components/call-report.blade.php b/resources/views/penilai/components/call-report.blade.php
index 44f2bf8..d5584a0 100644
--- a/resources/views/penilai/components/call-report.blade.php
+++ b/resources/views/penilai/components/call-report.blade.php
@@ -504,7 +504,7 @@
             </div>
 
             <div class="flex gap-2 justify-end" style="margin-right: 20px; margin-top: 20px">
-                @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
+                @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator','EO Appraisal']))
                     <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                         <i class="ki-filled ki-save-2"></i>
                         <span id="saveButtonText">Simpan</span>
diff --git a/resources/views/penilai/components/lpj-sederhana-standar.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php
index 4a89822..2ba89cc 100644
--- a/resources/views/penilai/components/lpj-sederhana-standar.blade.php
+++ b/resources/views/penilai/components/lpj-sederhana-standar.blade.php
@@ -44,7 +44,7 @@
             </div>
         </div>
         <div class="flex gap-5 justify-end card-footer">
-            @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator','penilai']))
+            @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator','penilai','EO Appraisal']))
             <button type="button" class="btn btn-primary" id="saveButton" onclick="saveLpjSederhanadanStandard()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])  ? 'disabled' : '' }}>
                 <i class="ki-filled ki-save-2"></i>
                 <span id="saveButtonText">Simpan</span>
diff --git a/resources/views/penilai/components/memo.blade.php b/resources/views/penilai/components/memo.blade.php
index fd860b3..3ba8ebd 100644
--- a/resources/views/penilai/components/memo.blade.php
+++ b/resources/views/penilai/components/memo.blade.php
@@ -315,7 +315,7 @@
             {{-- @include('lpj::penilai.components.foto-lampiran') --}}
 
             <div class="flex gap-5 justify-end card-footer">
-                @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
+                @if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator','EO Appraisal']))
                     <a class="btn btn-primary" onclick="saveMemo()"
                         {{ $permohonan->status == 'proses-paparan' || ($permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])) ? 'disabled' : '' }}>
                         <i class="ki-filled ki-save-2"></i>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 7fc94a6..6303da2 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -555,30 +555,8 @@
                             }
                         @endphp
 
-                        @if (isset($lpjData['npw_tambahan']))
-                            @foreach ($lpjData['npw_tambahan'] as $npw)
-                                <tr>
-                                    <td width="30%" style="padding: 3px; text-align: right;">
-                                        {{ $npw['name'] }}</sup>
-                                    </td>
-                                    <td width="10%" style="padding: 3px; text-align: right;">
-                                        {{ $npw['luas'] }} m<sup>2</sup>
-                                    </td>
-                                    <td width="5%" style="padding: 3px; text-align: center;">X</td>
-                                    <td width="25%"  style="padding: 3px; text-align:right">
-                                        {{ formatRupiah($npw['nilai_1'] ?? 0, 0, false) ?? '' }}
-                                    </td>
-                                    <td width="5"  style="padding: 3px; text-align: center;">
-                                        =
-                                    </td>
-                                    <td  width="25%"  style="padding: 3px; text-align: left; text-align: right;">
-                                        {{ formatRupiah($npw['nilai_2'] ?? 0, 0, false) ?? '' }}
-                                    </td>
-                                </tr>
-                                @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $npw['nilai_2']); @endphp
-                            @endforeach
-                        @else
-                            {{-- Fallback untuk data tanpa npw_tambahan --}}
+                        {{-- Fallback untuk data tanpa npw_tambahan --}}
+                        @if(!$permohonan->is_mig)
                             @if (isset($lpjData['luas_tanah']))
                                 <tr>
                                     <td width="30%" style="padding: 3px; text-align: right;">Tanah</td>
@@ -602,6 +580,29 @@
                                 @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $lpjData['nilai_bangunan_2']); @endphp
                             @endif
                         @endif
+                        @if (isset($lpjData['npw_tambahan']))
+                            @foreach ($lpjData['npw_tambahan'] as $npw)
+                                <tr>
+                                    <td width="30%" style="padding: 3px; text-align: right;">
+                                        {{ $npw['name'] }}</sup>
+                                    </td>
+                                    <td width="10%" style="padding: 3px; text-align: right;">
+                                        {{ $npw['luas'] }} m<sup>2</sup>
+                                    </td>
+                                    <td width="5%" style="padding: 3px; text-align: center;">X</td>
+                                    <td width="25%"  style="padding: 3px; text-align:right">
+                                        {{ formatRupiah($npw['nilai_1'] ?? 0, 0, false) ?? '' }}
+                                    </td>
+                                    <td width="5"  style="padding: 3px; text-align: center;">
+                                        =
+                                    </td>
+                                    <td  width="25%"  style="padding: 3px; text-align: left; text-align: right;">
+                                        {{ formatRupiah($npw['nilai_2'] ?? 0, 0, false) ?? '' }}
+                                    </td>
+                                </tr>
+                                @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $npw['nilai_2']); @endphp
+                            @endforeach
+                        @endif
                         <tr>
                             <td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="4">Total Nilai Pasar Wajar</td>
                             <td style="padding: 3px; text-align: center; width:5%;font-weight: bold;" >=</td>
@@ -643,36 +644,64 @@
 
                                 @if (!empty($keterangan))
                                     @if (is_array($keterangan))
-                                        @foreach ($keterangan as $item)
-                                        <table style="width: 100%; border-collapse: collapse;">
-                                            <tr>
-                                                <td>
-                                                    @php
-                                                        $items_ = explode('- ', $item);
-                                                    @endphp
-                                                    @foreach ($items_ as $item_)
-                                                        @if(!empty($item_))
-                                                            - {{ trim($item_) }}<br>
-                                                        @endif
-                                                    @endforeach
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        @endforeach
+                                        <div style="margin: 0; padding: 0;">
+                                            @foreach ($keterangan as $index => $item)
+                                                @php
+                                                    $cleanItem = trim($item);
+                                                    $isNumbered = preg_match('/^\d+\./', $cleanItem);
+                                                    $isBullet = preg_match('/^[-•]/', $cleanItem);
+                                                @endphp
+                                                <div style="margin-bottom: 8px; line-height: 1.4;">
+                                                                                                        @if ($isNumbered || $isBullet)
+                                                        {{ $cleanItem }}
+                                                    @else
+                                                        @if ($index > 0 && !empty($cleanItem))- @endif{{ $cleanItem }}
+                                                    @endif
+                                                </div>
+                                            @endforeach
+                                        </div>
                                     @else
-                                        <table style="width: 100%; border-collapse: collapse;">
-                                            <tr>
-                                                <td>
-                                                    @php
-                                                        $items = explode('- ', $keterangan);
-                                                    @endphp
-                                                    @foreach ($items as $item)
-                                                        - {{ trim($item) }}<br>
-                                                    @endforeach
-                                                </td>
-                                            </tr>
-                                        </table>
+                                        @php
+                                            // Handle string format - normalize line endings first
+                                            $keterangan = str_replace(["\r\n", "\r"], "\n", $keterangan);
+                                            $items = [];
+
+                                            if (strpos($keterangan, '"') !== false) {
+                                                // Handle quoted strings (array format)
+                                                preg_match_all('/"([^"]*)"/', $keterangan, $matches);
+                                                $items = $matches[1];
+                                            } else {
+                                                // Handle line-separated items
+                                                $rawItems = explode("\n", $keterangan);
+                                                foreach ($rawItems as $item) {
+                                                    $cleanItem = trim($item);
+                                                    // Skip empty items
+                                                    if (!empty($cleanItem)) {
+                                                        $items[] = $cleanItem;
+                                                    }
+                                                }
+                                            }
+                                        @endphp
+                                        <div style="margin: 0; padding: 0;">
+                                            @foreach ($items as $index => $item)
+                                                @php
+                                                    $cleanItem = trim($item);
+                                                    if (!empty($cleanItem))
+                                                @endphp
+                                                <div style="margin-bottom: 8px; line-height: 1.4;">
+                                                    @if (preg_match('/^\d+\./', $cleanItem))
+                                                        {{ $cleanItem }}
+                                                    @elseif (preg_match('/^[-•]/', $cleanItem))
+                                                        {{ $cleanItem }}
+                                                    @else
+                                                        - {{ $cleanItem }}
+                                                    @endif
+                                                </div>
+                                            @endforeach
+                                        </div>
                                     @endif
+                                @else
+                                    <div style="color: #666; font-style: italic;">Tidak ada catatan khusus</div>
                                 @endif
                             </td>
                         </tr>
diff --git a/resources/views/penilai/components/rap-penilai.blade.php b/resources/views/penilai/components/rap-penilai.blade.php
index 4393b3a..43ce9aa 100644
--- a/resources/views/penilai/components/rap-penilai.blade.php
+++ b/resources/views/penilai/components/rap-penilai.blade.php
@@ -69,7 +69,7 @@
             @include('lpj::surveyor.components.header')
             @include('lpj::surveyor.components.rap')
             <div class="flex gap-2 justify-end" style="margin-right: 20px; margin-top: 20px">
-                @if (Auth::user()->hasAnyRole(['senior-officer', 'penilai', 'administrator']))
+                @if (Auth::user()->hasAnyRole(['senior-officer', 'penilai', 'administrator','EO Appraisal']))
                     <button type="button" class="btn btn-primary" id="saveButton" onclick="submitData()"
                         {{ $permohonan->status == 'proses-paparan' || ($permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])) ? 'disabled' : '' }}>
                         <i class="ki-filled ki-save-2"></i>
@@ -111,7 +111,7 @@
 
             if (status === 'sesuai') {
                 addressInput.value = {!! json_encode($dokumen->address ?? '') !!};
-                
+
                 inputs.forEach(element => {
                     if (element.tagName === 'INPUT') {
                         element.setAttribute('readonly', true);
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
index 1ede942..35fba65 100644
--- a/resources/views/penilai/components/signature-approval.blade.php
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -114,7 +114,7 @@
                     <span>
                         @php
     $tgl = $permohonan_migrasi->mig_mst_jaminan_tgl_laporan ?? null;
-@endphp		
+@endphp
 
 			{{ $tgl ? formatTanggalIndonesia(parseTimestamp($tgl)) : '' }}