diff --git a/system/controllers/plan.php b/system/controllers/plan.php
index 7d8982e5..d3a1d144 100644
--- a/system/controllers/plan.php
+++ b/system/controllers/plan.php
@@ -415,11 +415,7 @@ switch ($action) {
                 $query->where_in('generated_by', $sales);
             }
         }
-        if ($search != '') {
-            $d = Paginator::findMany($query, ["search" => $search], 10, $append_url);
-        } else {
-            $d = Paginator::findMany($query, [], 10, $append_url);
-        }
+        $d = Paginator::findMany($query, ["search" => $search], 10, $append_url);
         // extract admin
         $admins = [];
         foreach ($d as $k) {
diff --git a/system/controllers/services.php b/system/controllers/services.php
index 32a0b46a..8e329b04 100644
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@@ -54,21 +54,88 @@ switch ($action) {
         r2(U . 'services/hotspot', 'w', 'Unknown command');
     case 'hotspot':
         $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/hotspot.js"></script>');
+        $name = _req('name');
+        $type1 = _req('type1');
+        $type2 = _req('type2');
+        $type3 = _req('type3');
+        $bandwidth = _req('bandwidth');
+        $valid = _req('valid');
+        $device = _req('device');
+        $status = _req('status');
+        $router = _req('router');
+        $ui->assign('type1', $type1);
+        $ui->assign('type2', $type2);
+        $ui->assign('type3', $type3);
+        $ui->assign('bandwidth', $bandwidth);
+        $ui->assign('valid', $valid);
+        $ui->assign('device', $device);
+        $ui->assign('status', $status);
+        $ui->assign('router', $router);
 
-        $name = _post('name');
-        if ($name != '') {
-            $query = ORM::for_table('tbl_bandwidth')->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = Paginator::findMany($query, ['name' => $name]);
-        } else {
-            $query = ORM::for_table('tbl_bandwidth')->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
-            $d = Paginator::findMany($query);
+        $append_url = "&type1=" . urlencode($type1)
+            . "&type2=" . urlencode($type2)
+            . "&type3=" . urlencode($type3)
+            . "&bandwidth=" . urlencode($bandwidth)
+            . "&valid=" . urlencode($valid)
+            . "&device=" . urlencode($device)
+            . "&status=" . urlencode($status)
+            . "&router=" . urlencode($router);
+
+        $bws = ORM::for_table('tbl_plans')->distinct()->select("id_bw")->where('tbl_plans.type', 'Hotspot')->findArray();
+        $ui->assign('bws', ORM::for_table('tbl_bandwidth')->selects(["id", 'name_bw'])->whereIdIn(array_column($bws, 'id_bw'))->findArray());
+        $ui->assign('type2s', ORM::for_table('tbl_plans')->getEnum("plan_type"));
+        $ui->assign('type3s', ORM::for_table('tbl_plans')->getEnum("typebp"));
+        $ui->assign('valids', ORM::for_table('tbl_plans')->getEnum("validity_unit"));
+        $ui->assign('routers', array_column(ORM::for_table('tbl_plans')->distinct()->select("routers")->where('tbl_plans.type', 'Hotspot')->whereNotEqual('routers', '')->findArray(), 'routers'));
+        $devices = [];
+        $files = scandir($DEVICE_PATH);
+        foreach ($files as $file) {
+            $ext = pathinfo($file, PATHINFO_EXTENSION);
+            if ($ext == 'php') {
+                $devices[] = pathinfo($file, PATHINFO_FILENAME);
+            }
         }
+        $ui->assign('devices', $devices);
+        $query = ORM::for_table('tbl_bandwidth')
+            ->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))
+            ->where('tbl_plans.type', 'Hotspot');
 
+        if (!empty($type1)) {
+            $query->where('tbl_plans.prepaid', $type1);
+        }
+        if (!empty($type2)) {
+            $query->where('tbl_plans.plan_type', $type2);
+        }
+        if (!empty($type3)) {
+            $query->where('tbl_plans.typebp', $type3);
+        }
+        if (!empty($bandwidth)) {
+            $query->where('tbl_plans.id_bw', $bandwidth);
+        }
+        if (!empty($valid)) {
+            $query->where('tbl_plans.validity_unit', $valid);
+        }
+        if (!empty($router)) {
+            if ($router == 'radius') {
+                $query->where('tbl_plans.is_radius', '1');
+            } else {
+                $query->where('tbl_plans.routers', $router);
+            }
+        }
+        if (!empty($device)) {
+            $query->where('tbl_plans.device', $device);
+        }
+        if (in_array($status, ['0', '1'])) {
+            $query->where('tbl_plans.enabled', $status);
+        }
+        if ($name != '') {
+            $query->where_like('tbl_plans.name_plan', '%' . $name . '%');
+        }
+        $d = Paginator::findMany($query, ['name' => $name], 20, $append_url);
         $ui->assign('d', $d);
         run_hook('view_list_plans'); #HOOK
         $ui->display('hotspot.tpl');
         break;
-
     case 'add':
         $d = ORM::for_table('tbl_bandwidth')->find_many();
         $ui->assign('d', $d);
@@ -348,13 +415,83 @@ switch ($action) {
         $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/pppoe.js"></script>');
 
         $name = _post('name');
-        if ($name != '') {
-            $query = ORM::for_table('tbl_bandwidth')->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $d = Paginator::findMany($query, ['name' => $name]);
-        } else {
-            $query = ORM::for_table('tbl_bandwidth')->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE');
-            $d = Paginator::findMany($query);
+        $name = _req('name');
+        $type1 = _req('type1');
+        $type2 = _req('type2');
+        $type3 = _req('type3');
+        $bandwidth = _req('bandwidth');
+        $valid = _req('valid');
+        $device = _req('device');
+        $status = _req('status');
+        $router = _req('router');
+        $ui->assign('type1', $type1);
+        $ui->assign('type2', $type2);
+        $ui->assign('type3', $type3);
+        $ui->assign('bandwidth', $bandwidth);
+        $ui->assign('valid', $valid);
+        $ui->assign('device', $device);
+        $ui->assign('status', $status);
+        $ui->assign('router', $router);
+
+        $append_url = "&type1=" . urlencode($type1)
+            . "&type2=" . urlencode($type2)
+            . "&type3=" . urlencode($type3)
+            . "&bandwidth=" . urlencode($bandwidth)
+            . "&valid=" . urlencode($valid)
+            . "&device=" . urlencode($device)
+            . "&status=" . urlencode($status)
+            . "&router=" . urlencode($router);
+
+        $bws = ORM::for_table('tbl_plans')->distinct()->select("id_bw")->findArray();
+        $ui->assign('bws', ORM::for_table('tbl_bandwidth')->selects(["id", 'name_bw'])->whereIdIn(array_column($bws, 'id_bw'))->findArray());
+        $ui->assign('type2s', ORM::for_table('tbl_plans')->getEnum("plan_type"));
+        $ui->assign('type3s', ORM::for_table('tbl_plans')->getEnum("typebp"));
+        $ui->assign('valids', ORM::for_table('tbl_plans')->getEnum("validity_unit"));
+        $ui->assign('routers', array_column(ORM::for_table('tbl_plans')->distinct()->select("routers")->whereNotEqual('routers', '')->findArray(), 'routers'));
+        $devices = [];
+        $files = scandir($DEVICE_PATH);
+        foreach ($files as $file) {
+            $ext = pathinfo($file, PATHINFO_EXTENSION);
+            if ($ext == 'php') {
+                $devices[] = pathinfo($file, PATHINFO_FILENAME);
+            }
         }
+        $ui->assign('devices', $devices);
+        $query = ORM::for_table('tbl_bandwidth')
+            ->left_outer_join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))
+            ->where('tbl_plans.type', 'PPPOE');
+        if (!empty($type1)) {
+            $query->where('tbl_plans.prepaid', $type1);
+        }
+        if (!empty($type2)) {
+            $query->where('tbl_plans.plan_type', $type2);
+        }
+        if (!empty($type3)) {
+            $query->where('tbl_plans.typebp', $type3);
+        }
+        if (!empty($bandwidth)) {
+            $query->where('tbl_plans.id_bw', $bandwidth);
+        }
+        if (!empty($valid)) {
+            $query->where('tbl_plans.validity_unit', $valid);
+        }
+        if (!empty($router)) {
+            if ($router == 'radius') {
+                $query->where('tbl_plans.is_radius', '1');
+            } else {
+                $query->where('tbl_plans.routers', $router);
+            }
+        }
+        if (!empty($device)) {
+            $query->where('tbl_plans.device', $device);
+        }
+        if (in_array($status, ['0', '1'])) {
+            $query->where('tbl_plans.enabled', $status);
+        }
+        if ($name != '') {
+            $query->where_like('tbl_plans.name_plan', '%' . $name . '%');
+        }
+        $d = Paginator::findMany($query, ['name' => $name], 20, $append_url);
 
         $ui->assign('d', $d);
         run_hook('view_list_ppoe'); #HOOK
diff --git a/system/lan/english.json b/system/lan/english.json
index a0684a4e..41150d6e 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -1,649 +1,118 @@
 {
-    "Log_in": "Login",
-    "Register": "Register",
-    "Announcement": "Announcement",
-    "Registration_Info": "Registration Info",
-    "Voucher_not_found__please_buy_voucher_befor_register": "Voucher not found, please buy voucher befor register",
-    "Register_Success__You_can_login_now": "Register Success! You can login now",
-    "Log_in_to_Member_Panel": "Log in to Member Panel",
-    "Register_as_Member": "Register as Member",
-    "Enter_Admin_Area": "Enter Admin Area",
-    "PHPNuxBill": "PHPNuxBill",
-    "Username": "Username",
-    "Password": "Password",
-    "Passwords_does_not_match": "Passwords does not match",
-    "Account_already_axist": "Account already axist",
-    "Manage": "Manage",
-    "Submit": "Submit",
-    "Save_Changes": "Save Changes",
-    "Cancel": "Cancel",
-    "Edit": "Edit",
-    "Delete": "Delete",
-    "Welcome": "Welcome",
-    "Data_Created_Successfully": "Data Created Successfully",
-    "Data_Updated_Successfully": "Data Updated Successfully",
-    "Data_Deleted_Successfully": "Data Deleted Successfully",
-    "Static_Pages": "Static Pages",
-    "Failed_to_save_page__make_sure_i_can_write_to_folder_pages___i_chmod_664_pages___html_i_": "Failed to save page, make sure i can write to folder pages, <i>chmod 664 pages\/*.html<i>",
-    "Saving_page_success": "Saving page success",
-    "Sometimes_you_need_to_refresh_3_times_until_content_change": "Sometimes you need to refresh 3 times until content change",
-    "Dashboard": "Dashboard",
-    "Search_Customers___": "Search Customers...",
-    "My_Account": "My Account",
-    "My_Profile": "My Profile",
-    "Settings": "Settings",
-    "Edit_Profile": "Edit Profile",
-    "Change_Password": "Change Password",
-    "Logout": "Logout",
-    "Services": "Services",
-    "Bandwidth_Plans": "Bandwidth Plans",
-    "Bandwidth_Name": "Bandwidth Name",
-    "New_Bandwidth": "New Bandwidth",
-    "Edit_Bandwidth": "Edit Bandwidth",
-    "Add_New_Bandwidth": "Add New Bandwidth",
-    "Rate_Download": "Rate Download",
-    "Rate_Upload": "Rate Upload",
-    "Name_Bandwidth_Already_Exist": "Name Bandwidth Already Exist",
-    "Hotspot_Plans": "Hotspot Plans",
-    "PPPOE_Plans": "PPPOE Plans",
-    "Plan_Name": "Plan Name",
-    "New_Service_Plan": "New Service Plan",
-    "Add_Service_Plan": "Add Service Plan",
-    "Edit_Service_Plan": "Edit Service Plan",
-    "Name_Plan_Already_Exist": "Name Plan Already Exist",
-    "Plan_Type": "Plan Type",
-    "Plan_Price": "Plan Price",
-    "Limit_Type": "Limit Type",
-    "Unlimited": "Unlimited",
-    "Limited": "Limited",
-    "Time_Limit": "Time Limit",
-    "Data_Limit": "Data Limit",
-    "Both_Limit": "Both Limit",
-    "Plan_Validity": "Plan Validity",
-    "Select_Bandwidth": "Select Bandwidth",
-    "Shared_Users": "Shared Users",
-    "Choose_User_Type_Sales_to_disable_access_to_Settings": "Choose User Type Sales to disable access to Settings",
-    "Current_Password": "Current Password",
-    "New_Password": "New Password",
-    "Administrator": "Administrator",
-    "Sales": "Sales",
-    "Member": "Member",
-    "Confirm_New_Password": "Confirm New Password",
-    "Confirm_Password": "Confirm Password",
-    "Full_Name": "Full Name",
-    "User_Type": "User Type",
-    "Address": "Address",
-    "Created_On": "Created On",
-    "Expires_On": "Expires On",
-    "Phone_Number": "Phone Number",
-    "User_deleted_Successfully": "User deleted Successfully",
-    "Full_Administrator": "Full Administrator",
-    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
-    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
-    "Theme_Style": "Theme Style",
-    "Theme_Color": "Theme Color",
-    "Default_Language": "Default Language",
-    "Network": "Network",
-    "Routers": "Routers",
-    "IP_Pool": "IP Pool",
-    "New_Router": "New Router",
-    "Add_Router": "Add Router",
-    "Edit_Router": "Edit Router",
-    "Router_Name": "Router Name",
-    "IP_Address": "IP Address",
-    "Router_Secret": "Router Secret",
-    "Description": "Description",
-    "IP_Router_Already_Exist": "IP Router Already Exist",
-    "Name_Pool": "Name Pool",
-    "Range_IP": "Range IP",
-    "New_Pool": "New Pool",
-    "Add_Pool": "Add Pool",
-    "Edit_Pool": "Edit Pool",
-    "Pool_Name_Already_Exist": "Pool Name Already Exist",
-    "Refill_Account": "Refill Account",
     "Recharge_Account": "Recharge Account",
-    "Select_Account": "Select Account",
-    "Service_Plan": "Service Plan",
-    "Recharge": "Recharge",
-    "Method": "Method",
-    "Account_Created_Successfully": "Account Created Successfully",
-    "Database_Status": "Database Status",
-    "Total_Database_Size": "Total Database Size",
-    "Download_Database_Backup": "Download Database Backup",
-    "Table_Name": "Table Name",
-    "Rows": "Rows",
-    "Size": "Size",
+    "Refill_Account": "Refill Account",
+    "SuperAdmin": "SuperAdmin",
+    "Change_Password": "Change Password",
+    "My_Account": "My Account",
+    "Logout": "Logout",
+    "Dashboard": "Dashboard",
     "Customer": "Customer",
-    "Add_New_Contact": "Add New Contact",
-    "Edit_Contact": "Edit Contact",
-    "List_Contact": "List Contact",
-    "Manage_Contact": "Manage Contact",
-    "Reports": "Reports",
-    "Daily_Reports": "Daily Reports",
-    "Period_Reports": "Period Reports",
-    "All_Transactions": "All Transactions",
-    "Total_Income": "Total Income",
-    "All_Transactions_at_Date": "All Transactions at Date",
-    "Export_for_Print": "Export for Print",
-    "Print": "Print",
-    "Export_to_PDF": "Export to PDF",
-    "Click_Here_to_Print": "Click Here to Print",
-    "You_can_use_html_tag": "You can use html tag",
-    "Date_Format": "Date Format",
-    "Income_Today": "Income Today",
-    "Income_This_Month": "Income This Month",
-    "Users_Active": "Users Active",
-    "Total_Users": "Total Users",
-    "Users": "Users",
-    "Edit_User": "Edit User",
-    "Last_Login": "Last Login",
-    "Administrator_Users": "Administrator Users",
-    "Manage_Administrator": "Manage Administrator",
-    "Add_New_Administrator": "Add New Administrator",
-    "Localisation": "Localisation",
-    "Backup_Restore": "Backup\/Restore",
-    "General_Settings": "General Settings",
-    "Date": "Date",
-    "Login_Successful": "Login Successful",
-    "Failed_Login": "Failed Login",
-    "Settings_Saved_Successfully": "Settings Saved Successfully",
-    "User_Updated_Successfully": "User Updated Successfully",
-    "User_Expired__Today": "User Expired, Today",
-    "Activity_Log": "Activity Log",
-    "View_Reports": "View Reports",
-    "View_All": "View All",
-    "Number_of_Vouchers": "Number of Vouchers",
-    "Length_Code": "Length Code",
-    "Code_Voucher": "Code Voucher",
-    "Voucher": "Voucher",
-    "Hotspot_Voucher": "Hotspot Voucher",
-    "Status_Voucher": "Status Voucher",
-    "Add_Vouchers": "Add Vouchers",
-    "Create_Vouchers_Successfully": "Create Vouchers Successfully",
-    "Generate": "Generate",
-    "Print_side_by_side__it_will_easy_to_cut": "Print side by side, it will easy to cut",
-    "From_Date": "From Date",
-    "To_Date": "To Date",
-    "New_Service": "New Service",
-    "Type": "Type",
-    "Finish": "Finish",
-    "Application_Name__Company_Name": "Application Name\/ Company Name",
-    "This_Name_will_be_shown_on_the_Title": "This Name will be shown on the Title",
-    "Next": "Next",
-    "Last": "Last",
-    "Timezone": "Timezone",
-    "Decimal_Point": "Decimal Point",
-    "Thousands_Separator": "Thousands Separator",
-    "Currency_Code": "Currency Code",
-    "Order_Voucher": "Order Voucher",
-    "Voucher_Activation": "Voucher Activation",
-    "List_Activated_Voucher": "List Activated Voucher",
-    "Enter_voucher_code_here": "Enter voucher code here",
-    "Private_Message": "Private Message",
-    "Inbox": "Inbox",
-    "Outbox": "Outbox",
-    "Compose": "Compose",
-    "Send_to": "Send to",
-    "Title": "Title",
-    "Message": "Message",
-    "Your_Account_Information": "Your Account Information",
-    "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Welcome to the Panel Members page, on this page you can:",
-    "Invalid_Username_or_Password": "Invalid Username or Password",
-    "You_do_not_have_permission_to_access_this_page": "You do not have permission to access this page",
-    "Incorrect_Current_Password": "Incorrect Current Password",
-    "Password_changed_successfully__Please_login_again": "Password changed successfully, Please login again",
-    "All_field_is_required": "All field is required",
-    "Voucher_Not_Valid": "Voucher Not Valid",
-    "Activation_Vouchers_Successfully": "Activation Vouchers Successfully",
-    "Data_Not_Found": "Data Not Found",
-    "Search_by_Username": "Search by Username",
-    "Search_by_Name": "Search by Name",
-    "Search_by_Code_Voucher": "Search by Code Voucher",
-    "Search": "Search",
-    "Select_a_customer": "Select a customer",
-    "Select_Routers": "Select Routers",
-    "Select_Plans": "Select Plans",
-    "Select_Pool": "Select Pool",
-    "Hrs": "Hrs",
-    "Mins": "Mins",
-    "Days": "Days",
-    "Months": "Months",
-    "Add_Language": "Add Language",
-    "Language_Name": "Language Name",
-    "Folder_Name": "Folder Name",
-    "Translator": "Translator",
-    "Language_Name_Already_Exist": "Language Name Already Exist",
-    "Payment_Gateway": "Payment Gateway",
-    "Community": "Community",
-    "1_user_can_be_used_for_many_devices_": "1 user can be used for many devices?",
-    "Cannot_be_change_after_saved": "Cannot be change after saved",
-    "Explain_Coverage_of_router": "Explain Coverage of router",
-    "Name_of_Area_that_router_operated": "Name of Area that router operated",
-    "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "Payment Notification URL, Recurring Notification URL, Pay Account Notification URL",
-    "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL",
-    "Status": "Status",
-    "Plan_Not_found": "Plan Not found",
-    "Failed_to_create_transaction_": "Failed to create transaction.",
-    "Seller_has_not_yet_setup_Xendit_payment_gateway": "Seller has not yet setup Xendit payment gateway",
-    "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin has not yet setup Xendit payment gateway, please tell admin",
-    "You_already_have_unpaid_transaction__cancel_it_or_pay_it_": "You already have unpaid transaction, cancel it or pay it.",
-    "Transaction_Not_found": "Transaction Not found",
-    "Cancel_it_": "Cancel it?",
-    "expired": "expired",
-    "Check_for_Payment": "Check for Payment",
-    "Transaction_still_unpaid_": "Transaction still unpaid.",
-    "Paid_Date": "Paid Date",
-    "Transaction_has_been_paid_": "Transaction has been paid.",
-    "PAID": "PAID",
-    "CANCELED": "CANCELED",
-    "UNPAID": "UNPAID",
-    "PAY_NOW": "PAY NOW",
-    "Buy_Hotspot_Plan": "Buy Hotspot Plan",
-    "Buy_PPOE_Plan": "Buy PPOE Plan",
-    "Package": "Package",
-    "Order_Internet_Package": "Order Internet Package",
-    "Unknown_Command_": "Unknown Command.",
-    "Checking_payment": "Checking payment",
-    "Create_Transaction_Success": "Create Transaction Success",
-    "You_have_unpaid_transaction": "You have unpaid transaction",
-    "TripayPayment_Channel": "TripayPayment Channel",
-    "Payment_Channel": "Payment Channel",
-    "Payment_check_failed_": "Payment check failed.",
-    "Order_Package": "Order Package",
-    "Transactions": "Transactions",
-    "Payments": "Payments",
-    "History": "History",
-    "Order_History": "Order History",
-    "Gateway": "Gateway",
-    "Date_Done": "Date Done",
-    "Unpaid_Order": "Unpaid Order",
-    "Payment_Gateway_Not_Found": "Payment Gateway Not Found",
-    "Payment_Gateway_saved_successfully": "Payment Gateway saved successfully",
-    "ORDER": "ORDER",
-    "Package_History": "Package History",
-    "Buy_History": "Buy History",
-    "Activation_History": "Activation History",
-    "Buy_Package": "Buy Package",
-    "Email": "Email",
-    "Company_Footer": "Company Footer",
-    "Will_show_below_user_pages": "Will show below user pages",
-    "Request_OTP": "Request OTP",
-    "Verification_Code": "Verification Code",
-    "SMS_Verification_Code": "SMS Verification Code",
-    "Please_enter_your_email_address": "Please enter your email address",
-    "Failed_to_create_Paypal_transaction_": "Failed to create Paypal transaction.",
-    "Plugin": "Plugin",
-    "Plugin_Manager": "Plugin Manager",
-    "User_Notification": "User Notification",
-    "Expired_Notification": "Expired Notification",
-    "User_will_get_notification_when_package_expired": "User will get notification when package expired",
-    "Expired_Notification_Message": "Expired Notification Message",
-    "Payment_Notification": "Payment Notification",
-    "User_will_get_invoice_notification_when_buy_package_or_package_refilled": "User will get invoice notification when buy package or package refilled",
-    "Current_IP": "Current IP",
-    "Current_MAC": "Current MAC",
-    "Login_Status": "Login Status",
-    "Login_Request_successfully": "Login Request successfully",
-    "Logout_Request_successfully": "Logout Request successfully",
-    "Disconnect_Internet_": "Disconnect Internet?",
-    "Not_Online__Login_now_": "Not Online, Login now?",
-    "You_are_Online__Logout_": "You are Online, Logout?",
-    "Connect_to_Internet_": "Connect to Internet?",
-    "Your_account_not_connected_to_internet": "Your account not connected to internet",
-    "Failed_to_create_transaction__": "Failed to create transaction. ",
-    "Failed_to_check_status_transaction__": "Failed to check status transaction. ",
-    "Disable_Voucher": "Disable Voucher",
-    "Balance": "Balance",
-    "Balance_System": "Balance System",
-    "Enable_System": "Enable System",
-    "Allow_Transfer": "Allow Transfer",
-    "Telegram_Notification": "Telegram Notification",
-    "SMS_OTP_Registration": "SMS OTP Registration",
-    "Whatsapp_Notification": "Whatsapp Notification",
-    "Tawk_to_Chat_Widget": "Tawk.to Chat Widget",
-    "Invoice": "Invoice",
-    "Country_Code_Phone": "Country Code Phone",
-    "Voucher_activation_menu_will_be_hidden": "Voucher activation menu will be hidden",
-    "Customer_can_deposit_money_to_buy_voucher": "Customer can deposit money to buy voucher",
-    "Allow_balance_transfer_between_customers": "Allow balance transfer between customers",
-    "Reminder_Notification": "Reminder Notification",
-    "Reminder_Notification_Message": "Reminder Notification Message",
-    "Reminder_7_days": "Reminder 7 days",
-    "Reminder_3_days": "Reminder 3 days",
-    "Reminder_1_day": "Reminder 1 day",
-    "PPPOE_Password": "PPPOE Password",
-    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "User Cannot change this, only admin. if it Empty it will use user password",
-    "Invoice_Balance_Message": "Invoice Balance Message",
-    "Invoice_Notification_Payment": "Invoice Notification Payment",
-    "Balance_Notification_Payment": "Balance Notification Payment",
-    "Balance_Plans": "Balance Plans",
-    "Buy_Balance": "Buy Balance",
-    "Price": "Price",
-    "Validity": "Validity",
-    "Disable_auto_renewal_": "Disable auto renewal?",
-    "Auto_Renewal_On": "Auto Renewal On",
-    "Enable_auto_renewal_": "Enable auto renewal?",
-    "Auto_Renewal_Off": "Auto Renewal Off",
-    "Refill_Balance": "Refill Balance",
-    "Invoice_Footer": "Invoice Footer",
-    "Pay_With_Balance": "Pay With Balance",
-    "Pay_this_with_Balance__your_active_package_will_be_overwrite": "Pay this with Balance? your active package will be overwrite",
-    "Success_to_buy_package": "Success to buy package",
-    "Auto_Renewal": "Auto Renewal",
-    "View": "View",
-    "Back": "Back",
-    "Active": "Active",
-    "Transfer_Balance": "Transfer Balance",
-    "Send_your_balance_": "Send your balance?",
-    "Send": "Send",
-    "Cannot_send_to_yourself": "Cannot send to yourself",
-    "Sending_balance_success": "Sending balance success",
-    "From": "From",
-    "To": "To",
-    "insufficient_balance": "insufficient balance",
-    "Send_Balance": "Send Balance",
-    "Received_Balance": "Received Balance",
-    "Minimum_Balance_Transfer": "Minimum Balance Transfer",
-    "Minimum_Transfer": "Minimum Transfer",
-    "Company_Logo": "Company Logo",
-    "Expired_IP_Pool": "Expired IP Pool",
-    "Proxy": "Proxy",
-    "Proxy_Server": "Proxy Server",
-    "Proxy_Server_Login": "Proxy Server Login",
-    "Hotspot_Plan": "Hotspot Plan",
-    "PPPOE_Plan": "PPPOE Plan",
-    "UNKNOWN": "UNKNOWN",
-    "Are_You_Sure_": "Are You Sure?",
-    "Success_to_send_package": "Success to send package",
-    "Target_has_active_plan__different_with_current_plant_": "Target has active plan, different with current plant.",
-    "Recharge_a_friend": "Recharge a friend",
-    "Buy_for_friend": "Buy for friend",
-    "Buy_this_for_friend_account_": "Buy this for friend account?",
-    "Review_package_before_recharge": "Review package before recharge",
-    "Activate": "Activate",
-    "Deactivate": "Deactivate",
-    "Sync": "Sync",
-    "Failed_to_create_PaymeTrust_transaction_": "Failed to create PaymeTrust transaction.",
+    "Lists": "Lists",
     "Location": "Location",
-    "Radius_Plans": "Radius Plans",
-    "Change_title_in_user_Plan_order": "Change title in user Plan order",
-    "Logs": "Logs",
-    "Voucher_Format": "Voucher Format",
-    "Resend_To_Customer": "Resend To Customer",
-    "Your_friend_do_not_have_active_package": "Your friend do not have active package",
-    "Service_Type": "Service Type",
-    "Others": "Others",
-    "PPPoE": "PPPoE",
-    "Hotspot": "Hotspot",
-    "Disable_Registration": "Disable Registration",
-    "Customer_just_Login_with_Phone_number_and_Voucher_Code__Voucher_will_be_password": "Customer just Login with Phone number and Voucher Code, Voucher will be password",
-    "Login___Activate_Voucher": "Login \/ Activate Voucher",
-    "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "After Customer activate voucher or login, customer will be redirected to this url",
-    "Voucher_Prefix": "Voucher Prefix",
-    "Voucher_activation_success__now_you_can_login": "Voucher activation success, now you can login",
-    "Buy_this__your_active_package_will_be_overwritten": "Buy this? your active package will be overwritten",
-    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Pay this with Balance? your active package will be overwritten",
-    "Buy_this__your_active_package_will_be_overwrite": "Buy this? your active package will be overwrite",
-    "Monthly_Registered_Customers": "Monthly Registered Customers",
-    "Total_Monthly_Sales": "Total Monthly Sales",
+    "Services": "Services",
     "Active_Users": "Active Users",
-    "All_Users_Insights": "All Users Insights",
-    "SuperAdmin": "Super Admin",
-    "Radius": "Radius",
-    "Radius_NAS": "Radius NAS",
-    "Translation": "Translation",
-    "Translation_saved_Successfully": "Translation saved Successfully",
-    "Language_Editor": "Language Editor",
-    "year": "year",
-    "month": "month",
-    "week": "week",
-    "day": "day",
-    "hour": "hour",
-    "minute": "minute",
-    "second": "second",
-    "Attributes": "Attributes",
-    "Profile": "Profile",
-    "Phone": "Phone",
-    "City": "City",
-    "Sub_District": "Sub District",
-    "Ward": "Ward",
-    "Credentials": "Credentials",
-    "Agent": "Agent",
-    "This_Token_will_act_as_SuperAdmin_Admin": "This Token will act as SuperAdmin\/Admin",
-    "Login": "Login",
-    "Expired_Action": "Expired Action",
-    "Expired_Address_List_Name": "Expired Address List Name",
-    "Address_List": "Address List",
-    "Optional": "Optional",
-    "Generated_By": "Generated By",
-    "Admin": "Admin",
-    "Password_should_be_minimum_6_characters": "Password should be minimum 6 characters",
-    "Add_User": "Add User",
-    "Send_Notification": "Send Notification",
-    "Code": "Code",
-    "Send_To_Customer": "Send To Customer",
-    "Prev": "Prev",
-    "Voucher_Not_Found": "Voucher Not Found",
-    "Miscellaneous": "Miscellaneous",
-    "OTP_Required": "OTP Required",
-    "Change": "Change",
-    "Change_Phone_Number": "Change Phone Number",
-    "Current_Number": "Current Number",
-    "New_Number": "New Number",
-    "Input_your_phone_number": "Input your phone number",
-    "OTP": "OTP",
-    "Enter_OTP_that_was_sent_to_your_phone": "Enter OTP that was sent to your phone",
-    "Update": "Update",
-    "OTP_is_required_when_user_want_to_change_phone_number": "OTP is required when user want to change phone number",
-    "Rate": "Rate",
-    "Burst": "Burst",
-    "Editing_Bandwidth_will_not_automatically_update_the_plan__you_need_to_edit_the_plan_then_save_again": "Editing Bandwidth will not automatically update the plan, you need to edit the plan then save again",
-    "OTP_Method": "OTP Method",
-    "SMS": "SMS",
-    "WhatsApp": "WhatsApp",
-    "SMS_and_WhatsApp": "SMS and WhatsApp",
-    "The_method_which_OTP_will_be_sent_to_user": "The method which OTP will be sent to user",
-    "Report_Viewer": "Report Viewer",
-    "Super_Administrator": "Super Administrator",
-    "Send_To": "Send To",
-    "Resend": "Resend",
-    "Alert": "Alert",
-    "success": "success",
-    "Click_Here": "Click Here",
-    "danger": "danger",
-    "Logout_Successful": "Logout Successful",
-    "warning": "warning",
-    "Users_Announcement": "Users Announcement",
-    "Customer_Announcement": "Customer Announcement",
-    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
-    "Period": "Period",
-    "Add": "Add",
-    "Select_Payment_Gateway": "Select Payment Gateway",
-    "Available_Payment_Gateway": "Available Payment Gateway",
-    "Pay_Now": "Pay Now",
-    "Please_select_Payment_Gateway": "Please select Payment Gateway",
-    "Payment_Gateway_Deleted": "Payment Gateway Deleted",
-    "Payment_Gateway_not_set__please_set_it_in_Settings": "Payment Gateway not set, please set it in Settings",
-    "Failed_to_create_Transaction__": "Failed to create Transaction..",
-    "Show_To_Customer": "Type",
-    "Using": "Using",
-    "Default": "Default",
-    "Customer_Balance": "Customer Balance",
     "Vouchers": "Vouchers",
     "Refill_Customer": "Refill Customer",
     "Recharge_Customer": "Recharge Customer",
-    "Plans": "Plans",
-    "PPPOE": "PPPOE",
+    "Refill_Balance": "Refill Balance",
+    "Internet_Plan": "Internet Plan",
     "Bandwidth": "Bandwidth",
-    "Customers": "Customers",
-    "Actives": "Actives",
-    "Name": "Name",
-    "Confirm": "Confirm",
-    "Plan": "Plan",
-    "Total": "Total",
-    "Current_Cycle": "Current Cycle",
-    "Additional_Cost": "Additional Cost",
-    "Remaining": "Remaining",
-    "Not_Found": "Not Found",
-    "Cash": "Cash",
-    "Payment_not_found": "Payment not found",
-    "If_your_friend_have_Additional_Cost__you_will_pay_for_that_too": "If your friend have Additional Cost, you will pay for that too",
-    "Cache_cleared_successfully_": "Cache cleared successfully!",
-    "Paid": "Paid",
+    "Customer_Balance": "Customer Balance",
+    "Reports": "Reports",
+    "Daily_Reports": "Daily Reports",
+    "Period_Reports": "Period Reports",
+    "Activation_History": "Activation History",
     "Send_Message": "Send Message",
-    "Send_Personal_Message": "Send Personal Message",
-    "Send_Via": "Send Via",
-    "Compose_your_message___": "Compose your message...",
-    "Use_placeholders_": "Use placeholders:",
-    "Customer_Name": "Customer Name",
-    "Customer_Username": "Customer Username",
-    "Customer_Phone": "Customer Phone",
-    "Your_Company_Name": "Your Company Name",
-    "Message_Sent_Successfully": "Message Sent Successfully",
-    "Send_Bulk_Message": "Send Bulk Message",
-    "Group": "Group",
-    "All_Customers": "All Customers",
-    "New_Customers": "New Customers",
-    "Expired_Customers": "Expired Customers",
-    "Active_Customers": "Active Customers",
-    "Map": "Map",
-    "Customer_Location": "Customer Location",
-    "Account_Type": "Account Type",
-    "Coordinates": "Coordinates",
-    "Latitude_and_Longitude_coordinates_for_map_must_be_separate_with_comma____": "Latitude and Longitude coordinates for map must be separate with comma &quot;,&quot;",
-    "Customer_Geo_Location_Information": "Customer Geo Location Information",
-    "List": "List",
-    "Lists": "Lists",
     "Single_Customer": "Single Customer",
     "Bulk_Customers": "Bulk Customers",
-    "Message_per_time": "Message per time",
-    "5_Messages": "5 Messages",
-    "10_Messages": "10 Messages",
-    "15_Messages": "15 Messages",
-    "20_Messages": "20 Messages",
-    "30_Messages": "30 Messages",
-    "40_Messages": "40 Messages",
-    "50_Messages": "50 Messages",
-    "60_Messages": "60 Messages",
-    "Use_20_and_above_if_you_are_sending_to_all_customers_to_avoid_server_time_out": "Use 20 and above if you are sending to all customers to avoid server time out",
-    "Delay": "Delay",
-    "No_Delay": "No Delay",
-    "5_Seconds": "5 Seconds",
-    "10_Seconds": "10 Seconds",
-    "15_Seconds": "15 Seconds",
-    "20_Seconds": "20 Seconds",
-    "Use_at_least_5_secs_if_you_are_sending_to_all_customers_to_avoid_being_banned_by_your_message_provider": "Use at least 5 secs if you are sending to all customers to avoid being banned by your message provider",
-    "Testing__if_checked_no_real_message_is_sent_": "Testing [if checked no real message is sent]",
-    "All_fields_are_required": "All fields are required",
-    "Personal": "Personal",
-    "Email_Notification": "Email Notification",
-    "Router_Name___Location": "Router Name \/ Location",
-    "Plan_Category": "Plan Category",
-    "ID": "ID",
-    "Internet_Plan": "Internet Plan",
+    "Network": "Network",
+    "Routers": "Routers",
+    "IP_Pool": "IP Pool",
+    "Radius": "Radius",
+    "Radius_NAS": "Radius NAS",
+    "Static_Pages": "Static Pages",
+    "Order_Voucher": "Order Voucher",
+    "Voucher": "Voucher",
+    "Announcement": "Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "Registration_Info": "Registration Info",
     "Privacy_Policy": "Privacy Policy",
     "Terms_and_Conditions": "Terms and Conditions",
-    "Contact": "Contact",
-    "will_be_replaced_with_Customer_Name": "will be replaced with Customer Name",
-    "will_be_replaced_with_Customer_username": "will be replaced with Customer username",
-    "will_be_replaced_with_Package_name": "will be replaced with Package name",
-    "will_be_replaced_with_Package_price": "will be replaced with Package price",
-    "additional_bills_for_customers": "additional bills for customers",
-    "will_be_replaced_with_Expiration_date": "will be replaced with Expiration date",
-    "Your_Company_Name_at_Settings": "Your Company Name at Settings",
-    "Your_Company_Address_at_Settings": "Your Company Address at Settings",
-    "Your_Company_Phone_at_Settings": "Your Company Phone at Settings",
-    "Invoice_number": "Invoice number",
-    "Date_invoice_created": "Date invoice created",
-    "Payment_gateway_user_paid_from": "Payment gateway user paid from",
-    "Payment_channel_user_paid_from": "Payment channel user paid from",
-    "is_Hotspot_or_PPPOE": "is Hotspot or PPPOE",
-    "Internet_Package": "Internet Package",
-    "Internet_Package_Prices": "Internet Package Prices",
-    "Receiver_name": "Receiver name",
-    "Username_internet": "Username internet",
-    "User_password": "User password",
-    "Expired_datetime": "Expired datetime",
-    "For_Notes_by_admin": "For Notes by admin",
-    "Transaction_datetime": "Transaction datetime",
-    "Balance_Before": "Balance Before",
-    "Balance_After": "Balance After",
-    "how_much_balance_have_been_send": "how much balance have been send",
-    "Current_Balance": "Current Balance",
-    "Sender_name": "Sender name",
-    "how_much_balance_have_been_received": "how much balance have been received",
-    "Extend_Postpaid_Expiration": "Extend Postpaid Expiration",
-    "Allow_Extend": "Allow Extend",
-    "Extend_Days": "Extend Days",
-    "Confirmation_Message": "Confirmation Message",
-    "You_are_already_logged_in": "You are already logged in",
-    "Extend": "Extend",
-    "Created___Expired": "Created \/ Expired",
-    "Bank_Transfer": "Bank Transfer",
-    "Recharge_Using": "Recharge Using",
-    "ago": "ago",
-    "Disabled": "Disabled",
-    "Banned": "Banned",
-    "Customer_cannot_login_again": "Customer cannot login again",
-    "Customer_can_login_but_cannot_buy_internet_plan__Admin_cannot_recharge_customer": "Customer can login but cannot buy internet plan, Admin cannot recharge customer",
-    "Don_t_forget_to_deactivate_all_active_plan_too": "Don&#39;t forget to deactivate all active plan too",
-    "Ascending": "Ascending",
-    "Descending": "Descending",
-    "Created_Date": "Created Date",
-    "Inactive": "Inactive",
-    "Suspended": "Suspended",
-    "Query": "Query",
-    "Notes": "Notes",
-    "This_account_status": "This account status",
+    "Settings": "Settings",
+    "General_Settings": "General Settings",
+    "Localisation": "Localisation",
     "Maintenance_Mode": "Maintenance Mode",
-    "Maintenance_Mode_Settings": "Maintenance Mode Settings",
-    "Status_": "Status:",
-    "End_Date_": "End Date:",
-    "Save": "Save",
-    "Site_is_temporarily_unavailable_": "Site is temporarily unavailable.",
-    "Scheduled_maintenance_is_currently_in_progress__Please_check_back_soon_": "Scheduled maintenance is currently in progress. Please check back soon.",
-    "We_apologize_for_any_inconvenience_": "We apologize for any inconvenience.",
-    "The": "The",
-    "Team": "Team",
-    "Extend_Package_Expiry": "Extend Package Expiry",
-    "No": "No",
-    "Yes": "Yes",
-    "If_user_buy_same_internet_plan__expiry_date_will_extend": "If user buy same internet plan, expiry date will extend",
-    "Tax_System": "Tax System",
-    "Enable_Tax_System": "Enable Tax System",
-    "Tax_will_be_calculated_in_Internet_Plan_Price": "Tax will be calculated in Internet Plan Price",
-    "Tax_Rate": "Tax Rate",
-    "0_5_": "0.5%",
-    "1_": "1%",
-    "1_5_": "1.5%",
-    "2_": "2%",
-    "5_": "5%",
-    "10_": "10%",
-    "Custom": "Custom",
-    "Tax_Rates_in_percentage": "Tax Rates in percentage",
-    "Custom_Tax_Rate": "Custom Tax Rate",
-    "Enter_Custom_Tax_Rate": "Enter Custom Tax Rate",
-    "Enter_the_custom_tax_rate__e_g___3_75_for_3_75__": "Enter the custom tax rate (e.g., 3.75 for 3.75%)",
-    "Additional_Information": "Additional Information",
-    "City_of_Resident": "City of Resident",
-    "District": "District",
-    "State": "State",
-    "State_of_Resident": "State of Resident",
-    "Zip": "Zip",
-    "Zip_Code": "Zip Code",
-    "Local_IP": "Local IP",
-    "": "",
-    "Device": "Device",
-    "Expired_Internet_Plan": "Expired Internet Plan",
-    "When_Expired__customer_will_be_move_to_selected_internet_plan": "When Expired, customer will be move to selected internet plan",
-    "Plugin_Installer": "Plugin Installer",
-    "Expired_Date": "Expired Date",
+    "User_Notification": "User Notification",
+    "Administrator_Users": "Administrator Users",
+    "Backup_Restore": "Backup\/Restore",
+    "Payment_Gateway": "Payment Gateway",
+    "Plugin_Manager": "Plugin Manager",
+    "Logs": "Logs",
+    "Community": "Community",
+    "Select_Account": "Select Account",
+    "Select_a_customer": "Select a customer",
+    "Code_Voucher": "Code Voucher",
+    "Enter_voucher_code_here": "Enter voucher code here",
+    "Recharge": "Recharge",
+    "Cancel": "Cancel",
+    "Hotspot_Plans": "Hotspot Plans",
+    "Search_by_Name": "Search by Name",
+    "Search": "Search",
+    "New_Service_Plan": "New Service Plan",
     "Expired": "Expired",
+    "Name": "Name",
+    "Type": "Type",
+    "Category": "Category",
+    "Price": "Price",
+    "Validity": "Validity",
     "Time": "Time",
     "Data": "Data",
-    "Category": "Category",
-    "later": "later",
-    "Package_Details": "Package Details",
-    "Summary": "Summary",
-    "Devices_Not_Found": "Devices Not Found",
-    "Income_reset_date": "Income reset date"
+    "Device": "Device",
+    "Date": "Date",
+    "ID": "ID",
+    "Manage": "Manage",
+    "Edit": "Edit",
+    "Delete": "Delete",
+    "Prev": "Prev",
+    "Next": "Next",
+    "PPPOE_Plans": "PPPOE Plans",
+    "Plan_Name": "Plan Name",
+    "Plan_Type": "Plan Type",
+    "Bandwidth_Plans": "Bandwidth Plans",
+    "Plan_Price": "Plan Price",
+    "Plan_Validity": "Plan Validity",
+    "Status": "Status",
+    "Business": "Business",
+    "Personal": "Personal",
+    "Hap_Lite": "Hap Lite",
+    "": "",
+    "Add_Service_Plan": "Add Service Plan",
+    "Cannot_be_change_after_saved": "Cannot be change after saved",
+    "Unlimited": "Unlimited",
+    "Limited": "Limited",
+    "Limit_Type": "Limit Type",
+    "Time_Limit": "Time Limit",
+    "Data_Limit": "Data Limit",
+    "Both_Limit": "Both Limit",
+    "Hrs": "Hrs",
+    "Mins": "Mins",
+    "Bandwidth_Name": "Bandwidth Name",
+    "Select_Bandwidth": "Select Bandwidth",
+    "Shared_Users": "Shared Users",
+    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
+    "Expired_Date": "Expired Date",
+    "Router_Name": "Router Name",
+    "Select_Routers": "Select Routers",
+    "Save_Changes": "Save Changes",
+    "Days": "Days",
+    "Months": "Months",
+    "Period": "Period",
+    "New_Bandwidth": "New Bandwidth",
+    "Rate": "Rate",
+    "Burst": "Burst",
+    "Balance_Plans": "Balance Plans",
+    "New_Router": "New Router",
+    "IP_Address": "IP Address",
+    "Username": "Username",
+    "Description": "Description"
+}
\ No newline at end of file
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index 4858cfa1..f60082e3 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -10,94 +10,168 @@
                             class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
                 </div>{Lang::T('Hotspot Plans')}
             </div>
-            <div class="panel-body">
-                <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
-                    <div class="col-md-8">
-                        <form id="site-search" method="post" action="{$_url}services/hotspot/">
+            <form id="site-search" method="post" action="{$_url}services/hotspot/">
+                <div class="panel-body">
+                    <div class="row row-no-gutters" style="padding: 5px">
+                        <div class="col-lg-2">
                             <div class="input-group">
-                                <div class="input-group-addon">
-                                    <span class="fa fa-search"></span>
+                                <div class="input-group-btn">
+                                    <a class="btn btn-danger" title="Clear Search Query"
+                                        href="{$_url}services/hotspot/"><span
+                                            class="glyphicon glyphicon-remove-circle"></span></a>
                                 </div>
                                 <input type="text" name="name" class="form-control"
                                     placeholder="{Lang::T('Search by Name')}...">
-                                <div class="input-group-btn">
-                                    <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
-                                </div>
                             </div>
-                        </form>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type1" name="type1">
+                                <option value="">Prepaid &amp; Postpaid</option>
+                                <option value="yes" {if $type1 eq 'yes' }selected{/if}>Prepaid</option>
+                                <option value="no" {if $type1 eq 'no' }selected{/if}>Postpaid</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type2" name="type2">
+                                <option value="">{Lang::T('Type')}</option>
+                                {foreach $type2s as $t}
+                                    <option value="{$t}" {if $type2 eq $t }selected{/if}>{Lang::T($t)}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="bandwidth" name="bandwidth">
+                                <option value="">{Lang::T('Bandwidth')}</option>
+                                {foreach $bws as $b}
+                                    <option value="{$b['id']}" {if $bandwidth eq $b['id'] }selected{/if}>
+                                        {$b['name_bw']}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type3" name="type3">
+                                <option value="">{Lang::T('Category')}</option>
+                                {foreach $type3s as $t}
+                                    <option value="{$t}" {if $type3 eq $t }selected{/if}>{$t}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="valid" name="valid">
+                                <option value="">{Lang::T('Validity')}</option>
+                                {foreach $valids as $v}
+                                    <option value="{$v}" {if $valid eq $v }selected{/if}>{$v}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="router" name="router">
+                                <option value="">{Lang::T('Routers')}</option>
+                                {foreach $routers as $r}
+                                    <option value="{$r}" {if $router eq $r }selected{/if}>{$r}</option>
+                                {/foreach}
+                                <option value="radius" {if $router eq 'radius' }selected{/if}>Radius</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="device" name="device">
+                                <option value="">{Lang::T('Device')}</option>
+                                {foreach $devices as $r}
+                                    <option value="{$r}" {if $device eq $r }selected{/if}>{$r}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="status" name="status">
+                                <option value="-">{Lang::T('Status')}</option>
+                                <option value="1" {if $status eq '1' }selected{/if}>Enabled</option>
+                                <option value="0" {if $status eq '0' }selected{/if}>Disable</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-8">
+                            <button class="btn btn-success btn-block" type="submit"><span
+                                    class="fa fa-search"></span></button>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <a href="{$_url}services/add" class="btn btn-primary btn-block"
+                                title="{Lang::T('New Service Plan')}"><i class="ion ion-android-add"></i></a>
+                        </div>
                     </div>
-                    <div class="col-md-4">
-                        <a href="{$_url}services/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
-                            </i> {Lang::T('New Service Plan')}</a>
-                    </div>&nbsp;
                 </div>
-                <div class="table-responsive">
-                    <table class="table table-bordered table-striped table-condensed">
-                        <thead>
-                            <tr>
-                                <th></th>
-                                <th colspan="5" class="text-center">{Lang::T('Internet Plan')}</th>
-                                <th colspan="2" class="text-center" style="background-color: rgb(246, 244, 244);">Limit</th>
-                                <th colspan="2"></th>
-                                <th colspan="2" class="text-center" style="background-color: rgb(243, 241, 172);">{Lang::T('Expired')}</th>
-                                <th colspan="3"></th>
-                            </tr>
-                            <tr>
-                                <th>{Lang::T('Name')}</th>
-                                <th>{Lang::T('Type')}</th>
-                                <th>{Lang::T('Bandwidth')}</th>
-                                <th>{Lang::T('Category')}</th>
-                                <th>{Lang::T('Price')}</th>
-                                <th>{Lang::T('Validity')}</th>
-                                <th style="background-color: rgb(246, 244, 244);">{Lang::T('Time')}</th>
-                                <th style="background-color: rgb(246, 244, 244);">{Lang::T('Data')}</th>
-                                <th>{Lang::T('Routers')}</th>
-                                <th>{Lang::T('Device')}</th>
-                                <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Plan')}</th>
-                                <th style="background-color: rgb(243, 241, 172);">{Lang::T('Date')}</th>
-                                <th>{Lang::T('ID')}</th>
-                                <th>{Lang::T('Manage')}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {foreach $d as $ds}
-                                <tr {if $ds['enabled'] !=1}class="danger" title="disabled" {elseif $ds['prepaid'] !='yes'
-                                    }class="warning" title="Postpaid" {/if}>
-                                    <td class="headcol">{$ds['name_plan']}</td>
-                                    <td>{if $ds['prepaid'] == no}<b>Postpaid</b>{else}Prepaid{/if} {$ds['plan_type']}</td>
-                                    <td>{$ds['name_bw']}</td>
-                                    <td>{$ds['typebp']}</td>
-                                    <td>{Lang::moneyFormat($ds['price'])}</td>
-                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
-                                    <td>{$ds['time_limit']} {$ds['time_unit']}</td>
-                                    <td>{$ds['data_limit']} {$ds['data_unit']}</td>
-                                    <td>
-                                        {if $ds['is_radius']}
-                                            <span class="label label-primary">RADIUS</span>
-                                        {else}
-                                            {if $ds['routers']!=''}
-                                                <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
-                                            {/if}
+            </form>
+            <div class="table-responsive">
+                <table class="table table-bordered table-striped table-condensed">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th colspan="5" class="text-center">{Lang::T('Internet Plan')}</th>
+                            <th colspan="2" class="text-center" style="background-color: rgb(246, 244, 244);">Limit</th>
+                            <th colspan="2"></th>
+                            <th colspan="2" class="text-center" style="background-color: rgb(243, 241, 172);">
+                                {Lang::T('Expired')}</th>
+                            <th colspan="3"></th>
+                        </tr>
+                        <tr>
+                            <th>{Lang::T('Name')}</th>
+                            <th>{Lang::T('Type')}</th>
+                            <th>{Lang::T('Bandwidth')}</th>
+                            <th>{Lang::T('Category')}</th>
+                            <th>{Lang::T('Price')}</th>
+                            <th>{Lang::T('Validity')}</th>
+                            <th style="background-color: rgb(246, 244, 244);">{Lang::T('Time')}</th>
+                            <th style="background-color: rgb(246, 244, 244);">{Lang::T('Data')}</th>
+                            <th>{Lang::T('Routers')}</th>
+                            <th>{Lang::T('Device')}</th>
+                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Plan')}</th>
+                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Date')}</th>
+                            <th>{Lang::T('ID')}</th>
+                            <th>{Lang::T('Manage')}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {foreach $d as $ds}
+                            <tr {if $ds['enabled'] !=1}class="danger" title="disabled" {elseif $ds['prepaid'] !='yes'
+                                                            }class="warning" title="Postpaid" {/if}>
+                                <td class="headcol">{$ds['name_plan']}</td>
+                                <td>{if $ds['prepaid'] == no}<b>Postpaid</b>{else}Prepaid{/if} {$ds['plan_type']}</td>
+                                <td>{$ds['name_bw']}</td>
+                                <td>{$ds['typebp']}</td>
+                                <td>{Lang::moneyFormat($ds['price'])}</td>
+                                <td>{$ds['validity']} {$ds['validity_unit']}</td>
+                                <td>{$ds['time_limit']} {$ds['time_unit']}</td>
+                                <td>{$ds['data_limit']} {$ds['data_unit']}</td>
+                                <td>
+                                    {if $ds['is_radius']}
+                                        <span class="label label-primary">RADIUS</span>
+                                    {else}
+                                        {if $ds['routers']!=''}
+                                            <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
                                         {/if}
-                                    </td>
-                                    <td>{$ds['device']}</td>
-                                    <td>{if $ds['plan_expired']}<a
-                                            href="{$_url}services/edit/{$ds['plan_expired']}">Yes</a>{else}No
-                                            {/if}</td>
-                                    <td>{if $ds['prepaid'] == no}{$ds['expired_date']}{/if}</td>
-                                    <td>{$ds['id']}</td>
-                                    <td>
-                                        <a href="{$_url}services/edit/{$ds['id']}"
-                                            class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
-                                        <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
-                                            onclick="return confirm('{Lang::T('Delete')}?')"
-                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
-                                    </td>
-                                </tr>
-                            {/foreach}
-                        </tbody>
-                    </table>
-                </div>
+                                    {/if}
+                                </td>
+                                <td>{$ds['device']}</td>
+                                <td>{if $ds['plan_expired']}<a
+                                        href="{$_url}services/edit/{$ds['plan_expired']}">Yes</a>{else}No
+                                    {/if}</td>
+                                <td>{if $ds['prepaid'] == no}{$ds['expired_date']}{/if}</td>
+                                <td>{$ds['id']}</td>
+                                <td>
+                                    <a href="{$_url}services/edit/{$ds['id']}"
+                                        class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
+                                    <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
+                                        onclick="return confirm('{Lang::T('Delete')}?')" class="btn btn-danger btn-xs"><i
+                                            class="glyphicon glyphicon-trash"></i></a>
+                                </td>
+                            </tr>
+                        {/foreach}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
                 {include file="pagination.tpl"}
                 <div class="bs-callout bs-callout-info" id="callout-navbar-role">
                     <h4>Create expired Internet Plan</h4>
diff --git a/ui/ui/pagination.tpl b/ui/ui/pagination.tpl
index 028e6185..8165c75d 100644
--- a/ui/ui/pagination.tpl
+++ b/ui/ui/pagination.tpl
@@ -1,4 +1,5 @@
 {if $paginator}
+    <center>
     <nav aria-label="Page navigation pagination-sm">
         <ul class="pagination">
             <li {if empty($paginator['prev'])}class="disabled" {/if}>
@@ -17,4 +18,5 @@
             </li>
         </ul>
     </nav>
+    </center>
 {/if}
\ No newline at end of file
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index c4cf7771..4413ea54 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -10,91 +10,167 @@
                             class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
                 </div>{Lang::T('PPPOE Plans')}
             </div>
-            <div class="panel-body">
-                <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
-                    <div class="col-md-8">
-                        <form id="site-search" method="post" action="{$_url}services/pppoe/">
+            <form id="site-search" method="post" action="{$_url}services/pppoe">
+                <div class="panel-body">
+                    <div class="row row-no-gutters" style="padding: 5px">
+                        <div class="col-lg-2">
                             <div class="input-group">
-                                <div class="input-group-addon">
-                                    <span class="fa fa-search"></span>
+                                <div class="input-group-btn">
+                                    <a class="btn btn-danger" title="Clear Search Query"
+                                        href="{$_url}services/pppoe"><span
+                                            class="glyphicon glyphicon-remove-circle"></span></a>
                                 </div>
                                 <input type="text" name="name" class="form-control"
                                     placeholder="{Lang::T('Search by Name')}...">
-                                <div class="input-group-btn">
-                                    <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
-                                </div>
                             </div>
-                        </form>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type1" name="type1">
+                                <option value="">Prepaid &amp; Postpaid</option>
+                                <option value="yes" {if $type1 eq 'yes' }selected{/if}>Prepaid</option>
+                                <option value="no" {if $type1 eq 'no' }selected{/if}>Postpaid</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type2" name="type2">
+                                <option value="">{Lang::T('Type')}</option>
+                                {foreach $type2s as $t}
+                                    <option value="{$t}" {if $type2 eq $t }selected{/if}>{Lang::T($t)}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="bandwidth" name="bandwidth">
+                                <option value="">{Lang::T('Bandwidth')}</option>
+                                {foreach $bws as $b}
+                                    <option value="{$b['id']}" {if $bandwidth eq $b['id'] }selected{/if}>
+                                        {$b['name_bw']}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="type3" name="type3">
+                                <option value="">{Lang::T('Category')}</option>
+                                {foreach $type3s as $t}
+                                    <option value="{$t}" {if $type3 eq $t }selected{/if}>{$t}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="valid" name="valid">
+                                <option value="">{Lang::T('Validity')}</option>
+                                {foreach $valids as $v}
+                                    <option value="{$v}" {if $valid eq $v }selected{/if}>{$v}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="router" name="router">
+                                <option value="">{Lang::T('Routers')}</option>
+                                {foreach $routers as $r}
+                                    <option value="{$r}" {if $router eq $r }selected{/if}>{$r}</option>
+                                {/foreach}
+                                <option value="radius" {if $router eq 'radius' }selected{/if}>Radius</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="device" name="device">
+                                <option value="">{Lang::T('Device')}</option>
+                                {foreach $devices as $r}
+                                    <option value="{$r}" {if $device eq $r }selected{/if}>{$r}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <select class="form-control" id="status" name="status">
+                                <option value="-">{Lang::T('Status')}</option>
+                                <option value="1" {if $status eq '1' }selected{/if}>Enabled</option>
+                                <option value="0" {if $status eq '0' }selected{/if}>Disable</option>
+                            </select>
+                        </div>
+                        <div class="col-lg-1 col-xs-8">
+                            <button class="btn btn-success btn-block" type="submit"><span
+                                    class="fa fa-search"></span></button>
+                        </div>
+                        <div class="col-lg-1 col-xs-4">
+                            <a href="{$_url}services/pppoe-add" class="btn btn-primary btn-block"
+                                title="{Lang::T('New Service Plan')}"><i class="ion ion-android-add"></i></a>
+                        </div>
                     </div>
-                    <div class="col-md-4">
-                        <a href="{$_url}services/pppoe-add" class="btn btn-primary btn-block"><i
-                                class="ion ion-android-add"> </i> {Lang::T('New Service Plan')}</a>
-                    </div>&nbsp;
                 </div>
-                <div class="table-responsive">
-                    <table class="table table-bordered table-striped table-condensed">
-                        <thead>
-                            <tr>
-                                <th></th>
-                                <th colspan="4" class="text-center">{Lang::T('Internet Plan')}</th>
-                                <th></th>
-                                <th colspan="2" class="text-center" style="background-color: rgb(243, 241, 172);">{Lang::T('Expired')}</th>
-                                <th colspan="4"></th>
-                            </tr>
-                            <tr>
-                                <th>{Lang::T('Plan Name')}</th>
-                                <th>{Lang::T('Plan Type')}</th>
-                                <th>{Lang::T('Bandwidth Plans')}</th>
-                                <th>{Lang::T('Plan Price')}</th>
-                                <th>{Lang::T('Plan Validity')}</th>
-                                <th>{Lang::T('IP Pool')}</th>
-                                <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Plan')}</th>
-                                <th style="background-color: rgb(243, 241, 172);">{Lang::T('Date')}</th>
-                                <th>{Lang::T('Routers')}</th>
-                                <th>{Lang::T('Device')}</th>
-                                <th>{Lang::T('Manage')}</th>
-                                <th>ID</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {foreach $d as $ds}
-                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
-                                    <td>{$ds['name_plan']}</td>
-                                    <td>{$ds['plan_type']} {if $ds['prepaid'] != 'yes'}<b>Postpaid</b>{else}Prepaid{/if}</td>
-                                    <td>{$ds['name_bw']}</td>
-                                    <td>{Lang::moneyFormat($ds['price'])}</td>
-                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
-                                    <td>{$ds['pool']}</td>
-                                    <td>{if $ds['plan_expired']}<a href="{$_url}services/edit/{$ds['plan_expired']}">Yes</a>{else}No{/if}</td>
-                                    <td>{if $ds['prepaid'] == no}{$ds['expired_date']}{/if}</td>
-                                    <td>
-                                        {if $ds['is_radius']}
-                                            <span class="label label-primary">RADIUS</span>
-                                        {else}
-                                            {if $ds['routers']!=''}
-                                                <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
-                                            {/if}
+            </form>
+            <div class="table-responsive">
+                <table class="table table-bordered table-striped table-condensed">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th colspan="4" class="text-center">{Lang::T('Internet Plan')}</th>
+                            <th></th>
+                            <th colspan="2" class="text-center" style="background-color: rgb(243, 241, 172);">
+                                {Lang::T('Expired')}</th>
+                            <th colspan="4"></th>
+                        </tr>
+                        <tr>
+                            <th>{Lang::T('Plan Name')}</th>
+                            <th>{Lang::T('Plan Type')}</th>
+                            <th>{Lang::T('Bandwidth Plans')}</th>
+                            <th>{Lang::T('Plan Price')}</th>
+                            <th>{Lang::T('Plan Validity')}</th>
+                            <th>{Lang::T('IP Pool')}</th>
+                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Plan')}</th>
+                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Date')}</th>
+                            <th>{Lang::T('Routers')}</th>
+                            <th>{Lang::T('Device')}</th>
+                            <th>{Lang::T('Manage')}</th>
+                            <th>ID</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {foreach $d as $ds}
+                            <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                <td>{$ds['name_plan']}</td>
+                                <td>{$ds['plan_type']} {if $ds['prepaid'] != 'yes'}<b>Postpaid</b>{else}Prepaid{/if}</td>
+                                <td>{$ds['name_bw']}</td>
+                                <td>{Lang::moneyFormat($ds['price'])}</td>
+                                <td>{$ds['validity']} {$ds['validity_unit']}</td>
+                                <td>{$ds['pool']}</td>
+                                <td>{if $ds['plan_expired']}<a
+                                        href="{$_url}services/edit/{$ds['plan_expired']}">Yes</a>{else}No
+                                    {/if}</td>
+                                <td>{if $ds['prepaid'] == no}{$ds['expired_date']}{/if}</td>
+                                <td>
+                                    {if $ds['is_radius']}
+                                        <span class="label label-primary">RADIUS</span>
+                                    {else}
+                                        {if $ds['routers']!=''}
+                                            <a href="{$_url}routers/edit/0&name={$ds['routers']}">{$ds['routers']}</a>
                                         {/if}
-                                    </td>
-                                    <td>{$ds['device']}</td>
-                                    <td>
-                                        <a href="{$_url}services/pppoe-edit/{$ds['id']}"
-                                            class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
-                                        <a href="{$_url}services/pppoe-delete/{$ds['id']}"
-                                            onclick="return confirm('{Lang::T('Delete')}?')" id="{$ds['id']}"
-                                            class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
-                                    </td>
-                                    <td>{$ds['id']}</td>
-                                </tr>
-                            {/foreach}
-                        </tbody>
-                    </table>
-                </div>
+                                    {/if}
+                                </td>
+                                <td>{$ds['device']}</td>
+                                <td>
+                                    <a href="{$_url}services/pppoe-edit/{$ds['id']}"
+                                        class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
+                                    <a href="{$_url}services/pppoe-delete/{$ds['id']}"
+                                        onclick="return confirm('{Lang::T('Delete')}?')" id="{$ds['id']}"
+                                        class="btn btn-danger btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
+                                </td>
+                                <td>{$ds['id']}</td>
+                            </tr>
+                        {/foreach}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
                 {include file="pagination.tpl"}
-				<div class="bs-callout bs-callout-info" id="callout-navbar-role">
-					<h4>Create expired Internet Plan</h4>
-					<p>When customer expired, you can move it to Expired Internet Plan</p>
-				</div>
+                <div class="bs-callout bs-callout-info" id="callout-navbar-role">
+                    <h4>Create expired Internet Plan</h4>
+                    <p>When customer expired, you can move it to Expired Internet Plan</p>
+                </div>
             </div>
         </div>
     </div>
diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index ec6f4c37..3fb2a59a 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -41,7 +41,7 @@
                     <select class="form-control" id="router" name="router">
                         <option value="">{Lang::T('Routers')}</option>
                         {foreach $routers as $r}
-                            <option value="{$r}" {if $router eq $r }selected{/if}>{Lang::T($r)}
+                            <option value="{$r}" {if $router eq $r }selected{/if}>{$r}
                             </option>
                         {/foreach}
                     </select>
@@ -137,8 +137,6 @@
             </tbody>
         </table>
     </div>
-    <center>
-        {include file="pagination.tpl"}
-    </center>
+    {include file="pagination.tpl"}
 </div>
 {include file="sections/footer.tpl"}
\ No newline at end of file