diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index edba9aa..3c5b231 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -68,36 +68,36 @@
                     {{ $penawaran->tujuanPenilaianKjpp->name }}
                 </span>
                 </div>
-                @else
+            @else
 
-            <div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
-                    Tujan Permohonan:
-                </h3>
-                <span class="text-2sm text-gray-700">
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Tujan Permohonan:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
                     {{ $permohonan->tujuanPenilaian->name }}
                 </span>
-            </div>
+                </div>
 
-            <div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
-                    Nilai Plafond:
-                </h3>
-                <span class="text-2sm text-gray-700">
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Nilai Plafond:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
                     {{ $permohonan->nilaiPlafond->name }}
                 </span>
-            </div>
+                </div>
 
-            <div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
-                    Status Bayar:
-                </h3>
-                <span
-                    class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Status Bayar:
+                    </h3>
+                    <span
+                        class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
                     {{ str_replace('_', ' ', $permohonan->status_bayar) }}
                 </span>
-            </div>
-                @endif
+                </div>
+            @endif
 
         </div>
     </div>
@@ -263,84 +263,82 @@
                                 </div>
                             </div>
                         @endif
+
+
                         <div class="card-table scrollable-x-auto pb-3">
                             <a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}"
                                class="ml-6 btn btn-dark dark:btn-light">
                                 <i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen
                             </a>
                             <table class="table align-middle text-sm text-gray-500">
-                                @foreach ($dokumen->detail as $detail)
-                                    <tr>
-                                        <td class="py-2 text-gray-600 font-normal max-w-[100px]">
-                                            {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
-                                        </td>
-                                        <td class="py-2 text-gray-800 font-normal text-2sm">
-                                            {{ $detail->name ?? '' }}
-                                        </td>
-                                    </tr>
-                                    @if(isset($detail->details))
-                                        @if(json_decode($detail->details))
-                                            @foreach (json_decode($detail->details) as $key => $value)
-                                                <tr>
-                                                    <td class="py-3 capitalize">
-                                                        {{formatLabel($key)}}
-                                                    </td>
-                                                    <td class="py-2 text-gray-800 font-normal text-2sm">
-                                                        {{ $value ?? "" }}
-                                                    </td>
-                                                </tr>
-                                            @endforeach
-                                        @endif
-                                    @endif
-                                    <tr>
-                                        <td class="py-3  max-w-[100px] align-top">
-                                            Dokumen Jaminan
-                                        </td>
-                                        <td class="py-3 text-gray-700 text-2sm font-normal">
+                                @php $document = $dokumen; @endphp
+                        @foreach($document->detail as $detail)
+                            <tr>
+                                <td colspan="2">
+                                    <strong class="text-2xs text-gray-600 uppercase">
+                                        {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+                                    </strong>
+                                </td>
+                            </tr>
 
-                                            @if (isset($detail->dokumen_jaminan))
-                                                @php
-                                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
-                                                        ? json_decode($detail->dokumen_jaminan)
-                                                        : [$detail->dokumen_jaminan];
-                                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor))
-                                                        ? json_decode($detail->dokumen_nomor)
-                                                        : ($detail->dokumen_nomor
-                                                            ? [$detail->dokumen_nomor]
-                                                            : []);
-                                                @endphp
-                                                @foreach ($dokumen_jaminan as $index => $dokumen)
-                                                    <div class="flex w-full lg:w-[30%]">
-                                                        @if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo']))
-                                                            @if (!empty($dokumen_nomor))
-                                                                <span class="flex-1 mt-2 text-info">Nomor Dokumen :
-                                                            {{ $dokumen_nomor[$index] }}</span>
-                                                            @endif
-                                                            <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
-                                                                {{ basename($dokumen) }}
-                                                                <i class="ki-filled ki-cloud-download"></i>
-                                                            </a>
-                                                        @endif
-                                                        <span class="flex-none badge badge-sm badge-outline badge-warning mt-2"
-                                                              onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i
-                                                                class="ki-filled ki-eye mr-2"></i>Preview</span>
-                                                    </div>
-                                                    <br>
-                                                @endforeach
+                            @if(isset($detail->dokumen_jaminan))
+                                @php
+                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
+                                @endphp
+                                @foreach($dokumen_jaminan as $index => $dokumen)
+                                    <tr>
+                                        <td>
+                                            <span class="text-2xs text-gray-600 uppercase pl-3">
+                                                {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }}
+                                            </span>
+                                        </td>
+                                        <td class="text-left">
+                                            @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
+                                                <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                                   class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                                                    {{ basename($dokumen) }}
+                                                    <i class="ki-filled ki-cloud-download"></i>
+                                                </a>
                                             @endif
