diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index de5ea9a4..3ab9645d 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -44,6 +44,7 @@ class Package
                 foreach ($bills as $k => $v) {
                     $note .= $k . " : " . Lang::moneyFormat($v) . "\n";
                 }
+                $note .= $p['name_plan'] . " : " . Lang::moneyFormat($p['price']) . "\n";
             }
         }
 
@@ -520,7 +521,9 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 if ($p['validity_unit'] == 'Period') {
                     // Postpaid price always zero for first time
-                    $t->price = 0 + $add_cost;
+                    $note = '';
+                    $bills = [];
+                    $t->price = 0;
                 } else {
                     $t->price = $p['price'] + $add_cost;
                 }
diff --git a/system/autoload/Paginator.php b/system/autoload/Paginator.php
index bc8769fe..24766ae6 100644
--- a/system/autoload/Paginator.php
+++ b/system/autoload/Paginator.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- *  PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ *  PHP Mikrotik Billing (https://github.com/SiberTech/)
  *  by https://t.me/ibnux
  **/
 
 
 class Paginator
 {
-    public static function generate($query, $search = [], $per_page = '10')
+    public static function findMany($query, $search = [], $per_page = '10')
     {
-        global $routes;
+        global $routes, $ui;
         $adjacents = "2";
         $page = _get('p', 1);
         $page = (empty($page) ? 1 : $page);
@@ -66,15 +66,20 @@ class Paginator
                 'url' => $url,
                 'page' => $page,
                 'pages' => $pages,
-                'prev' => ($page>0) ? ($page-1): "0",
-                'next' => ($page>= $lastpage) ? $lastpage : $page+1
+                'prev' => ($page > 0) ? ($page - 1) : "0",
+                'next' => ($page >= $lastpage) ? $lastpage : $page + 1
             ];
-            return $result;
+            if ($ui) {
+                $ui->assign('paginator', $result);
+            }
+            return $query->offset($startpoint)->limit($per_page)->find_many();
         }
     }
+
     public static function build($table, $colVal = [], $query = '', $per_page = '10')
     {
         global $routes;
+        global $_L;
         $url = U . implode('/', $routes);
         $query = urlencode($query);
         $adjacents = "2";
@@ -99,60 +104,60 @@ class Paginator
         $limit = $per_page;
         $startpoint = ($page * $limit) - $limit;
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
-
+            $pagination = '<nav>' . $pagination . '</nav>';
             return array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
         }
     }
@@ -205,59 +210,60 @@ class Paginator
         $startpoint = ($page * $limit) - $limit;
 
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
+            $pagination = '<nav>' . $pagination . '</nav>';
 
             $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
             return $gen;
@@ -299,59 +305,60 @@ class Paginator
         $startpoint = ($page * $limit) - $limit;
 
         if ($lastpage >= 1) {
-            $pagination .= '<ul class="pagination pagination-sm">';
+            $pagination .= '<ul class="pagination">';
             if ($lastpage < 7 + ($adjacents * 2)) {
                 for ($counter = 1; $counter <= $lastpage; $counter++) {
                     if ($counter == $page)
-                        $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                        $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                     else
-                        $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                        $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                 }
             } elseif ($lastpage > 5 + ($adjacents * 2)) {
                 if ($page < 1 + ($adjacents * 2)) {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
-                    $pagination .= "<li class='disabled'><a href='#'>...</a></li>";
-                    $pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>";
-                    $pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>";
+                    $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
                 } else {
-                    $pagination .= "<li><a href='{$url}1'>1</a></li>";
-                    $pagination .= "<li><a href='{$url}2'>2</a></li>";
-                    $pagination .= "<li><a href='#'>...</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
+                    $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
                         if ($counter == $page)
-                            $pagination .= "<li class='active'><a class='disabled'>$counter</a></li>";
+                            $pagination .= "<li class='page-item active'><a class='page-item disabled'>$counter</a></li>";
                         else
-                            $pagination .= "<li><a href='{$url}$counter'>$counter</a></li>";
+                            $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
                     }
                 }
             }
 
             if ($page < $counter - 1) {
-                $pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
             } else {
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>";
-                $pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Next') . "</a></li>";
+                $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Last') . "</a></li>";
             }
             $pagination .= "</ul>";
