diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 1d8be54..11d37b7 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -22,9 +22,13 @@
                                     </td>
                                     <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
                                     <td style="padding: 2px;">
-                                        {{ $item }}
-                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                            <sup>m2</sup>
+                                        @if (strpos(strtolower($key), 'tanggal') !== false)
+                                            {{ formatTanggalIndonesia($item) }}
+                                        @else
+                                            {{ $item }}
+                                            @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                <sup>m2</sup>
+                                            @endif
                                         @endif
                                     </td>
                                 </tr>
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index 9f9d27e..62b20ec 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -98,7 +98,6 @@
 
         @include('lpj::component.print-out-dokument')
 
-
         <tr>
             <td style="width: 20%; padding: 2px;">Atas Nama</td>
             <td style="width: 1%;  padding: 2px;">:</td>
@@ -106,31 +105,25 @@
         </tr>
 
         @if (!empty($memo['lokasi']['address']))
-            <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>
+            @php
+                $alamatFields = [
+                    'Terletak di' => 'address',
+                    'Desa/Kelurahan' => 'village_code',
+                    'Kecamatan' => 'district_code',
+                    'Kabupaten/Kota' => 'city_code',
+                    'Provinsi' => 'province_code'
+                ];
+            @endphp
+
+            @foreach ($alamatFields as $label => $field)
+                @if (!empty($alamat[$field]))
+                    <tr>
+                        <td width="20%">{{ $label }}</td>
+                        <td style="width: 1%; vertical-align: top;">:</td>
+                        <td>{{ $alamat[$field] }}</td>
+                    </tr>
+                @endif
+            @endforeach
         @endif
     </table>