diff --git a/donjo-app/Views/surat/form/surat_bio_penduduk.php b/donjo-app/Views/surat/form/surat_bio_penduduk.php
index 675fa7c7d..c6a46b7bd 100644
--- a/donjo-app/Views/surat/form/surat_bio_penduduk.php
+++ b/donjo-app/Views/surat/form/surat_bio_penduduk.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?> " class="inputbox required">
+                                <input type="hidden" name="nik" value="<?php echo $individu['id'] ?? ''?> " class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_izin_keramaian.php b/donjo-app/Views/surat/form/surat_izin_keramaian.php
index 9b23acfa7..6de666657 100644
--- a/donjo-app/Views/surat/form/surat_izin_keramaian.php
+++ b/donjo-app/Views/surat/form/surat_izin_keramaian.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_izin_orangtua.php b/donjo-app/Views/surat/form/surat_izin_orangtua.php
index 50a172755..ccbc8b42d 100644
--- a/donjo-app/Views/surat/form/surat_izin_orangtua.php
+++ b/donjo-app/Views/surat/form/surat_izin_orangtua.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>">
+                                <input type="hidden" name="nik" value="<?php echo $individu['id'] ?? '' ?>">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_jalan.php b/donjo-app/Views/surat/form/surat_jalan.php
index 8edda0cab..6170cc6d6 100644
--- a/donjo-app/Views/surat/form/surat_jalan.php
+++ b/donjo-app/Views/surat/form/surat_jalan.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_kehendak_nikah.php b/donjo-app/Views/surat/form/surat_kehendak_nikah.php
index d082a0aa0..7ea29a03b 100644
--- a/donjo-app/Views/surat/form/surat_kehendak_nikah.php
+++ b/donjo-app/Views/surat/form/surat_kehendak_nikah.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_asalusul.php b/donjo-app/Views/surat/form/surat_ket_asalusul.php
index 6f756cc56..ef9e71db9 100644
--- a/donjo-app/Views/surat/form/surat_ket_asalusul.php
+++ b/donjo-app/Views/surat/form/surat_ket_asalusul.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_beda_nama.php b/donjo-app/Views/surat/form/surat_ket_beda_nama.php
index c288bf315..9598bf272 100644
--- a/donjo-app/Views/surat/form/surat_ket_beda_nama.php
+++ b/donjo-app/Views/surat/form/surat_ket_beda_nama.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_catatan_kriminal.php b/donjo-app/Views/surat/form/surat_ket_catatan_kriminal.php
index 06a7b5dc8..654302d01 100644
--- a/donjo-app/Views/surat/form/surat_ket_catatan_kriminal.php
+++ b/donjo-app/Views/surat/form/surat_ket_catatan_kriminal.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_domisili_usaha.php b/donjo-app/Views/surat/form/surat_ket_domisili_usaha.php
index 42027a37f..667dc9243 100644
--- a/donjo-app/Views/surat/form/surat_ket_domisili_usaha.php
+++ b/donjo-app/Views/surat/form/surat_ket_domisili_usaha.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_jual_beli.php b/donjo-app/Views/surat/form/surat_ket_jual_beli.php
index 0e155eb11..183706e9b 100644
--- a/donjo-app/Views/surat/form/surat_ket_jual_beli.php
+++ b/donjo-app/Views/surat/form/surat_ket_jual_beli.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_kehilangan.php b/donjo-app/Views/surat/form/surat_ket_kehilangan.php
index 1cb8da246..2343ae3e6 100644
--- a/donjo-app/Views/surat/form/surat_ket_kehilangan.php
+++ b/donjo-app/Views/surat/form/surat_ket_kehilangan.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_kelahiran.php b/donjo-app/Views/surat/form/surat_ket_kelahiran.php
index 185add2b5..1e7478be6 100644
--- a/donjo-app/Views/surat/form/surat_ket_kelahiran.php
+++ b/donjo-app/Views/surat/form/surat_ket_kelahiran.php
@@ -51,7 +51,7 @@
                         </form>
                 </tr>
                 <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                    <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                    <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                     <?php if($individu){ ?>
                     <tr>
                         <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_kematian.php b/donjo-app/Views/surat/form/surat_ket_kematian.php
index 233572af4..26f8acc9b 100644
--- a/donjo-app/Views/surat/form/surat_ket_kematian.php
+++ b/donjo-app/Views/surat/form/surat_ket_kematian.php
@@ -45,7 +45,9 @@
                         <ul>
                             <?php foreach($menu_surat AS $data){?>
                             <li <?php if($data['url_surat']==$lap){?>class="selected" <?php }?>>
-                                <a href="<?php echo site_url('surat/' . $data['url_surat']) ?>"><?php echo unpenetration($data['nama'])?></a>
+                                <a href="<?php echo site_url('surat/form/' . $data['url_surat']) ?>">
+                                    <?php echo unpenetration($data['nama'])?>
+                                </a>
                             </li>
                             <?php }?>
                         </ul>
@@ -70,7 +72,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_kematian_suami_istri.php b/donjo-app/Views/surat/form/surat_ket_kematian_suami_istri.php
index 8a2682ebb..6a6c5b42d 100644
--- a/donjo-app/Views/surat/form/surat_ket_kematian_suami_istri.php
+++ b/donjo-app/Views/surat/form/surat_ket_kematian_suami_istri.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_kurang_mampu.php b/donjo-app/Views/surat/form/surat_ket_kurang_mampu.php
index bb4b23762..4f32c586a 100644
--- a/donjo-app/Views/surat/form/surat_ket_kurang_mampu.php
+++ b/donjo-app/Views/surat/form/surat_ket_kurang_mampu.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_lahir_mati.php b/donjo-app/Views/surat/form/surat_ket_lahir_mati.php
index efac675bf..04fe0e397 100644
--- a/donjo-app/Views/surat/form/surat_ket_lahir_mati.php
+++ b/donjo-app/Views/surat/form/surat_ket_lahir_mati.php
@@ -57,7 +57,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_nikah.php b/donjo-app/Views/surat/form/surat_ket_nikah.php
index 8bc6f3af0..351f8af24 100644
--- a/donjo-app/Views/surat/form/surat_ket_nikah.php
+++ b/donjo-app/Views/surat/form/surat_ket_nikah.php
@@ -45,7 +45,7 @@
                         <ul>
                             <?php foreach($menu_surat AS $data){?>
                             <li <?php if($data['url_surat']==$lap){?>class="selected" <?php }?>>
-                                    <a href="<?php echo site_url('surat/' . $data['url_surat']) ?>">
+                                <a href="<?php echo site_url('surat/form/' . $data['url_surat']) ?>">
                                     <?php echo unpenetration($data['nama'])?>
                                 </a>
                             </li>
@@ -71,7 +71,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_orangtua.php b/donjo-app/Views/surat/form/surat_ket_orangtua.php
index 7e81b15fc..5b86e764c 100644
--- a/donjo-app/Views/surat/form/surat_ket_orangtua.php
+++ b/donjo-app/Views/surat/form/surat_ket_orangtua.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_penduduk.php b/donjo-app/Views/surat/form/surat_ket_penduduk.php
index a34f4f0f9..0cbaf5357 100644
--- a/donjo-app/Views/surat/form/surat_ket_penduduk.php
+++ b/donjo-app/Views/surat/form/surat_ket_penduduk.php
@@ -54,7 +54,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?php echo $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_pengantar.php b/donjo-app/Views/surat/form/surat_ket_pengantar.php
index 233a46872..301bc1448 100644
--- a/donjo-app/Views/surat/form/surat_ket_pengantar.php
+++ b/donjo-app/Views/surat/form/surat_ket_pengantar.php
@@ -54,7 +54,7 @@
             </div>
             <div id="form-melengkapi-data-permohonan">
                 <form id="validasi" action="" method="POST" target="_blank">
-                    <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                    <input type="hidden" name="nik" value="<?php echo $individu['id'] ?? '' ?>" class="inputbox required">
                     <table class="form">
                         <?php
 						if($individu){
diff --git a/donjo-app/Views/surat/form/surat_ket_pindah_penduduk.php b/donjo-app/Views/surat/form/surat_ket_pindah_penduduk.php
index 23dae4cbc..8ca5535ef 100644
--- a/donjo-app/Views/surat/form/surat_ket_pindah_penduduk.php
+++ b/donjo-app/Views/surat/form/surat_ket_pindah_penduduk.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_ket_usaha.php b/donjo-app/Views/surat/form/surat_ket_usaha.php
index 73550f639..d44eb8e57 100644
--- a/donjo-app/Views/surat/form/surat_ket_usaha.php
+++ b/donjo-app/Views/surat/form/surat_ket_usaha.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_keterangan_rahasia.php b/donjo-app/Views/surat/form/surat_keterangan_rahasia.php
index 3d4bcfc72..309b45d75 100644
--- a/donjo-app/Views/surat/form/surat_keterangan_rahasia.php
+++ b/donjo-app/Views/surat/form/surat_keterangan_rahasia.php
@@ -76,7 +76,7 @@
                         </br>
                         <div id="form-melengkapi-data-permohonan">
                             <form id="validasi" action="" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <table class="form">
                                     <?php
 						if($individu){
diff --git a/donjo-app/Views/surat/form/surat_lap_kehilangan.php b/donjo-app/Views/surat/form/surat_lap_kehilangan.php
index 3685e5946..4260eaade 100644
--- a/donjo-app/Views/surat/form/surat_lap_kehilangan.php
+++ b/donjo-app/Views/surat/form/surat_lap_kehilangan.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_permohonan_akta.php b/donjo-app/Views/surat/form/surat_permohonan_akta.php
index 85bdd432c..ee7f27548 100644
--- a/donjo-app/Views/surat/form/surat_permohonan_akta.php
+++ b/donjo-app/Views/surat/form/surat_permohonan_akta.php
@@ -45,8 +45,12 @@
                         <ul>
                             <?php foreach($menu_surat AS $data){?>
                             <li <?php if($data['url_surat']==$lap){?>class="selected" <?php }?>>
-                            <a href="<?php echo site_url('surat/' . $data['url_surat']) ?>"><?php echo unpenetration($data['nama'])?></a></li>
+                                <a href="<?php echo site_url('surat/form/' . $data['url_surat']) ?>">
+                                    <?php echo unpenetration($data['nama'])?>
+                                </a>
+                            </li>
                             <?php }?>
+                        </ul>
                     </div>
                 </fieldset>
 
@@ -68,7 +72,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_permohonan_duplikat_kelahiran.php b/donjo-app/Views/surat/form/surat_permohonan_duplikat_kelahiran.php
index dca77deeb..bf0236bfe 100644
--- a/donjo-app/Views/surat/form/surat_permohonan_duplikat_kelahiran.php
+++ b/donjo-app/Views/surat/form/surat_permohonan_duplikat_kelahiran.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_pernyataan_akta.php b/donjo-app/Views/surat/form/surat_pernyataan_akta.php
index 2ca84a0f1..5505bcd46 100644
--- a/donjo-app/Views/surat/form/surat_pernyataan_akta.php
+++ b/donjo-app/Views/surat/form/surat_pernyataan_akta.php
@@ -45,7 +45,7 @@
                         <ul>
                             <?php foreach($menu_surat AS $data){?>
                             <li <?php if($data['url_surat']==$lap){?>class="selected" <?php }?>>
-                                <a href="<?php echo site_url('surat/' . $data['url_surat']) ?>">
+                                <a href="<?php echo site_url('surat/form/' . $data['url_surat']) ?>">
                                     <?php echo unpenetration($data['nama'])?>
                                 </a>
                             </li>
@@ -71,7 +71,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/Views/surat/form/surat_persetujuan_mempelai.php b/donjo-app/Views/surat/form/surat_persetujuan_mempelai.php
index 39ca3b481..b14f6db32 100644
--- a/donjo-app/Views/surat/form/surat_persetujuan_mempelai.php
+++ b/donjo-app/Views/surat/form/surat_persetujuan_mempelai.php
@@ -45,7 +45,10 @@
                         <ul>
                             <?php foreach($menu_surat AS $data){?>
                             <li <?php if($data['url_surat']==$lap){?>class="selected" <?php }?>>
-                                <a href="<?php echo site_url('surat/' . $data['url_surat']) ?>"><?php echo unpenetration($data['nama'])?></a></li>
+                                <a href="<?php echo site_url('surat/form/' . $data['url_surat']) ?>">
+                                    <?php echo unpenetration($data['nama'])?>
+                                </a>
+                            </li>
                             <?php }?>
                         </ul>
                     </div>
diff --git a/donjo-app/Views/surat/form/surat_pindah_antar_kab_prov.php b/donjo-app/Views/surat/form/surat_pindah_antar_kab_prov.php
index d0c0e9d8f..519f649e9 100644
--- a/donjo-app/Views/surat/form/surat_pindah_antar_kab_prov.php
+++ b/donjo-app/Views/surat/form/surat_pindah_antar_kab_prov.php
@@ -55,7 +55,7 @@
                                     </form>
                             </tr>
                             <form id="validasi" action="<?php echo $form_action?>" method="POST" target="_blank">
-                                <input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required">
+                                <input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required">
                                 <?php if($individu){ ?>
                                 <tr>
                                     <th>Tempat Tanggal Lahir (Umur)</th>
diff --git a/donjo-app/controllers/Surat.php b/donjo-app/controllers/Surat.php
index ae2b14b9e..f3c8af1bd 100644
--- a/donjo-app/controllers/Surat.php
+++ b/donjo-app/controllers/Surat.php
@@ -79,15 +79,17 @@ public function form($url = '')
         }
         $data['penduduk'] = $this->surat_model->list_penduduk();
         $data['pamong']   = $this->surat_model->list_pamong();
+        $data['menu_surat']    = $this->surat_model->list_surat();
+        $data['lap']    = $url;
 
         $data['form_action']  = site_url("surat/cetak/{$url}");
         $data['form_action2'] = site_url("surat/doc/{$url}");
         $nav['act']           = 1;
         $header               = $this->header_model->get_data();
-        view('header', $header);
 
+        view('header', $header);
         view('surat/nav', $nav);
-        $this->load->view("surat/form/{$url}", $data);
+        view("surat/form/{$url}", $data);
         view('footer');
     }
 
diff --git a/public/surat/raw/form.raw b/public/surat/raw/form.raw
index 0d7fef7f2..4f0c371f2 100644
--- a/public/surat/raw/form.raw
+++ b/public/surat/raw/form.raw
@@ -11,22 +11,22 @@
 			watermark: <?php  if($individu){?>'<?php echo $individu['nik']?> - <?php echo ($individu['nama'])?>'<?php  }else{?>'Ketik no nik di sini..'<?php  }?>,
 			width: 260,
 			noResultsText :'Tidak ada no nik yang sesuai..',
-			onSelect: function(){$('#'+'main').submit();}  
+			onSelect: function(){$('#'+'main').submit();}
 		});
-	
-	
-	$('#showData').click(function(){ 
+
+
+	$('#showData').click(function(){
 		$('tr.hide').show();
 		$('#showData').hide();
-		$('#hideData').show();		
+		$('#hideData').show();
 	});
-	
-	$('#hideData').click(function(){ 
+
+	$('#hideData').click(function(){
 		$('tr.hide').hide();
 		$('#hideData').hide();
-		$('#showData').show();		
+		$('#showData').show();
 	});
-	
+
 		$('#hideData').hide();
 	});
 </script>
@@ -46,7 +46,7 @@ tr .hide{
 <div id="pageC">
 	<table class="inner">
 	<tr style="vertical-align:top">
-	<td style="background:#fff;"> 
+	<td style="background:#fff;">
 		<div id="contentpane">
 			<div class="ui-layout-center" id="maincontent" style="padding: 5px;">
 				<h3>Formulir Layanan : [nama_surat]</h3>
@@ -65,10 +65,10 @@ tr .hide{
 				</br>
 				<div id="form-melengkapi-data-permohonan">
 					<form id="validasi" action="" method="POST" target="_blank">
-					<input type="hidden" name="nik" value="<?php echo $individu['id']?>" class="inputbox required" >
+					<input type="hidden" name="nik" value="<?= $individu['id'] ?? '' ?>" class="inputbox required" >
 					<table class="form">
-						<?php 
-						if($individu){ 
+						<?php
+						if($individu){
 							?>
 							<tr>
 								<th width="200">Tempat Tanggal Lahir (Umur)</th>
@@ -95,7 +95,7 @@ tr .hide{
 									<a class='uibutton' id='hideData'>Sembunyikan</a>
 								</td>
 							</tr>
-							
+
 							<tr class="hide">
 								<th colspan="1">Keluarga</th>
 								<td colspan="1">
@@ -111,11 +111,11 @@ tr .hide{
 													<th width="70" align="left" >Hubungan</th>
 													<th width="70" align="left" >Umur</th>
 													<th width="70" align="left" >Status Kawin</th>
-													<th width="100" align="left" >Pendidikan</th> 
+													<th width="100" align="left" >Pendidikan</th>
 												</tr>
 											</thead>
 											<tbody>
-												<?php 
+												<?php
 												if($anggota!=NULL){
 													$i=0;?>
 												<?php foreach($anggota AS $data){ $i++;?>
@@ -131,7 +131,7 @@ tr .hide{
 													<td><?php echo $data['umur']?></td>
 													<td><?php echo $data['status_kawin']?></td>
 													<td><?php echo $data['pendidikan']?></td>
-												</tr> 
+												</tr>
 												<?php }?>
 												<?php }?>
 											</tbody>
@@ -139,13 +139,13 @@ tr .hide{
 									</div>
 								</td>
 							</tr>
-								 
+
 							<tr>
 								<th>Dokumen Kelengkapan / Syarat</th>
 								<td>
 									<a header="Dokumen" target="ajax-modal" rel="dokumen" href="<?php echo site_url("penduduk/dokumen_list/$individu[id]")?>" class="uibutton special">Daftar Dokumen</a><a target="_blank" href="<?php echo site_url("penduduk/dokumen/$individu[id]")?>" class="uibutton confirm">Manajemen Dokumen</a> )* Atas Nama <?php echo $individu['nama']?> [<?php echo $individu['nik']?>]</td>
 							</tr>
-						<?php 
+						<?php
 						}
 						?>
 						<tr>
@@ -204,7 +204,7 @@ tr .hide{
 						<div class="uibutton-group">
 							<button class="uibutton" type="reset">Clear</button>
 							<button type="button" onclick="$('#'+'validasi').attr('action','<?php echo $form_action?>');$('#'+'validasi').submit();" class="uibutton special"><span class="ui-icon ui-icon-print">&nbsp;</span>Cetak</button>
-							
+
 							<?php if (file_exists("surat/$url/$url.rtf")) { ?><button type="button" onclick="$('#'+'validasi').attr('action','<?php echo $form_action2?>');$('#'+'validasi').submit();" class="uibutton confirm"><span class="ui-icon ui-icon-document">&nbsp;</span>Export Doc</button><?php } ?>
 						</div>
 					</div>
@@ -213,4 +213,4 @@ tr .hide{
 			</td>
 		</tr>
 	</table>
-</div>
\ No newline at end of file
+</div>