+            $pagination = '<nav>' . $pagination . '</nav>';
 
             $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
             return $gen;
diff --git a/system/controllers/bandwidth.php b/system/controllers/bandwidth.php
index 6720f9f7..bdca963c 100644
--- a/system/controllers/bandwidth.php
+++ b/system/controllers/bandwidth.php
@@ -22,17 +22,14 @@ switch ($action) {
         run_hook('view_list_bandwidth'); #HOOK
         $name = _post('name');
         if ($name != '') {
-            $query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $query = ORM::for_table('tbl_bandwidth');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_bandwidth')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         $ui->display('bandwidth.tpl');
         break;
 
diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index a5b5a604..21143c2f 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -192,23 +192,12 @@ switch ($action) {
             }
             if ($v == 'order') {
                 $v = 'order';
-                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username']);
-                $paginator = Paginator::generate($query);
-                $order = $query
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
+                $order = Paginator::findMany($query);
                 $ui->assign('order', $order);
             } else if ($v == 'activation') {
-                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username']);
-                $paginator = Paginator::generate($query);
-                $activation = $query->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])
-                    ->order_by_desc('id')
-                    ->find_many();
-                $ui->assign('paginator', $paginator);
+                $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
+                $activation = Paginator::findMany($query);
                 $ui->assign('activation', $activation);
             }
             $ui->assign('packages', User::_billing($customer['id']));
