diff --git a/composer.json b/composer.json
index 6efbb598..aae53459 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "hotspotbilling/phpnuxbill",
     "type": "template",
     "description": "PHPNuxBill a Hotspot Billing Software.",
-    "keywords": ["template"],
+    "keywords": ["template","PHPMixBill","PHPnuxBill","Mikrotik","Hotspot","Billing"],
     "homepage": "https://github.com/hotspotbilling/phpnuxbill",
     "license": "MIT",
     "authors": [
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index 4aa267a1..6d9e39c0 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -36,6 +36,7 @@ switch ($action) {
         }
 
         $ui->assign('d', $d);
+        $ui->assign('cari', $username);
         $ui->assign('paginator', $paginator);
         run_hook('view_list_billing'); #HOOK
         $ui->display('prepaid.tpl');
@@ -367,7 +368,7 @@ switch ($action) {
             $paginator = Paginator::bootstrap('tbl_voucher', 'code', '%' . $code . '%');
             $d = ORM::for_table('tbl_plans')->where('enabled', '1')
                 ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
-                ->where_like('tbl_plans.code', '%' . $code . '%')
+                ->where_like('tbl_voucher.code', '%' . $code . '%')
                 ->offset($paginator['startpoint'])
                 ->limit($paginator['limit'])
                 ->find_many();
@@ -380,6 +381,7 @@ switch ($action) {
         }
 
         $ui->assign('d', $d);
+        $ui->assign('_code', $code);
         $ui->assign('paginator', $paginator);
         run_hook('view_list_voucher'); #HOOK
         $ui->display('voucher.tpl');
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index bdb8bbd7..1c466ce1 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -50,7 +50,8 @@
                                                     <td>{$ds['validity']} {$ds['validity_unit']}</td>
                                                     <td>{$ds['routers']}</td>
                                                     <td>
-                                                        <a href="{$_url}services/edit/{$ds['id']}" class="btn btn-info btn-sm btn-block">{$_L['Edit']}</a>
+                                                        <a href="{$_url}services/edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                                        <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                                     </td>
                                                 </tr>
                                             {/foreach}
diff --git a/ui/ui/pool.tpl b/ui/ui/pool.tpl
index f631a944..0a83e141 100644
--- a/ui/ui/pool.tpl
+++ b/ui/ui/pool.tpl
@@ -46,7 +46,7 @@
                                     <td>{$ds['routers']}</td>
                                     <td align="center">
                                         <a href="{$_url}pool/edit/{$ds['id']}"
-                                            class="btn btn-warning btn-xs">{$_L['Edit']}</a>
+                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
                                         <a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}"
                                             class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                     </td>
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index 4e59bd84..f71be73e 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -46,7 +46,8 @@
                                                     <td>{$ds['pool']}</td>
                                                     <td>{$ds['routers']}</td>
                                                     <td>
-                                                        <a href="{$_url}services/pppoe-edit/{$ds['id']}" class="btn btn-info btn-sm btn-block">{$_L['Edit']}</a>
+                                                        <a href="{$_url}services/pppoe-edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                                        <a href="{$_url}services/pppoe-delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                                     </td>
                                                 </tr>
                                             {/foreach}
diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl
index bbab67af..dce05ac5 100644
--- a/ui/ui/prepaid.tpl
+++ b/ui/ui/prepaid.tpl
@@ -12,7 +12,7 @@
 												<div class="input-group-addon">
 													<span class="fa fa-search"></span>
 												</div>
-												<input type="text" name="username" class="form-control" placeholder="{$_L['Search_by_Username']}...">
+												<input type="text" name="username" class="form-control" placeholder="{$_L['Search_by_Username']}..." value="{$cari}">
 												<div class="input-group-btn">
 													<button class="btn btn-success">{$_L['Search']}</button>
 												</div>
@@ -49,7 +49,7 @@
                                                     <td>{$ds['routers']}</td>
                                                     <td>
                                                         <a href="{$_url}prepaid/edit/{$ds['id']}" class="btn btn-warning btn-xs">{$_L['Edit']}</a>
-                                                        {* <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a> *}
+                                                        <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                                     </td>
                                                 </tr>
                                             {/foreach}
diff --git a/ui/ui/routers.tpl b/ui/ui/routers.tpl
index 2f4afedc..13345c74 100644
--- a/ui/ui/routers.tpl
+++ b/ui/ui/routers.tpl
@@ -49,7 +49,8 @@
                                     <td>{if $ds['enabled'] == 1}Enabled{else}Disabled{/if}</td>
                                     <td>
                                         <a href="{$_url}routers/edit/{$ds['id']}"
-                                            class="btn btn-info btn-xs btn-block">{$_L['Edit']}</a>
+                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                        <a href="{$_url}routers/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                     </td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index a8678450..c1b91684 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -13,7 +13,7 @@
                                     <span class="fa fa-search"></span>
                                 </div>
                                 <input type="text" name="code" class="form-control"
-                                    placeholder="{$_L['Search_by_Code']}...">
+                                    placeholder="{$_L['Search_by_Code']}..." value="{$_code}">
                                 <div class="input-group-btn">
                                     <button class="btn btn-success">{$_L['Search']}</button>
                                 </div>