+                                            <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')">
+                                                <i class="ki-filled ki-eye mr-2"></i>Preview
+                                            </span>
+                                        </td>
+                                    </tr>
 
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class="py-3  max-w-[100px]">
-                                            Keterangan
-                                        </td>
-                                        <td class="py-3 text-gray-700 text-2sm font-normal">
-                                            {{ $detail->keterangan ?? '' }}
-                                        </td>
-                                    </tr>
+                                    @if(isset($detail->details) && json_decode($detail->details)[$index])
+                                        @foreach (json_decode($detail->details)[$index] as $key => $value)
+                                            <tr>
+                                                <td>
+                                                    <span class="text-2xs text-gray-600 uppercase pl-3">
+                                                        - {{ str_replace("_"," ",$key) ?? "" }}
+                                                    </span>
+                                                </td>
+                                                <td class="text-left">
+                                                    <p class="text-2xs text-gray-600 max-w-[250px]">
+                                                        {{ $value }}
+                                                    </p>
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                    @endif
                                 @endforeach
+                            @endif
+
+                            <tr>
+                                <td>
+                                    <span class="text-2xs text-gray-600 uppercase pl-3">
+                                        - keterangan
+                                    </span>
+                                </td>
+                                <td class="text-right">
+                                    <p class="text-2xs text-gray-600 max-w-[250px]">
+                                        {{ $detail->keterangan }}
+                                    </p>
+                                </td>
+                            </tr>
+                        @endforeach
                             </table>
                         </div>
                     </div>
@@ -349,6 +347,9 @@
         </div>
         @if (!isset($status))
     </div>
+
     @include('lpj::component.history-permohonan')
+
+
 @endif
 @include('lpj::component.pdfviewer')
diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 3bfb80b..bb5d62a 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -506,6 +506,7 @@
     </div>
 </form>
 
+
 @push('scripts')
     {{--Pemilik Jaminan--}}
     <script>
diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php
index b1e12bc..28ff127 100644
--- a/resources/views/debitur/components/jaminan.blade.php
+++ b/resources/views/debitur/components/jaminan.blade.php
@@ -189,6 +189,7 @@
     @endif
 </div>
 
+
 @include('lpj::component.pdfviewer')
 
 @push('scripts')
diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php
index 0af93a7..817d5a6 100644
--- a/resources/views/penawaran/kirimEmail.blade.php
+++ b/resources/views/penawaran/kirimEmail.blade.php
@@ -124,35 +124,41 @@
             @endphp
 
             @foreach ($permohonan->documents as $document)
-                @foreach ($document->detail as $detail)
-                    @php
-                        $details = json_decode($detail->details);
-                    @endphp
+                @foreach ($document->detail as $index => $detail)
+                    @if($detail->details)
+                        @php $luastanah = $luasbangunan = null; @endphp
+                        @foreach (json_decode($detail->details) as $key => $value)
+                            @foreach($value as $k => $v)
+                                @if($k=='luas_tanah')
+                                    @php
+                                        $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+                                    @endphp
+                                @endif
+                                @if($k=='luas_bangunan')
+                                    @php
+                                        $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+                                    @endphp
+                                @endif
+                            @endforeach
+                        @endforeach
+
+                        @if (isset($luastanah) && isset($luasbangunan))
+                            {{ $n }}. {{ $detail->name }}<br>
+                            Luas Tanah / Luas Bangunan: {{ $luastanah }} m<sup>2</sup> / {{ $luasbangunan }} m<sup>2</sup>
+                            <br>
+                            @php $n++; @endphp
+                        @elseif (isset($luastanah))
+                            {{ $n }}. {{ $detail->name }}<br>
+                            Luas Tanah : {{ $luastanah }} m<sup>2</sup>
+                            <br>
+                            @php $n++; @endphp
+                        @elseif (isset($luasbangunan))
+                            {{ $n }}. {{ $detail->name }}<br>
+                            Luas Bangunan: {{ $luasbangunan }} m<sup>2</sup>
+                            <br>
+                            @php $n++; @endphp
+                        @endif
 
-                    @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
-                        {{ $n }}. {{ $detail->name }}<br>
-                        Luas Tanah / Luas Bangunan:
-                        {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
-                        m<sup>2</sup>
-                        /
-                        {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
-                        m<sup>2</sup>
-                        <br>
-                        @php $n++; @endphp
-                    @elseif (isset($details->luas_tanah))
-                        {{ $n }}. {{ $detail->name }}<br>
-                        Luas Tanah :
-                        {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
-                        m<sup>2</sup>
-                        <br>
-                        @php $n++; @endphp
-                    @elseif (isset($details->luas_bangunan))
-                        {{ $n }}. {{ $detail->name }}<br>
-                        Luas Bangunan:
-                        {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
-                        m<sup>2</sup>
-                        <br>
-                        @php $n++; @endphp
                     @endif
                 @endforeach
             @endforeach