diff --git a/donjo-app/models/Web_menu_model.php b/donjo-app/models/Web_menu_model.php
index ce059ad13..f4be57832 100644
--- a/donjo-app/models/Web_menu_model.php
+++ b/donjo-app/models/Web_menu_model.php
@@ -96,7 +96,7 @@ public function list_data($tip = 0, $o = 0, $offset = 0, $limit = 500)
         while ($i < count($data)) {
             $data[$i]['no'] = $j + 1;
 
-            if ($data[$i]['enabled'] === 1) {
+            if (isset($data[$i]['enabled']) && $data[$i]['enabled'] === 1) {
                 $data[$i]['aktif'] = 'Yes';
             } else {
                 $data[$i]['aktif'] = 'No';
diff --git a/donjo-app/views/kategori/form.php b/donjo-app/views/kategori/form.php
index f284ba60e..fb9fefb9f 100644
--- a/donjo-app/views/kategori/form.php
+++ b/donjo-app/views/kategori/form.php
@@ -48,7 +48,7 @@
                             <table class="form">
                                 <tr>
                                     <th>Nama Kategori</th>
-                                    <td><input class="inputbox" type="text" name="kategori" value="<?php echo $kategori['kategori']?>" size="40"></td>
+                                    <td><input class="inputbox" type="text" name="kategori" value="<?php echo @$kategori['kategori']?>" size="40"></td>
                                 </tr>
                             </table>
                         </div>
diff --git a/donjo-app/views/menu/form.php b/donjo-app/views/menu/form.php
index 35e9401ce..9e3c687ef 100644
--- a/donjo-app/views/menu/form.php
+++ b/donjo-app/views/menu/form.php
@@ -48,7 +48,7 @@
                             <table class="form">
                                 <tr>
                                     <th>Nama Menu</th>
-                                    <td><input class="inputbox" type="text" name="nama" value="<?php echo $menu['nama']?>" size="40"></td>
+                                    <td><input class="inputbox" type="text" name="nama" value="<?php echo @$menu['nama']?>" size="40"></td>
                                 </tr>
                                 <?php if($menu){?>
                                 <tr>
diff --git a/donjo-app/views/menu/table.php b/donjo-app/views/menu/table.php
index b7a1d1248..985768fce 100644
--- a/donjo-app/views/menu/table.php
+++ b/donjo-app/views/menu/table.php
@@ -1,11 +1,10 @@
 <script>
     $(function() {
-        var keyword = <?php echo $keyword?>;
+        var keyword = <?php echo $keyword ?>;
         $("#cari").autocomplete({
             source: keyword
         });
     });
-
 </script>
 <div id="pageC">
     <table class="inner">
@@ -19,23 +18,23 @@
                             <h3>Manajemen Menu Statis</h3>
                             <div class="left">
                                 <div class="uibutton-group">
-                                    <a href="<?php echo site_url("menu/form/$tip")?>" class="uibutton tipsy south" title="Tambah Data"><span class="fa fa-plus">&nbsp;</span>Tambah Menu Baru</a>
-                                    <button type="button" title="Hapus Data" onclick="deleteAllBox('mainform','<?php echo site_url("menu/delete_all/$tip/$p/$o")?>')" class="uibutton tipsy south"><span class="fa fa-trash-o">&nbsp;</span>Hapus Data
+                                    <a href="<?php echo site_url("menu/form/$tip") ?>" class="uibutton tipsy south" title="Tambah Data"><span class="fa fa-plus">&nbsp;</span>Tambah Menu Baru</a>
+                                    <button type="button" title="Hapus Data" onclick="deleteAllBox('mainform','<?php echo site_url("menu/delete_all/$tip/$p/$o") ?>')" class="uibutton tipsy south"><span class="fa fa-trash-o">&nbsp;</span>Hapus Data
                                 </div>
                             </div>
                         </div>
                         <div class="ui-layout-center" id="maincontent" style="padding: 5px;">
                             <div class="table-panel top">
                                 <div class="left">
-                                    <select name="filter" onchange="formAction('mainform','<?php echo site_url('menu/filter')?>')">
+                                    <select name="filter" onchange="formAction('mainform','<?php echo site_url('menu/filter') ?>')">
                                         <option value="">Semua</option>
-                                        <option value="1" <?php if($filter==1) :?>selected<?php endif?>>Enabled</option>
-                                        <option value="2" <?php if($filter==2) :?>selected<?php endif?>>Disabled</option>
+                                        <option value="1" <?php if ($filter == 1) : ?>selected<?php endif ?>>Enabled</option>
+                                        <option value="2" <?php if ($filter == 2) : ?>selected<?php endif ?>>Disabled</option>
                                     </select>
                                 </div>
                                 <div class="right">
-                                    <input name="cari" id="cari" type="text" class="inputbox help tipped" size="20" value="<?php echo $cari?>" title="Cari.." onkeypress="if (event.keyCode == 13) {$('#'+'mainform').attr('action','<?php echo site_url("menu/search/$tip")?>');$('#'+'mainform').submit();}">
-                                    <button type="button" onclick="$('#'+'mainform').attr('action','<?php echo site_url("menu/search/$tip")?>');$('#'+'mainform').submit();" class="uibutton tipsy south" title="Cari Data"><span class="fa fa-search">&nbsp;</span>Cari</button>
+                                    <input name="cari" id="cari" type="text" class="inputbox help tipped" size="20" value="<?php echo $cari ?>" title="Cari.." onkeypress="if (event.keyCode == 13) {$('#'+'mainform').attr('action','<?php echo site_url("menu/search/$tip") ?>');$('#'+'mainform').submit();}">
+                                    <button type="button" onclick="$('#'+'mainform').attr('action','<?php echo site_url("menu/search/$tip") ?>');$('#'+'mainform').submit();" class="uibutton tipsy south" title="Cari Data"><span class="fa fa-search">&nbsp;</span>Cari</button>
                                 </div>
                             </div>
                             <table class="list">
@@ -44,45 +43,56 @@
                                         <th>No</th>
                                         <th><input type="checkbox" class="checkall"></th>
                                         <th width="160">Aksi</th>
-                                        <?php if($o==2): ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/1")?>">Nama<span class="ui-icon ui-icon-triangle-1-n">
-                                                    <?php elseif($o==1): ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/2")?>">Nama<span class="ui-icon ui-icon-triangle-1-s">
-                                                    <?php else: ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/1")?>">Nama<span class="ui-icon ui-icon-triangle-2-n-s">
-                                                    <?php endif; ?>&nbsp;</span></a></th>
-                                        <?php if($o==4): ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/3")?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-1-n">
-                                                    <?php elseif($o==3): ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/4")?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-1-s">
-                                                    <?php else: ?>
-                                        <th align="left"><a href="<?php echo site_url("menu/index/$p/3")?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-2-n-s">
-                                                    <?php endif; ?>&nbsp;</span></a></th>
-                                        <th>Link</th>
+                                        <?php if ($o == 2) : ?>
+                                            <th align="left"><a href="<?php echo site_url("menu/index/$p/1") ?>">Nama<span class="ui-icon ui-icon-triangle-1-n">
+                                                    <?php elseif ($o == 1) : ?>
+                                            <th align="left"><a href="<?php echo site_url("menu/index/$p/2") ?>">Nama<span class="ui-icon ui-icon-triangle-1-s">
+                                                    <?php else : ?>
+                                            <th align="left"><a href="<?php echo site_url("menu/index/$p/1") ?>">Nama<span class="ui-icon ui-icon-triangle-2-n-s">
+                                                        <?php endif; ?>&nbsp;</span></a></th>
+                                            <?php if ($o == 4) : ?>
+                                                <th align="left"><a href="<?php echo site_url("menu/index/$p/3") ?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-1-n">
+                                                        <?php elseif ($o == 3) : ?>
+                                                <th align="left"><a href="<?php echo site_url("menu/index/$p/4") ?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-1-s">
+                                                        <?php else : ?>
+                                                <th align="left"><a href="<?php echo site_url("menu/index/$p/3") ?>">Enabled / Disabled<span class="ui-icon ui-icon-triangle-2-n-s">
+                                                            <?php endif; ?>&nbsp;</span></a></th>
+                                                <th>Link</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php foreach($main as $data){?>
-                                    <tr>
-                                        <td align="center" width="2"><?php echo $data['no']?></td>
-                                        <td align="center" width="5">
-                                            <input type="checkbox" name="id_cb[]" value="<?php echo $data['id']?>">
-                                        </td>
-                                        <td>
-                                            <div class="uibutton-group">
-                                                <a href="<?php echo site_url("menu/sub_menu/$tip/$data[id]")?>" class="uibutton tipsy south" title="Rincian Sub Menu"><span class="fa fa-list"> Rincian</span></a>
-                                                <a href="<?php echo site_url("menu/form/$tip/$data[id]")?>" class="uibutton tipsy south" title="Ubah Data"><span class="fa fa-pencil"></span></a>
-                                                <a href="<?php echo site_url("menu/delete/$tip/$data[id]")?>" class="uibutton tipsy south" title="Hapus Data" target="confirm" message="Apakah Anda Yakin?" header="Hapus Data"><span class="fa fa-trash-o"></span></a><?php if($data['enabled'] == '2'):?>
-                                                <a href="<?php echo site_url("menu/menu_lock/$tip/".$data['id'])?>" title="Aktivasi menu"><span class="fa fa-lock"></span></a><?php elseif($data['enabled'] == '1'): ?><a href="<?php echo site_url("menu/menu_unlock/$tip/".$data['id'])?>" class="uibutton tipsy south" title="Non-aktifkan menu"><span class="fa fa-unlock"></span></a>
-                                                <a href="<?php echo site_url("menu/ajax_add_sub_menu/$tip/$data[id]")?>" class="uibutton tipsy south" target="ajax-modalx" rel="window" header="Tambah Sub Menu <?php echo $data['nama']?>" class="uibutton tipsy south" title="Tambah Sub Menu"><span class="fa fa-plus"></span></a>
-                                                <?php endif?>
-                                            </div>
-                                        </td>
-                                        <td><?php echo $data['nama']?></td>
-                                        <td><?php echo $data['aktif']?></td>
-                                        <td><?php echo $data['link']?></td>
-                                    </tr>
-                                    <?php }?>
+                                    <?php foreach ($main as $data) { ?>
+                                        <tr>
+                                            <td align="center" width="2"><?php echo $data['no'] ?></td>
+                                            <td align="center" width="5">
+                                                <input type="checkbox" name="id_cb[]" value="<?php echo $data['id'] ?>">
+                                            </td>
+                                            <td>
+                                                <div class="uibutton-group">
+                                                    <a href="<?php echo site_url("menu/sub_menu/$tip/$data[id]") ?>" class="uibutton tipsy south" title="Rincian Sub Menu"><span class="fa fa-list"> Rincian</span></a>
+                                                    <a href="<?php echo site_url("menu/form/$tip/$data[id]") ?>" class="uibutton tipsy south" title="Ubah Data"><span class="fa fa-pencil"></span></a>
+                                                    <a href="<?php echo site_url("menu/delete/$tip/$data[id]") ?>" class="uibutton tipsy south" title="Hapus Data" target="confirm" message="Apakah Anda Yakin?" header="Hapus Data"><span class="fa fa-trash-o"></span></a>
+                                                    <?php if (isset($data['enabled'])) : ?>
+                                                        <?php if ($data['enabled'] == '2') : ?>
+                                                            <a href="<?php echo site_url("menu/menu_lock/$tip/" . $data['id']) ?>" title="Aktivasi menu">
+                                                                <span class="fa fa-lock"></span>
+                                                            </a>
+                                                        <?php elseif ($data['enabled'] == '1') : ?>
+                                                            <a href="<?php echo site_url("menu/menu_unlock/$tip/" . $data['id']) ?>" class="uibutton tipsy south" title="Non-aktifkan menu">
+                                                                <span class="fa fa-unlock"></span>
+                                                            </a>
+                                                            <a href="<?php echo site_url("menu/ajax_add_sub_menu/$tip/$data[id]") ?>" class="uibutton tipsy south" target="ajax-modalx" rel="window" header="Tambah Sub Menu <?php echo $data['nama'] ?>" class="uibutton tipsy south" title="Tambah Sub Menu">
+                                                                <span class="fa fa-plus"></span>
+                                                            </a>
+                                                        <?php endif ?>
+                                                    <?php endif ?>
+                                                </div>
+                                            </td>
+                                            <td><?php echo $data['nama'] ?></td>
+                                            <td><?php echo $data['aktif'] ?></td>
+                                            <td><?= site_url('first/kategori/' . $data['id']) ?></td>
+                                        </tr>
+                                    <?php } ?>
                                 </tbody>
                             </table>
                         </div>
@@ -90,39 +100,39 @@
                     <div class="ui-layout-south panel bottom">
                         <div class="left">
                             <div class="table-info">
-                                <form id="paging" action="<?php echo site_url('menu')?>" method="post">
+                                <form id="paging" action="<?php echo site_url('menu') ?>" method="post">
                                     <label>Tampilkan</label>
                                     <select name="per_page" onchange="$('#paging').submit()">
-                                        <option value="20" <?php selected($per_page,20); ?>>20</option>
-                                        <option value="50" <?php selected($per_page,50); ?>>50</option>
-                                        <option value="100" <?php selected($per_page,100); ?>>100</option>
+                                        <option value="20" <?php selected($per_page, 20); ?>>20</option>
+                                        <option value="50" <?php selected($per_page, 50); ?>>50</option>
+                                        <option value="100" <?php selected($per_page, 100); ?>>100</option>
                                     </select>
                                     <label>Dari</label>
-                                    <label><strong><?php echo $paging->num_rows?></strong></label>
+                                    <label><strong><?php echo $paging->num_rows ?></strong></label>
                                     <label>Total Data</label>
                                 </form>
                             </div>
                         </div>
                         <div class="right">
                             <div class="uibutton-group">
-                                <?php if($paging->start_link): ?>
-                                <a href="<?php echo site_url("menu/index/$paging->start_link/$o")?>" class="uibutton">Awal</a>
+                                <?php if ($paging->start_link) : ?>
+                                    <a href="<?php echo site_url("menu/index/$paging->start_link/$o") ?>" class="uibutton">Awal</a>
                                 <?php endif; ?>
-                                <?php if($paging->prev): ?>
-                                <a href="<?php echo site_url("menu/index/$paging->prev/$o")?>" class="uibutton">Prev</a>
+                                <?php if ($paging->prev) : ?>
+                                    <a href="<?php echo site_url("menu/index/$paging->prev/$o") ?>" class="uibutton">Prev</a>
                                 <?php endif; ?>
                             </div>
                             <div class="uibutton-group">
-                                <?php for($i=$paging->start_link;$i<=$paging->end_link;$i++): ?>
-                                <a href="<?php echo site_url("menu/index/$i/$o")?>" <?php jecho($p,$i,"class='uibutton special'")?> class="uibutton"><?php echo $i?></a>
+                                <?php for ($i = $paging->start_link; $i <= $paging->end_link; $i++) : ?>
+                                    <a href="<?php echo site_url("menu/index/$i/$o") ?>" <?php jecho($p, $i, "class='uibutton special'") ?> class="uibutton"><?php echo $i ?></a>
                                 <?php endfor; ?>
                             </div>
                             <div class="uibutton-group">
-                                <?php if($paging->next): ?>
-                                <a href="<?php echo site_url("menu/index/$paging->next/$o")?>" class="uibutton">Next</a>
+                                <?php if ($paging->next) : ?>
+                                    <a href="<?php echo site_url("menu/index/$paging->next/$o") ?>" class="uibutton">Next</a>
                                 <?php endif; ?>
-                                <?php if($paging->end_link): ?>
-                                <a href="<?php echo site_url("menu/index/$paging->end_link/$o")?>" class="uibutton">Akhir</a>
+                                <?php if ($paging->end_link) : ?>
+                                    <a href="<?php echo site_url("menu/index/$paging->end_link/$o") ?>" class="uibutton">Akhir</a>
                                 <?php endif; ?>
                             </div>
                         </div>