diff --git a/system/controllers/invoices.php b/system/controllers/invoices.php
index ec087df0..e072468c 100644
--- a/system/controllers/invoices.php
+++ b/system/controllers/invoices.php
@@ -7,20 +7,20 @@
  **/
 
 
-_auth();
-$ui->assign('_title', Lang::T('Invoices'));
-$ui->assign('_system_menu', 'Reports');
-
+ _admin();
+$ui->assign('_title', Lang::T('Invoice Lists'));
+$ui->assign('_system_menu', 'reports');
 $action = $routes['1'];
-$user = User::_info();
-$ui->assign('_user', $user);
+$ui->assign('_admin', $admin);
 
+if (empty($action)) {
+    $action = 'list';
+}
 switch ($action) {
-
     case 'list':
         $ui->assign('xheader', '<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.min.css">');
         $ui->assign('invoices', Invoice::getAll());
-        $ui->display('admin/invoice/list.tpl');
+        $ui->display('admin/invoices/list.tpl');
         break;
     default:
         $ui->display('admin/404.tpl');
diff --git a/ui/ui/admin/header.tpl b/ui/ui/admin/header.tpl
index 4f98e98c..18ad53de 100644
--- a/ui/ui/admin/header.tpl
+++ b/ui/ui/admin/header.tpl
@@ -30,7 +30,7 @@
 
     </style>
     {if isset($xheader)}
-        {$xheader}
+    {$xheader}
     {/if}
 
 </head>
@@ -78,8 +78,8 @@
                             <ul class="dropdown-menu">
                                 <li class="user-header">
                                     <img src="{$app_url}/{$UPLOAD_PATH}{$_admin['photo']}.thumb.jpg"
-                                        onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'" class="img-circle"
-                                        alt="Avatar">
+                                        onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'"
+                                        class="img-circle" alt="Avatar">
                                     <p>
                                         {$_admin['fullname']}
                                         <small>{Lang::T($_admin['user_type'])}</small>
@@ -128,63 +128,64 @@
                     </li>
                     {$_MENU_AFTER_CUSTOMERS}
                     {if !in_array($_admin['user_type'],['Report'])}
-                        <li class="{if $_routes[0] eq 'plan' || $_routes[0] eq 'coupons'}active{/if} treeview">
-                            <a href="#">
-                                <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{Text::url('plan/list')}">{Lang::T('Active Customers')}</a></li>
-                                {if $_c['disable_voucher'] != 'yes'}
-                                    <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
-                                            href="{Text::url('plan/refill')}">{Lang::T('Refill Customer')}</a></li>
-                                {/if}
-                                {if $_c['disable_voucher'] != 'yes'}
-                                    <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
-                                            href="{Text::url('plan/voucher')}">{Lang::T('Vouchers')}</a></li>
-                                {/if}
-                                {if $_c['enable_coupons'] == 'yes'}
-                                    <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
-                                            href="{Text::url('coupons')}">{Lang::T('Coupons')}</a></li>
-                                {/if}
-                                <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
-                                        href="{Text::url('plan/recharge')}">{Lang::T('Recharge Customer')}</a></li>
-                                {if $_c['enable_balance'] == 'yes'}
-                                    <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
-                                            href="{Text::url('plan/deposit')}">{Lang::T('Refill Balance')}</a></li>
-                                {/if}
-                                {$_MENU_SERVICES}
-                            </ul>
-                        </li>
+                    <li class="{if $_routes[0] eq 'plan' || $_routes[0] eq 'coupons'}active{/if} treeview">
+                        <a href="#">
+                            <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                    href="{Text::url('plan/list')}">{Lang::T('Active Customers')}</a></li>
+                            {if $_c['disable_voucher'] != 'yes'}
+                            <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
+                                    href="{Text::url('plan/refill')}">{Lang::T('Refill Customer')}</a></li>
+                            {/if}
+                            {if $_c['disable_voucher'] != 'yes'}
+                            <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
+                                    href="{Text::url('plan/voucher')}">{Lang::T('Vouchers')}</a></li>
+                            {/if}
+                            {if $_c['enable_coupons'] == 'yes'}
+                            <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
+                                    href="{Text::url('coupons')}">{Lang::T('Coupons')}</a></li>
+                            {/if}
+                            <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
+                                    href="{Text::url('plan/recharge')}">{Lang::T('Recharge Customer')}</a></li>
+                            {if $_c['enable_balance'] == 'yes'}
+                            <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
+                                    href="{Text::url('plan/deposit')}">{Lang::T('Refill Balance')}</a></li>
+                            {/if}
+                            {$_MENU_SERVICES}
+                        </ul>
+                    </li>
                     {/if}
                     {$_MENU_AFTER_SERVICES}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                        <li class="{if $_system_menu eq 'services'}active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-cube"></i> <span>{Lang::T('Internet Plan')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
-                                        href="{Text::url('services/hotspot')}">Hotspot</a></li>
-                                <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
-                                        href="{Text::url('services/pppoe')}">PPPOE</a></li>
-                                <li {if $_routes[1] eq 'vpn' }class="active" {/if}><a href="{Text::url('services/vpn')}">VPN</a>
-                                </li>
-                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{Text::url('bandwidth/list')}">Bandwidth</a></li>
-                                {if $_c['enable_balance'] == 'yes'}
-                                    <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
-                                            href="{Text::url('services/balance')}">{Lang::T('Customer Balance')}</a></li>
-                                {/if}
-                                {$_MENU_PLANS}
-                            </ul>
-                        </li>
+                    <li class="{if $_system_menu eq 'services'}active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-cube"></i> <span>{Lang::T('Internet Plan')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
+                                    href="{Text::url('services/hotspot')}">Hotspot</a></li>
+                            <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
+                                    href="{Text::url('services/pppoe')}">PPPOE</a></li>
+                            <li {if $_routes[1] eq 'vpn' }class="active" {/if}><a
+                                    href="{Text::url('services/vpn')}">VPN</a>
+                            </li>
+                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                    href="{Text::url('bandwidth/list')}">Bandwidth</a></li>
+                            {if $_c['enable_balance'] == 'yes'}
+                            <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
+                                    href="{Text::url('services/balance')}">{Lang::T('Customer Balance')}</a></li>
+                            {/if}
+                            {$_MENU_PLANS}
+                        </ul>
+                    </li>
                     {/if}
                     {$_MENU_AFTER_PLANS}
                     <li class="{if in_array($_routes[0], ['maps'])}active{/if} treeview">
@@ -204,18 +205,20 @@
                     </li>
                     <li class="{if $_system_menu eq 'reports'}active{/if} treeview">
                         {if in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])}
-                            <a href="#">
-                                <i class="ion ion-clipboard"></i> <span>{Lang::T('Reports')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
+                        <a href="#">
+                            <i class="ion ion-clipboard"></i> <span>{Lang::T('Reports')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
                         {/if}
                         <ul class="treeview-menu">
                             <li {if $_routes[1] eq 'reports' }class="active" {/if}><a
                                     href="{Text::url('reports')}">{Lang::T('Daily Reports')}</a></li>
                             <li {if $_routes[1] eq 'activation' }class="active" {/if}><a
                                     href="{Text::url('reports/activation')}">{Lang::T('Activation History')}</a></li>
+                           {* <li {if $_routes[0] eq 'invoices' }class="active" {/if}><a
+                                    href="{Text::url('invoices')}">{Lang::T('Invoices')}</a></li> *}
                             {$_MENU_REPORTS}
                         </ul>
                     </li>
@@ -237,68 +240,71 @@
                     </li>
                     {$_MENU_AFTER_MESSAGE}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                        <li class="{if $_system_menu eq 'network'}active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[0] eq 'routers' and $_routes[1] eq '' }class="active" {/if}><a
-                                        href="{Text::url('routers')}">Routers</a></li>
-                                <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{Text::url('pool/list')}">IP Pool</a></li>
-                                <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'port' }class="active" {/if}><a
-                                        href="{Text::url('pool/port')}">Port Pool</a></li>
-                                {$_MENU_NETWORK}
-                            </ul>
-                        </li>
-                        {$_MENU_AFTER_NETWORKS}
-                        {if $_c['radius_enable']}
-                            <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
-                                <a href="#">
-                                    <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
-                                    <span class="pull-right-container">
-                                        <i class="fa fa-angle-left pull-right"></i>
-                                    </span>
-                                </a>
-                                <ul class="treeview-menu">
-                                    <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
-                                            href="{Text::url('radius/nas-list')}">{Lang::T('Radius NAS')}</a></li>
-                                    {$_MENU_RADIUS}
-                                </ul>
+                    <li class="{if $_system_menu eq 'network'}active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[0] eq 'routers' and $_routes[1] eq '' }class="active" {/if}><a
+                                    href="{Text::url('routers')}">Routers</a></li>
+                            <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
+                                    href="{Text::url('pool/list')}">IP Pool</a></li>
+                            <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'port' }class="active" {/if}><a
+                                    href="{Text::url('pool/port')}">Port Pool</a></li>
+                            {$_MENU_NETWORK}
+                        </ul>
+                    </li>
+                    {$_MENU_AFTER_NETWORKS}
+                    {if $_c['radius_enable']}
+                    <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
+                        <a href="#">
+                            <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
+                                    href="{Text::url('radius/nas-list')}">{Lang::T('Radius NAS')}</a></li>
+                            {$_MENU_RADIUS}
+                        </ul>
+                    </li>
+                    {/if}
+                    {$_MENU_AFTER_RADIUS}
+                    <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
+                                    href="{Text::url('pages/Order_Voucher')}">{Lang::T('Order Voucher')}</a></li>
+                            <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
+                                    href="{Text::url('pages/Voucher')}">{Lang::T('Theme Voucher')}</a></li>
+                            <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
+                                    href="{Text::url('pages/Announcement')}">{Lang::T('Announcement')}</a></li>
+                            <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
+                                    href="{Text::url('pages/Announcement_Customer')}">{Lang::T('Customer
+                                    Announcement')}</a>
                             </li>
-                        {/if}
-                        {$_MENU_AFTER_RADIUS}
-                        <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
-                                        href="{Text::url('pages/Order_Voucher')}">{Lang::T('Order Voucher')}</a></li>
-                                <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
-                                        href="{Text::url('pages/Voucher')}">{Lang::T('Theme Voucher')}</a></li>
-                                <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
-                                        href="{Text::url('pages/Announcement')}">{Lang::T('Announcement')}</a></li>
-                                <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
-                                        href="{Text::url('pages/Announcement_Customer')}">{Lang::T('Customer Announcement')}</a>
-                                </li>
-                                <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
-                                        href="{Text::url('pages/Registration_Info')}">{Lang::T('Registration Info')}</a></li>
-                                <li {if $_routes[1] eq 'Payment_Info' }class="active" {/if}><a
-                                        href="{Text::url('pages/Payment_Info')}">{Lang::T('Payment Info')}</a></li>
-                                <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
-                                        href="{Text::url('pages/Privacy_Policy')}">{Lang::T('Privacy Policy')}</a></li>
-                                <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
-                                        href="{Text::url('pages/Terms_and_Conditions')}">{Lang::T('Terms and Conditions')}</a></li>
-                                {$_MENU_PAGES}
-                            </ul>
-                        </li>
+                            <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
+                                    href="{Text::url('pages/Registration_Info')}">{Lang::T('Registration Info')}</a>
+                            </li>
+                            <li {if $_routes[1] eq 'Payment_Info' }class="active" {/if}><a
+                                    href="{Text::url('pages/Payment_Info')}">{Lang::T('Payment Info')}</a></li>
+                            <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
+                                    href="{Text::url('pages/Privacy_Policy')}">{Lang::T('Privacy Policy')}</a></li>
+                            <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
+                                    href="{Text::url('pages/Terms_and_Conditions')}">{Lang::T('Terms and
+                                    Conditions')}</a></li>
+                            {$_MENU_PAGES}
+                        </ul>
+                    </li>
                     {/if}
                     {$_MENU_AFTER_PAGES}
                     <li
@@ -311,84 +317,85 @@
                         </a>
                         <ul class="treeview-menu">
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                                <li {if $_routes[1] eq 'app' }class="active" {/if}><a
-                                        href="{Text::url('settings/app')}">{Lang::T('General Settings')}</a></li>
-                                <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
-                                        href="{Text::url('settings/localisation')}">{Lang::T('Localisation')}</a></li>
-                                <li {if $_routes[0] eq 'customfield' }class="active" {/if}><a
-                                        href="{Text::url('customfield')}">{Lang::T('Custom Fields')}</a></li>
-                                <li {if $_routes[1] eq 'miscellaneous' }class="active" {/if}><a
-                                        href="{Text::url('settings/miscellaneous')}">{Lang::T('Miscellaneous')}</a></li>
-                                <li {if $_routes[1] eq 'maintenance' }class="active" {/if}><a
-                                        href="{Text::url('settings/maintenance')}">{Lang::T('Maintenance Mode')}</a></li>
-                                <li {if $_routes[0] eq 'widgets' }class="active" {/if}><a
-                                            href="{Text::url('widgets')}">{Lang::T('Widgets')}</a></li>
-                                <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
-                                        href="{Text::url('settings/notifications')}">{Lang::T('User Notification')}</a></li>
-                                <li {if $_routes[1] eq 'devices' }class="active" {/if}><a
-                                        href="{Text::url('settings/devices')}">{Lang::T('Devices')}</a></li>
+                            <li {if $_routes[1] eq 'app' }class="active" {/if}><a
+                                    href="{Text::url('settings/app')}">{Lang::T('General Settings')}</a></li>
+                            <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
+                                    href="{Text::url('settings/localisation')}">{Lang::T('Localisation')}</a></li>
+                            <li {if $_routes[0] eq 'customfield' }class="active" {/if}><a
+                                    href="{Text::url('customfield')}">{Lang::T('Custom Fields')}</a></li>
+                            <li {if $_routes[1] eq 'miscellaneous' }class="active" {/if}><a
+                                    href="{Text::url('settings/miscellaneous')}">{Lang::T('Miscellaneous')}</a></li>
+                            <li {if $_routes[1] eq 'maintenance' }class="active" {/if}><a
+                                    href="{Text::url('settings/maintenance')}">{Lang::T('Maintenance Mode')}</a></li>
+                            <li {if $_routes[0] eq 'widgets' }class="active" {/if}><a
+                                    href="{Text::url('widgets')}">{Lang::T('Widgets')}</a></li>
+                            <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
+                                    href="{Text::url('settings/notifications')}">{Lang::T('User Notification')}</a></li>
+                            <li {if $_routes[1] eq 'devices' }class="active" {/if}><a
+                                    href="{Text::url('settings/devices')}">{Lang::T('Devices')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin','Agent'])}
-                                <li {if $_routes[1] eq 'users' }class="active" {/if}><a
-                                        href="{Text::url('settings/users')}">{Lang::T('Administrator Users')}</a></li>
+                            <li {if $_routes[1] eq 'users' }class="active" {/if}><a
+                                    href="{Text::url('settings/users')}">{Lang::T('Administrator Users')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                                <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
-                                        href="{Text::url('settings/dbstatus')}">{Lang::T('Backup/Restore')}</a></li>
-                                <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
-                                    <a href="{Text::url('paymentgateway')}">
-                                        <span class="text">{Lang::T('Payment Gateway')}</span>
-                                    </a>
-                                </li>
-                                {$_MENU_SETTINGS}
-                                <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
-                                    <a href="{Text::url('pluginmanager')}"><i class="glyphicon glyphicon-tasks"></i>
-                                        {Lang::T('Plugin Manager')}</a>
-                                </li>
+                            <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
+                                    href="{Text::url('settings/dbstatus')}">{Lang::T('Backup/Restore')}</a></li>
+                            <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
+                                <a href="{Text::url('paymentgateway')}">
+                                    <span class="text">{Lang::T('Payment Gateway')}</span>
+                                </a>
+                            </li>
+                            {$_MENU_SETTINGS}
+                            <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
+                                <a href="{Text::url('pluginmanager')}"><i class="glyphicon glyphicon-tasks"></i>
+                                    {Lang::T('Plugin Manager')}</a>
+                            </li>
                             {/if}
                         </ul>
                     </li>
                     {$_MENU_AFTER_SETTINGS}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                        <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
-                            </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                        href="{Text::url('logs/phpnuxbill')}">PhpNuxBill</a></li>
-                                {if $_c['radius_enable']}
-                                    <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
-                                            href="{Text::url('logs/radius')}">Radius</a>
-                                    </li>
-                                {/if}
-                                <li {if $_routes[1] eq 'message' }class="active" {/if}><a
+                    <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
+                        <a href="#">
+                            <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
+                            <span class="pull-right-container">
+                                <i class="fa fa-angle-left pull-right"></i>
+                            </span>
+                        </a>
+                        <ul class="treeview-menu">
+                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                    href="{Text::url('logs/phpnuxbill')}">PhpNuxBill</a></li>
+                            {if $_c['radius_enable']}
+                            <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
+                                    href="{Text::url('logs/radius')}">Radius</a>
+                            </li>
+                            {/if}
+                            <li {if $_routes[1] eq 'message' }class="active" {/if}><a
                                     href="{Text::url('logs/message')}">Message</a></li>
-                                {$_MENU_LOGS}
-                            </ul>
-                        </li>
+                            {$_MENU_LOGS}
+                        </ul>
+                    </li>
                     {/if}
                     {$_MENU_AFTER_LOGS}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                        <li {if $_routes[1] eq 'docs' }class="active" {/if}>
-                            <a href="{if $_c['docs_clicked'] != 'yes'}{Text::url('settings/docs')}{else}{$app_url}/docs{/if}">
-                                <i class="ion ion-ios-bookmarks"></i>
-                                <span class="text">{Lang::T('Documentation')}</span>
-                                {if $_c['docs_clicked'] != 'yes'}
-                                    <span class="pull-right-container"><small
-                                            class="label pull-right bg-green">New</small></span>
-                                {/if}
-                            </a>
-                        </li>
-                        <li {if $_system_menu eq 'community' }class="active" {/if}>
-                            <a href="{Text::url('community')}">
-                                <i class="ion ion-chatboxes"></i>
-                                <span class="text">Community</span>
-                            </a>
-                        </li>
+                    <li {if $_routes[1] eq 'docs' }class="active" {/if}>
+                        <a
+                            href="{if $_c['docs_clicked'] != 'yes'}{Text::url('settings/docs')}{else}{$app_url}/docs{/if}">
+                            <i class="ion ion-ios-bookmarks"></i>
+                            <span class="text">{Lang::T('Documentation')}</span>
+                            {if $_c['docs_clicked'] != 'yes'}
+                            <span class="pull-right-container"><small
+                                    class="label pull-right bg-green">New</small></span>
+                            {/if}
+                        </a>
+                    </li>
+                    <li {if $_system_menu eq 'community' }class="active" {/if}>
+                        <a href="{Text::url('community')}">
+                            <i class="ion ion-chatboxes"></i>
+                            <span class="text">Community</span>
+                        </a>
+                    </li>
                     {/if}
                     {$_MENU_AFTER_COMMUNITY}
                 </ul>
@@ -396,11 +403,11 @@
         </aside>
 
         {if $_c['maintenance_mode'] == 1}
-            <div class="notification-top-bar">
-                <p>{Lang::T('The website is currently in maintenance mode, this means that some or all functionality may be
+        <div class="notification-top-bar">
+            <p>{Lang::T('The website is currently in maintenance mode, this means that some or all functionality may be
                 unavailable to regular users during this time.')}<small> &nbsp;&nbsp;<a
-                            href="{Text::url('settings/maintenance')}">{Lang::T('Turn Off')}</a></small></p>
-            </div>
+                        href="{Text::url('settings/maintenance')}">{Lang::T('Turn Off')}</a></small></p>
+        </div>
         {/if}
 
         <div class="content-wrapper">
@@ -412,19 +419,19 @@
 
             <section class="content">
                 {if isset($notify)}
-                    <script>
-                        // Display SweetAlert toast notification
-                        Swal.fire({
-                            icon: '{if $notify_t == "s"}success{else}error{/if}',
-                            title: '{$notify}',
-                            position: 'top-end',
-                            showConfirmButton: false,
-                            timer: 5000,
-                            timerProgressBar: true,
-                            didOpen: (toast) => {
-                                toast.addEventListener('mouseenter', Swal.stopTimer)
-                                toast.addEventListener('mouseleave', Swal.resumeTimer)
-                            }
-                        });
-                    </script>
-{/if}
\ No newline at end of file
+                <script>
+                    // Display SweetAlert toast notification
+                    Swal.fire({
+                        icon: '{if $notify_t == "s"}success{else}error{/if}',
+                        title: '{$notify}',
+                        position: 'top-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        didOpen: (toast) => {
+                            toast.addEventListener('mouseenter', Swal.stopTimer)
+                            toast.addEventListener('mouseleave', Swal.resumeTimer)
+                        }
+                    });
+                </script>
+                {/if}
\ No newline at end of file
diff --git a/ui/ui/admin/invoice/list.tpl b/ui/ui/admin/invoices/list.tpl
similarity index 97%
rename from ui/ui/admin/invoice/list.tpl
rename to ui/ui/admin/invoices/list.tpl
index 5e67724e..a2531310 100644
--- a/ui/ui/admin/invoice/list.tpl
+++ b/ui/ui/admin/invoices/list.tpl
@@ -35,7 +35,7 @@
                             <span class="label label-warning">{Lang::T('Pending')}</span>
                         {/if}
                     </td>
-                    <td>{$invoice->created_date}</td>
+                    <td>{$invoice->created_at}</td>
                     <td>{$invoice->due_date}</td>
                     <td>
                         <a href="{$app_url}/system/uploads/invoices/{$invoice->filename}" class="btn btn-primary btn-xs">{Lang::T('View')}</a>