@@ -526,22 +515,17 @@ switch ($action) {
         $search = _post('search');
         run_hook('list_customers'); #HOOK
         if ($search != '') {
-            $query = ORM::for_table('tbl_customers')->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')");
-            $paginator = Paginator::generate($query, ['search' => $search]);
-            $d = $query->offset($paginator['startpoint'])
-                ->limit($paginator['limit'])
-                ->order_by_asc('username')
-                ->find_many();
+            $query = ORM::for_table('tbl_customers')
+            ->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')")
+            ->order_by_asc('username');
+            $d = Paginator::findMany($query, ['search' => $search]);
         } else {
-            $query = ORM::for_table('tbl_customers');
-            $paginator = Paginator::generate($query);
-            $d = ORM::for_table('tbl_customers')
-                ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_customers')->order_by_asc('username');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('search', htmlspecialchars($search));
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         $ui->display('customers.tpl');
         break;
 }
diff --git a/system/controllers/dashboard.php b/system/controllers/dashboard.php
index a51bbe07..6e28e26e 100644
--- a/system/controllers/dashboard.php
+++ b/system/controllers/dashboard.php
@@ -55,13 +55,9 @@ $ui->assign('c_all', $c_all);
 if ($config['hide_uet'] != 'yes') {
     //user expire
     $query = ORM::for_table('tbl_user_recharges')
-    ->where_lte('expiration', $mdate);
-    $paginator = Paginator::generate($query);
-    $expire = $query
-        ->offset($paginator['startpoint'])
-        ->limit($paginator['limit'])
-        ->order_by_desc('expiration')
-        ->find_many();
+        ->where_lte('expiration', $mdate)
+        ->order_by_desc('expiration');
+    $expire = Paginator::findMany($query);
 
     // Get the total count of expired records for pagination
     $totalCount = ORM::for_table('tbl_user_recharges')
@@ -72,7 +68,6 @@ if ($config['hide_uet'] != 'yes') {
     $paginator['total_count'] = $totalCount;
 
     // Assign the pagination HTML to the template variable
-    $ui->assign('paginator', $paginator);
     $ui->assign('expire', $expire);
 }
 
diff --git a/system/controllers/logs.php b/system/controllers/logs.php
index 0677f21c..ac4d1db2 100644
--- a/system/controllers/logs.php
+++ b/system/controllers/logs.php
@@ -26,18 +26,15 @@ switch ($action) {
             r2(U . "logs/list/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%');
-            $paginator = Paginator::generate($query, ['q' => $q]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $query = ORM::for_table('tbl_logs');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_logs')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('logs.tpl');
         break;
     case 'radius':
@@ -48,18 +45,15 @@ switch ($action) {
             r2(U . "logs/radius/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%');
-            $paginator = Paginator::generate($query, ['q' => $q]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $query = ORM::for_table('radpostauth', 'radius');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('radpostauth', 'radius')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('logs-radius.tpl');
         break;
 
diff --git a/system/controllers/order.php b/system/controllers/order.php
index 7495a7bf..7a6d199c 100644
--- a/system/controllers/order.php
+++ b/system/controllers/order.php
@@ -19,13 +19,8 @@ switch ($action) {
         break;
     case 'history':
         $ui->assign('_system_menu', 'history');
-        $query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username']);
-        $paginator = Paginator::generate($query);
-        $d = $query
-            ->order_by_desc('id')
-            ->offset($paginator['startpoint'])->limit($paginator['limit'])
-            ->find_many();
-        $ui->assign('paginator', $paginator);
+        $query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username'])->order_by_desc('id');
+        $d = Paginator::findMany($query);
         $ui->assign('d', $d);
         $ui->assign('_title', Lang::T('Order History'));
         run_hook('customer_view_order_history'); #HOOK
diff --git a/system/controllers/plan.php b/system/controllers/plan.php
index 21e76bf7..e2996ee8 100644
--- a/system/controllers/plan.php
+++ b/system/controllers/plan.php
@@ -68,13 +68,11 @@ switch ($action) {
         $ui->assign('_title', Lang::T('Customer'));
         $search = _post('search');
         if ($search != '') {
-            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%');
-            $paginator = Paginator::generate($query, ['search' => $search]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['search' => $search]);
         } else {
-            $query = ORM::for_table('tbl_user_recharges');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_array();
+            $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
         run_hook('view_list_billing'); #HOOK
         if ($isApi) {
@@ -82,7 +80,6 @@ switch ($action) {
         }
         $ui->assign('d', $d);
         $ui->assign('search', $search);
-        $ui->assign('paginator', $paginator);
         $ui->display('plan.tpl');
         break;
 
diff --git a/system/controllers/pool.php b/system/controllers/pool.php
index 4ec35f6e..311188c8 100644
--- a/system/controllers/pool.php
+++ b/system/controllers/pool.php
@@ -23,17 +23,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $query = ORM::for_table('tbl_pool');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_pool')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_pool'); #HOOK
         $ui->display('pool.tpl');
         break;
diff --git a/system/controllers/radius.php b/system/controllers/radius.php
index f9c55957..a831aa13 100644
--- a/system/controllers/radius.php
+++ b/system/controllers/radius.php
@@ -136,19 +136,14 @@ switch ($action) {
         $name = _post('name');
         if (empty($name)) {
             $query = ORM::for_table('nas', 'radius');
-            $paginator = Paginator::generate($query);
-            $nas = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $nas = Paginator::findMany($query);
         } else {
             $query = ORM::for_table('nas', 'radius')
                 ->where_like('nasname', $search)
                 ->where_like('shortname', $search)
                 ->where_like('description', $search);
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $nas = $query
-                ->offset($paginator['startpoint'])->limit($paginator['limit'])
-                ->find_many();
+            $nas = Paginator::findMany($query, ['name' => $name]);
         }
-        $ui->assign('paginator', $paginator);
         $ui->assign('name', $name);
         $ui->assign('nas', $nas);
         $ui->display('radius-nas.tpl');
diff --git a/system/controllers/reports.php b/system/controllers/reports.php
index cd159fc4..2983fc1f 100644
--- a/system/controllers/reports.php
+++ b/system/controllers/reports.php
@@ -30,31 +30,26 @@ switch ($action) {
             r2(U . "logs/list/", 's', "Delete logs older than $keep days");
         }
         if ($q != '') {
-            $query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%');
-            $paginator = Paginator::generate($query, ['q' => $q]);
-            $d = $where->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['q' => $q]);
         } else {
-            $query = ORM::for_table('tbl_transactions');
-            $paginator = Paginator::generate($query);
-            $d = $where->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_transactions')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('activation', $d);
         $ui->assign('q', $q);
-        $ui->assign('paginator', $paginator);
         $ui->display('reports-activation.tpl');
         break;
     case 'daily-report':
-        $query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate);
-        $paginator = Paginator::generate($query);
-        $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+        $query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->order_by_desc('id');
+        $d = Paginator::findMany($query);
         $dr = $query->sum('price');
 
         $ui->assign('d', $d);
         $ui->assign('dr', $dr);
         $ui->assign('mdate', $mdate);
         $ui->assign('mtime', $mtime);
-        $ui->assign('paginator', $paginator);
         run_hook('view_daily_reports'); #HOOK
         $ui->display('reports-daily.tpl');
         break;
diff --git a/system/controllers/routers.php b/system/controllers/routers.php
index 92357c32..9c73351f 100644
--- a/system/controllers/routers.php
+++ b/system/controllers/routers.php
@@ -26,17 +26,14 @@ switch ($action) {
 
         $name = _post('name');
         if ($name != '') {
-            $query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->order_by_desc('id');
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
-            $query = ORM::for_table('tbl_routers');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $query = ORM::for_table('tbl_routers')->order_by_desc('id');
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_routers'); #HOOK
         $ui->display('routers.tpl');
         break;
diff --git a/system/controllers/services.php b/system/controllers/services.php
index 90059d9f..5a07f116 100644
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@@ -120,16 +120,13 @@ switch ($action) {
         $name = _post('name');
         if ($name != '') {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name'=> $name]);
-            $d =  $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name'=> $name]);
         } else {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
-            $paginator = Paginator::generate($query);
-            $d =  $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_plans'); #HOOK
         $ui->display('hotspot.tpl');
         break;
@@ -396,16 +393,13 @@ switch ($action) {
         $name = _post('name');
         if ($name != '') {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $d =$query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
             $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE');
-            $paginator = Paginator::generate($query);
-            $d =$query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_ppoe'); #HOOK
         $ui->display('pppoe.tpl');
         break;
@@ -651,16 +645,13 @@ switch ($action) {
         $name = _post('name');
         if ($name != '') {
             $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%');
-            $paginator = Paginator::generate($query, ['name' => $name]);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query, ['name' => $name]);
         } else {
             $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance');
-            $paginator = Paginator::generate($query);
-            $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
+            $d = Paginator::findMany($query);
         }
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_balance'); #HOOK
         $ui->display('balance.tpl');
         break;
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index fa50eb8a..55c5509f 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -277,11 +277,9 @@ switch ($action) {
         if ($search != '') {
             if ($admin['user_type'] == 'SuperAdmin') {
                 $query = ORM::for_table('tbl_users')
-                    ->where_like('username', '%' . $search . '%');
-                $paginator = Paginator::generate($query, ['search' => $search]);
-                $d = $query
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ->where_like('username', '%' . $search . '%')
+                    ->order_by_asc('id');
+                $d = Paginator::findMany($query, ['search' => $search]);
             } else if ($admin['user_type'] == 'Admin') {
                 $query = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')->where_any_is([
@@ -289,46 +287,36 @@ switch ($action) {
                         ['user_type' => 'Agent'],
                         ['user_type' => 'Sales'],
                         ['id' => $admin['id']]
-                    ]);
-                $paginator = Paginator::generate($query, ['search' => $search]);
-                $d = $query
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ])->order_by_asc('id');
+                $d = Paginator::findMany($query, ['search' => $search]);
             } else {
                 $query = ORM::for_table('tbl_users')
                     ->where_like('username', '%' . $search . '%')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ]);
-                $paginator = Paginator::generate($query, ['search' => $search]);
-                $d = $query
-                    ->offset($paginator['startpoint'])
-                    ->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ])->order_by_asc('id');
+                $d = Paginator::findMany($query, ['search' => $search]);
             }
         } else {
             if ($admin['user_type'] == 'SuperAdmin') {
-                $query = ORM::for_table('tbl_users');
-                $paginator = Paginator::generate($query);
-                $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                $query = ORM::for_table('tbl_users')->order_by_asc('id');
+                $d = Paginator::findMany($query);
             } else if ($admin['user_type'] == 'Admin') {
                 $query = ORM::for_table('tbl_users')->where_any_is([
                     ['user_type' => 'Report'],
                     ['user_type' => 'Agent'],
                     ['user_type' => 'Sales'],
                     ['id' => $admin['id']]
-                ]);
-                $paginator = Paginator::generate($query);
-                $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                ])->order_by_asc('id');
+                $d = Paginator::findMany($query);
             } else {
                 $query = ORM::for_table('tbl_users')
                     ->where_any_is([
                         ['id' => $admin['id']],
                         ['root' => $admin['id']]
-                    ]);
-                $paginator = Paginator::generate($query);
-                $d = $query
-                    ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
+                    ])->order_by_asc('id');
+                $d = Paginator::findMany($query);
             }
         }
         $admins = [];
@@ -353,7 +341,6 @@ switch ($action) {
         $ui->assign('admins', $admins);
         $ui->assign('d', $d);
         $ui->assign('search', $search);
-        $ui->assign('paginator', $paginator);
         run_hook('view_list_admin'); #HOOK
         $ui->display('users.tpl');
         break;
diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
index 5fe9a4f3..96972f71 100644
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@@ -40,12 +40,10 @@ switch ($action) {
 
     case 'list-activated':
         $ui->assign('_system_menu', 'list-activated');
-        $query = ORM::for_table('tbl_transactions')->where('username', $user['username']);
-        $paginator = Paginator::generate($query);
-        $d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+        $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_asc('id');
+        $d = Paginator::findMany($query);
 
         $ui->assign('d', $d);
-        $ui->assign('paginator', $paginator);
         run_hook('customer_view_activation_list'); #HOOK
         $ui->display('user-activation-list.tpl');
 
diff --git a/ui/ui/pagination.tpl b/ui/ui/pagination.tpl
index 9b4ef089..028e6185 100644
--- a/ui/ui/pagination.tpl
+++ b/ui/ui/pagination.tpl
@@ -3,15 +3,16 @@
         <ul class="pagination">
             <li {if empty($paginator['prev'])}class="disabled" {/if}>
                 <a href="{$paginator['url']}{$paginator['prev']}" aria-label="Previous">
-                    <span aria-hidden="true">prev</span>
+                    <span aria-hidden="true">{Lang::T('Prev')}</span>
                 </a>
             </li>
             {foreach $paginator['pages'] as $page}
-                <li class="{if $paginator['page'] == $page}active{elseif $page == '...'}disabled{/if}"><a href="{$paginator['url']}{$page}">{$page}</a></li>
+                <li class="{if $paginator['page'] == $page}active{elseif $page == '...'}disabled{/if}"><a
+                        href="{$paginator['url']}{$page}">{$page}</a></li>
             {/foreach}
-            <li {if $paginator['count']==$paginator['next']}class="disabled" {/if}>
+            <li {if $paginator['page']>=$paginator['count']}class="disabled" {/if}>
                 <a href="{$paginator['url']}{$paginator['next']}" aria-label="Next">
-                    <span aria-hidden="true">next</span>
+                    <span aria-hidden="true">{Lang::T('Next')}</span>
                 </a>
             </li>
         </ul>