diff --git a/account/application/views/accounts/accategories/list-childs-only.php b/account/application/views/accounts/accategories/list-childs-only.php
index 33f6570..df6d656 100644
--- a/account/application/views/accounts/accategories/list-childs-only.php
+++ b/account/application/views/accounts/accategories/list-childs-only.php
@@ -34,7 +34,7 @@
                                         <div class="form-group">
                                             <?php
                                                 // $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = "");
-                                                echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") :  $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under", "parent_category_id", "status=1", $default = "", $CSSclass = "");
+                                                echo isset($AccountCategory) ? fillComboWithValue("parent_category_id", "Under", "parent_category_id", "tbl_accategories", "accategory_name", "accategory_id", $default = $AccountCategory->parent_category_id, $CSSclass = "", $multiple = false, $condition = "status=1") :  $this->myaccounts->showFixedAccountsCategoriesCombo("parent_category_id", " Under <span style='color:#ff0000'>*</span>", "parent_category_id", "status=1", $default = "", $CSSclass = "");
                                                 
                                             ?>
                                           
@@ -77,8 +77,8 @@
                                         <!-- <th class="col-3">Category</th> -->
                                         <th class="col-3"><?php myLang("Group Name"); ?></th>
                                         <th class="col-3"><?php myLang("Under"); ?></th>
-                                        <th class="col-3"><?php myLang('Remarks');?></th>
-                                        <th class="col-2 text-center">Action</th>
+                                        <th class="col-4"><?php myLang('Remarks');?></th>
+                                        <th class="col-1 text-center">Action</th>
                                     </tr>
                                 </thead>
                                 <tbody>
diff --git a/account/application/views/accounts/accountheads/list.php b/account/application/views/accounts/accountheads/list.php
index 3021093..19414ae 100644
--- a/account/application/views/accounts/accountheads/list.php
+++ b/account/application/views/accounts/accountheads/list.php
@@ -31,7 +31,7 @@
                           <div class="form-group">
                               <?php
                               // Assuming this PHP function shows a dropdown for account categories
-                              $this->myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under", "accategory_id", "status=1", "", "select2", "required");
+                              $this->myaccounts->showAccountsCategoriesWithParentsCombo("accategory_id", "Under <span class='text-danger'>*</span>", "accategory_id", "status=1", "", "select2", "required");
                               ?>
                           </div>
                       </div>
@@ -191,7 +191,7 @@
                           echo ($TableRow->cr_opening_balance > 0) ? myCurrency($TableRow->cr_opening_balance) : ""; ?></td>
                       
                       <td class="text-center">
-                        <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-eye"></i> </a>
+                        <!-- <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-primary btn-xs" title="View"><i class="fas fa-eye"></i> </a> -->
                         <a href="<?php echo site_url("accounts/accountheads/edit/$id"); ?>" class="btn btn-info btn-xs" title="Edit"><i class="fas fa-edit"></i> </a>
                         <a onClick="javascript:doDelete(<?php echo $id; ?>);" class="btn btn-danger btn-xs" title="Delete"><i class="fas fa-trash"></i> </a>
                       </td>
diff --git a/account/application/views/accounts/balancesheet_new.php b/account/application/views/accounts/balancesheet_new.php
index a96f5c1..e944f6d 100644
--- a/account/application/views/accounts/balancesheet_new.php
+++ b/account/application/views/accounts/balancesheet_new.php
@@ -2,7 +2,6 @@
 $this->load->library("BIBAccounts");
 $BIBAccounts = new BIBAccounts();
 ?>
-
 <style>
     table,
     td,
@@ -86,34 +85,26 @@ $BIBAccounts = new BIBAccounts();
         transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
     }
 </style>
-
 <div class="content-wrapper">
-
     <section class="content">
         <div class="container-fluid">
             <div class="card card-primary card-outline">
                 <div class="card-header">
-                    <h3 class="card-title"><?php echo $pageTitle; ?> </h3>
-
+                    <h3 class="card-title mt-1"><?php echo $pageTitle; ?> </h3>
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
-
                             <!-- button with a dropdown -->
                             <div class="btn-group">
                                 <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
                                     Filters
                                 </button>
                                 <div class="dropdown-menu" role="menu">
-
-
                                     <div class="form-group p-2 pb-0">
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
                                                 <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
-
-
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
                                                 <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
@@ -121,7 +112,6 @@ $BIBAccounts = new BIBAccounts();
                                         </div>
                                         <div class="dropdown-divider"></div>
                                         <div class="form-check">
-
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
@@ -144,15 +134,16 @@ $BIBAccounts = new BIBAccounts();
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
                                 </div>
                             </div>
                             <div class="btn-group">
-                                <button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
-
-
                                 <!-- <div class="dropdown-menu" role="menu">
                 <a href="#" class="dropdown-item">Export</a>
                 <a href="#" class="dropdown-item">Pdf</a>
@@ -160,10 +151,8 @@ $BIBAccounts = new BIBAccounts();
                 <a href="#" class="dropdown-item">View calendar</a>
               </div> -->
                             </div>
-                            <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
-
+                            
                             <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
-
                         </form>
                         <script>
                             function resetForm() {
@@ -177,8 +166,6 @@ $BIBAccounts = new BIBAccounts();
                     </div>
                     <!-- /.card-tools -->
                 </div>
-
-
                 <!-- <div class="card-body">
                     <form method="post" action="" id="FilterForm">
                         <div class="row align-items-end">
@@ -214,16 +201,13 @@ $BIBAccounts = new BIBAccounts();
                             </div>
                             <div class="col">
                                 <div class="form-group d-flex justify-content-end">
-
                                     <button type="submit" class="btn btn-primary mr-2">Filter</button>
                                     <button type="submit" class="btn btn-success mr-2">Export</button>
                                     <button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
                                 </div>
                             </div>
                         </div>
-
                     </form>
-
                     <script>
                         function resetForm() {
                             document.getElementById("fromDate").value = "2078-4-1";
@@ -233,26 +217,20 @@ $BIBAccounts = new BIBAccounts();
                             document.getElementById("FilterForm").submit();
                         }
                     </script>
-
                 </div> -->
-
             </div>
         </div><!-- /.container-fluid -->
     </section>
     <div class="content">
         <div class="container-fluid">
-
             <div class="row">
                 <div class="col">
                     <!-- <button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button> -->
-                     <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
-                                                    Collapse</button>
+                    <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle
+                        Collapse</button>
                     <div class="card card-primary card-outline">
-
                         <div class="card-body p-0">
-                            
                             <?php
-
                             // echo $_POST['showClosing'];
                             $ReportOptions = array(
                                 'showZeroBalances' => false,
@@ -261,7 +239,6 @@ $BIBAccounts = new BIBAccounts();
                                 'showPeriod' => false,
                             );
                             ?>
-
                             <table class="table table-bordered">
                                 <thead>
                                     <tr>
@@ -269,10 +246,7 @@ $BIBAccounts = new BIBAccounts();
                                         <td class="group-total text-right pr-2 "><b>Amount</b></td>
                                         <td class="group-name"><b>Particulars</b></td>
                                         <td class="group-total text-right pr-2"><b>Amount</b></td>
-
-
                                     </tr>
-
                                 </thead>
                                 <tbody>
                                     <tr>
@@ -280,7 +254,6 @@ $BIBAccounts = new BIBAccounts();
                                             <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(2); ?>
                                             <?php $Side1Total = 0; ?>
                                             <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
-
                                                 <?php
                                                 // Initialize variables for column totals
                                                 $incomes_totalOpeningDr = 0;
@@ -293,7 +266,6 @@ $BIBAccounts = new BIBAccounts();
                                                 <?php foreach ($AccountGroups as $group) : ?>
                                                     <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
                                                         <td><b><?php echo $group->acgroup_name; ?></b></td>
-
                                                         <td width="20%"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
                                                     </tr>
                                                     <tr>
@@ -310,11 +282,8 @@ $BIBAccounts = new BIBAccounts();
                                                     ?>
                                                 <?php endforeach; ?>
                                             </table>
-
                                             <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(5); ?>
-
                                             <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
-
                                                 <?php
                                                 // Initialize variables for column totals
                                                 $incomes_totalOpeningDr = 0;
@@ -327,7 +296,6 @@ $BIBAccounts = new BIBAccounts();
                                                 <?php foreach ($AccountGroups as $group) : ?>
                                                     <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
                                                         <td class="group-name"><?php echo $group->acgroup_name; ?></td>
-
                                                         <td class="group-total"><?php echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
                                                     </tr>
                                                     <tr>
@@ -347,9 +315,7 @@ $BIBAccounts = new BIBAccounts();
                                         </td>
                                         <td colspan="2" class="p-0">
                                             <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(1); ?>
-
                                             <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
-
                                                 <?php
                                                 // Initialize variables for column totals
                                                 $totalOpeningDr = 0;
@@ -382,21 +348,16 @@ $BIBAccounts = new BIBAccounts();
                                                     $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
                                                     ?>
                                                 <?php endforeach; ?>
-
                                             </table>
                                         </td>
                                     </tr>
-
                                     <?php
                                     // pre($BIBAccounts->getAccountGroupsWithBalances(4));
                                     $TotalIncomes = $BIBAccounts->getAccountGroupsWithBalances(3)[0]->closing_balance;
-
                                     $TotalExpenses = $BIBAccounts->getAccountGroupsWithBalances(4)[0]->closing_balance;
-
                                     $PL = $TotalIncomes - $TotalExpenses;
                                     $Side1Total += $PL;
                                     ?>
-
                                     <tr>
                                         <td colspan="2" class="p-0">
                                             <table class="table table-bordered">
@@ -405,54 +366,36 @@ $BIBAccounts = new BIBAccounts();
                                                     <td class="cr closing-cr"><?php echo myCurrency($PL); ?></td>
                                                 </tr>
                                             </table>
-
                                         </td>
                                         <td colspan="2" class="p-0">
-
                                         </td>
                                     </tr>
-
-
                                     <tr>
                                         <td colspan="2" class="p-0">
                                             <table class="table table-bordered">
                                                 <tr>
                                                     <th>Total Amount</th>
-
                                                     <th class="cr closing-cr">
                                                         <?php echo myCurrency($Side1Total); ?>
                                                     </th>
                                                 </tr>
                                             </table>
-
                                         </td>
                                         <td colspan="2" class="p-0">
                                             <table class="table table-bordered">
                                                 <tr>
                                                     <th>Total Amount</th>
                                                     <th class="dr closing-dr">
-
                                                         <?php echo myCurrency($totalClosingDr); ?>
-
-
                                                     </th>
-
                                                 </tr>
                                             </table>
                                         </td>
                                     </tr>
-
-
                             </table>
-
                             <?php //pre($BIBAccounts->getAccountGroupsWithBalances($acgroup_id = null)); 
                             ?>
-
-
-
                         </div>
-
-
                     </div>
                 </div>
             </div>
@@ -466,11 +409,7 @@ function footerfunctions()
     <script>
         $(document).ready(function() {
             document.getElementById("toggleShowAll").click();
-
         });
-
-
-
         document.getElementById("toggleShowAll").addEventListener("click", function(e) {
             e.preventDefault();
             var nestedRows = document.getElementsByClassName("collapse");
@@ -490,27 +429,21 @@ function footerfunctions()
         function exportTableToCSV(filename) {
             var csv = [];
             var rows = document.querySelectorAll("table tr:not(.hide)");
-
             for (var i = 0; i < rows.length; i++) {
                 var row = [];
                 var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
-
                 // Check if the parent row is collapsed or hidden
                 var parentRow = rows[i].closest(".collapse");
                 var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
-
                 if (isParentCollapsed) {
                     continue; // Skip child table rows if parent is collapsed
                 }
-
                 for (var j = 0; j < cols.length; j++) {
                     var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
                     row.push(cellValue);
                 }
-
                 csv.push(row.join(","));
             }
-
             // Create a CSV file
             var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
             var encodedUri = encodeURI(csvContent);
@@ -521,6 +454,5 @@ function footerfunctions()
             link.click();
         }
     </script>
-
 <?php
 }
diff --git a/account/application/views/accounts/cash_flow.php b/account/application/views/accounts/cash_flow.php
index 2e5c97d..9ef57c8 100644
--- a/account/application/views/accounts/cash_flow.php
+++ b/account/application/views/accounts/cash_flow.php
@@ -103,7 +103,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
         <div class="container-fluid">
             <div class="card card-primary card-outline">
                 <div class="card-header ">
-                    <h3 class="card-title">Cash Flow<?php //echo $pageTitle; 
+                    <h3 class="card-title mt-1">Cash Flow<?php //echo $pageTitle; 
                                                     ?> </h3>
 
                     <div class="card-tools">
@@ -155,11 +155,14 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
                                 </div>
                             </div>
                             <div class="btn-group">
-                                <button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
 
@@ -171,7 +174,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
                 <a href="#" class="dropdown-item">View calendar</a>
               </div> -->
                             </div>
-                            <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
+                            <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
 
                             <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
 
diff --git a/account/application/views/accounts/ledger_bankbook.php b/account/application/views/accounts/ledger_bankbook.php
index 2e653dd..ea98834 100644
--- a/account/application/views/accounts/ledger_bankbook.php
+++ b/account/application/views/accounts/ledger_bankbook.php
@@ -5,7 +5,80 @@
                 <div class="col">
                     <div class="card card-primary card-outline ">
                         <div class="card-header bg-primary disabled color-palette">
-                            <h3 class="card-title"><?php echo $pageTitle; ?> </h3>
+                            <h3 class="card-title mt-1"><?php echo $pageTitle; ?> </h3>
+                            <div class="card-tools">
+                        <form method="post" action="" id="FilterForm">
+                            <!-- button with a dropdown -->
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
+                                    Filters
+                                </button>
+                                <div class="dropdown-menu" role="menu">
+                                    <div class="form-group p-2 pb-0">
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="fromDate"><?php myLang("Starting Period"); ?></label>
+                                                <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                            </div>
+                                            <div class="form-group">
+                                                <label for="toDate"><?php myLang("Ending Period"); ?></label>
+                                                <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                            </div>
+                                        </div>
+                                        <div class="dropdown-divider"></div>
+                                        <div class="form-check">
+                                            <input class="form-check-input" type="checkbox">
+                                            <label class="form-check-label">Select
+                                                All</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <input type="hidden" name="showOB" value="not">
+                                            <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
+                                            <!-- <input class="form-check-input" type="checkbox"> -->
+                                            <label class="form-check-label">Opening</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <!-- <input class="form-check-input" type="checkbox"> -->
+                                            <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
+                                            <label class="form-check-label">Closing</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <!-- <input class="form-check-input" type="checkbox" checked> -->
+                                            <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
+                                            <label class="form-check-label">Period</label>
+                                        </div>
+                                    </div>
+                                    <div class="dropdown-divider"></div>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="btn-group">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
+                                    Export
+                                </button>
+                                <!-- <div class="dropdown-menu" role="menu">
+                                            <a href="#" class="dropdown-item">Export</a>
+                                            <a href="#" class="dropdown-item">Pdf</a>
+                                            <div class="dropdown-divider"></div>
+                                            <a href="#" class="dropdown-item">View calendar</a>
+                                          </div> -->
+                            </div>
+                           
+                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+                        </form>
+                        <script>
+                            function resetForm() {
+                                document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
+                                document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
+                                document.getElementById("showOB").checked = <?php echo  "false"; ?>;
+                                document.getElementById("showClosing").checked = <?php echo  "false"; ?>;
+                                document.getElementById("FilterForm").submit();
+                            }
+                        </script>
+                    </div>
                         </div>
                         <div class="card-body">
                             <div class="row">
@@ -35,7 +108,7 @@
                                         $html = "";
                                         $html .= "<table class='table table-bordered table-striped longdataTable'>";
                                         $html .= "<thead>";
-                                        $html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Action</th></tr>";
+                                        $html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center '>Action</th></tr>";
                                         $html .= "</thead><tbody>";
                                         $sn = 0;
                                         $BalanceTotal = 0;
@@ -43,7 +116,7 @@
                                             $balance = getBalance($Account->account_id);
                                             $BalanceTotal += $balance;
                                             // pre($Account);
-                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-2 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
+                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
                                         endforeach;
                                         $html .= "</tbody><tfoot>";
                                         $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";
diff --git a/account/application/views/accounts/ledger_cashbook.php b/account/application/views/accounts/ledger_cashbook.php
index 9941cce..0c13c56 100644
--- a/account/application/views/accounts/ledger_cashbook.php
+++ b/account/application/views/accounts/ledger_cashbook.php
@@ -6,6 +6,79 @@
                     <div class="card card-primary card-outline ">
                         <div class="card-header bg-primary disabled color-palette">
                             <h3 class="card-title"><?php echo $pageTitle; ?> </h3>
+                            <div class="card-tools">
+                        <form method="post" action="" id="FilterForm">
+                            <!-- button with a dropdown -->
+                            <div class="btn-group">
+                                <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
+                                    Filters
+                                </button>
+                                <div class="dropdown-menu" role="menu">
+                                    <div class="form-group p-2 pb-0">
+                                        <div class="col">
+                                            <div class="form-group">
+                                                <label for="fromDate"><?php myLang("Starting Period"); ?></label>
+                                                <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
+                                            </div>
+                                            <div class="form-group">
+                                                <label for="toDate"><?php myLang("Ending Period"); ?></label>
+                                                <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
+                                            </div>
+                                        </div>
+                                        <div class="dropdown-divider"></div>
+                                        <div class="form-check">
+                                            <input class="form-check-input" type="checkbox">
+                                            <label class="form-check-label">Select
+                                                All</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <input type="hidden" name="showOB" value="not">
+                                            <input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
+                                            <!-- <input class="form-check-input" type="checkbox"> -->
+                                            <label class="form-check-label">Opening</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <!-- <input class="form-check-input" type="checkbox"> -->
+                                            <input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
+                                            <label class="form-check-label">Closing</label>
+                                        </div>
+                                        <div class="form-check">
+                                            <!-- <input class="form-check-input" type="checkbox" checked> -->
+                                            <input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
+                                            <label class="form-check-label">Period</label>
+                                        </div>
+                                    </div>
+                                    <div class="dropdown-divider"></div>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="btn-group">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
+                                    Export
+                                </button>
+                                <!-- <div class="dropdown-menu" role="menu">
+                                            <a href="#" class="dropdown-item">Export</a>
+                                            <a href="#" class="dropdown-item">Pdf</a>
+                                            <div class="dropdown-divider"></div>
+                                            <a href="#" class="dropdown-item">View calendar</a>
+                                          </div> -->
+                            </div>
+                           
+                            <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
+                        </form>
+                        <script>
+                            function resetForm() {
+                                document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
+                                document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
+                                document.getElementById("showOB").checked = <?php echo  "false"; ?>;
+                                document.getElementById("showClosing").checked = <?php echo  "false"; ?>;
+                                document.getElementById("FilterForm").submit();
+                            }
+                        </script>
+                    </div>
                         </div>
                         <div class="card-body">
                             <div class="row">
@@ -16,12 +89,12 @@
                                         <?php
                                         $accategory_id = 3;
                                         $CI = &get_instance();
-                                       
+
                                         // $CI->db->where("status", 1)->where("(accategory_id = 2 OR accategory_id = 3)");
                                         $CI->db->where("status", 1)->where("accategory_id = 3");
                                         $CI->db->order_by("account_name ASC");
                                         $Accounts = $CI->db->get("tbl_accounts")->result();
-                                       
+
                                         foreach ($Accounts as $Account) {
                                             $Account->Group = $CI->db->query("select * from tbl_acgroups where acgroup_id=(select acgroup_id from tbl_accategories where accategory_id = $Account->accategory_id)")->row();
                                             $Account->Category = $CI->db->query("select * from tbl_accategories where accategory_id = $Account->accategory_id")->row();
@@ -36,7 +109,7 @@
                                         $html = "";
                                         $html .= "<table class='table table-bordered table-striped longdataTable'>";
                                         $html .= "<thead>";
-                                        $html .= "<tr><th class='text-center'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'>Action</th></tr>";
+                                        $html .= "<tr><th class='text-center' width='25'>Sn</th><th class='text-center'>Account</th><th class='text-center'>Account Group</th><th class='text-center'>Dr</th><th class='text-center'>Cr</th><th class='text-center'  width='25'>Action</th></tr>";
                                         $html .= "</thead><tbody>";
                                         $sn = 0;
                                         $BalanceTotal = 0;
@@ -44,7 +117,7 @@
                                             $balance = getBalance($Account->account_id);
                                             $BalanceTotal += $balance;
                                             // pre($Account);
-                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-2 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
+                                            $html .= "<tr><td class='col-1 text-center'>" . $sn . "</td><td>" . $Account->account_name . "</td><td class='col-2'>" . $Account->Category->accategory_name . "</td><td class='col-1'>" . (($balance >= 0) ? myCurrency($balance) : "") . "</td><td class='col-1'>" . (($balance < 0) ? myCurrency(abs($balance)) : "") . "</td><td class='col-1 text-center'><a title='Show Ledger' class='btn btn-info btn-xs ' onClick='showLedger(" . $Account->account_id . ")'><i class='fa fa-eye'></i></a></td></tr>";
                                         endforeach;
                                         $html .= "</tbody><tfoot>";
                                         $html .= "<tr><th colspan=3 class='text-right'>Total</th><th class='text-right'>" . myCurrency($BalanceTotal) . "</th><th></th><th></th></tr>";
diff --git a/account/application/views/accounts/pl_new.php b/account/application/views/accounts/pl_new.php
index 426d1fd..9897212 100644
--- a/account/application/views/accounts/pl_new.php
+++ b/account/application/views/accounts/pl_new.php
@@ -4,7 +4,6 @@ $BIBAccounts = new BIBAccounts();
 ?>
 <!-- Include jQuery -->
 <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-
 <!-- Include jQuery UI -->
 <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
 <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
@@ -90,36 +89,27 @@ $BIBAccounts = new BIBAccounts();
         transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
     }
 </style>
-
-
 <div class="content-wrapper">
     <div class="content">
         <div class="container-fluid">
             <div class="card card-primary card-outline ">
-
-
                 <div class="card-header">
-                    <h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
-
+                    <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); 
+                                                                        ?></h2>
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
-
                             <!-- button with a dropdown -->
                             <div class="btn-group">
                                 <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
                                     Filters
                                 </button>
                                 <div class="dropdown-menu" role="menu">
-
-
                                     <div class="form-group p-2 pb-0">
                                         <div class="col">
                                             <div class="form-group">
                                                 <label for="fromDate"><?php myLang("Starting Period"); ?></label>
                                                 <input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
                                             </div>
-
-
                                             <div class="form-group">
                                                 <label for="toDate"><?php myLang("Ending Period"); ?></label>
                                                 <input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
@@ -127,7 +117,6 @@ $BIBAccounts = new BIBAccounts();
                                         </div>
                                         <div class="dropdown-divider"></div>
                                         <div class="form-check">
-
                                             <input class="form-check-input" type="checkbox">
                                             <label class="form-check-label">Select
                                                 All</label>
@@ -150,15 +139,16 @@ $BIBAccounts = new BIBAccounts();
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
                                 </div>
                             </div>
                             <div class="btn-group">
-                                <button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                <button type="submit" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
-
-
                                 <!-- <div class="dropdown-menu" role="menu">
                                             <a href="#" class="dropdown-item">Export</a>
                                             <a href="#" class="dropdown-item">Pdf</a>
@@ -166,10 +156,8 @@ $BIBAccounts = new BIBAccounts();
                                             <a href="#" class="dropdown-item">View calendar</a>
                                           </div> -->
                             </div>
-                            <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
-
+                           
                             <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
-
                         </form>
                         <script>
                             function resetForm() {
@@ -185,18 +173,14 @@ $BIBAccounts = new BIBAccounts();
             </div>
         </div>
     </div>
-
     <div class="content">
         <div class="container-fluid">
             <div class="row">
                 <div class="col">
                     <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
                     <div class="card card-primary card-outline ">
-
                         <div class="card-body p-0">
-
                             <?php
-
                             // echo $_POST['showClosing'];
                             $ReportOptions = array(
                                 'showZeroBalances' => false,
@@ -213,18 +197,13 @@ $BIBAccounts = new BIBAccounts();
                                         <th class="group-total text-center" width="10%">Amount</th>
                                         <th class="group-name" width="85%">Particulars</th>
                                         <th class="group-total text-center" width="15%">Amount</th>
-
-
                                     </tr>
-
                                 </thead>
                                 <tbody>
                                     <tr>
                                         <td colspan="2" class="p-0">
                                             <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(3); ?>
-
                                             <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
-
                                                 <?php
                                                 // Initialize variables for column totals
                                                 $incomes_totalOpeningDr = 0;
@@ -238,7 +217,6 @@ $BIBAccounts = new BIBAccounts();
                                                     <tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
                                                         <td class="group-name"><b><?php //echo $group->acgroup_name; 
                                                                                     ?></b></td>
-
                                                         <td class="group-total text-right"><?php //echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); 
                                                                                             ?></td>
                                                     </tr>
@@ -247,7 +225,6 @@ $BIBAccounts = new BIBAccounts();
                                                             <div id="group_<?php echo $group->acgroup_id; ?>" class="collapse">
                                                                 <?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
                                                                 <?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
-
                                                             </div>
                                                         </td>
                                                     </tr>
@@ -265,9 +242,7 @@ $BIBAccounts = new BIBAccounts();
                                         </td>
                                         <td colspan="2" class="p-0">
                                             <?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(4); ?>
-
                                             <table class="table table-bordered vertical-borders" id="TrialBalanceTable">
-
                                                 <?php
                                                 // Initialize variables for column totals
                                                 $totalOpeningDr = 0;
@@ -303,17 +278,13 @@ $BIBAccounts = new BIBAccounts();
                                                     $totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
                                                     ?>
                                                 <?php endforeach; ?>
-
                                             </table>
                                         </td>
                                     </tr>
-
                                     <?php $PL = $incomes_totalClosingCr - $totalClosingDr; ?>
                                     <?php if ($incomes_totalClosingCr > $totalClosingDr) : ?>
                                         <tr>
                                             <td colspan="2" width="15%">
-
-
                                             </td>
                                             <td colspan="2" class="p-0">
                                                 <table class="table table-bordered">
@@ -333,10 +304,8 @@ $BIBAccounts = new BIBAccounts();
                                                         <th class="cr closing-cr"><?php echo myCurrency(abs($PL)); ?></th>
                                                     </tr>
                                                 </table>
-
                                             </td>
                                             <td colspan="2">
-
                                             </td>
                                         </tr>
                                     <?php endif; ?>
@@ -345,7 +314,6 @@ $BIBAccounts = new BIBAccounts();
                                             <table class="table table-bordered">
                                                 <tr>
                                                     <th>Total Incomes</th>
-
                                                     <th class="cr closing-cr">
                                                         <?php if ($PL > 0) : ?>
                                                             <?php echo myCurrency($incomes_totalClosingCr); ?>
@@ -355,7 +323,6 @@ $BIBAccounts = new BIBAccounts();
                                                     </th>
                                                 </tr>
                                             </table>
-
                                         </td>
                                         <td colspan="2" class="p-0">
                                             <table class="table table-bordered">
@@ -367,23 +334,13 @@ $BIBAccounts = new BIBAccounts();
                                                         <?php else : ?>
                                                             <?php echo myCurrency($totalClosingDr); ?>
                                                         <?php endif; ?>
-
                                                     </th>
-
                                                 </tr>
                                             </table>
                                         </td>
                                     </tr>
-
-
                             </table>
-
-
-
-
                         </div>
-
-
                     </div>
                 </div>
             </div>
@@ -418,27 +375,21 @@ function footerfunctions()
         function exportTableToCSV(filename) {
             var csv = [];
             var rows = document.querySelectorAll("table tr:not(.hide)");
-
             for (var i = 0; i < rows.length; i++) {
                 var row = [];
                 var cols = rows[i].querySelectorAll("td:not(.hide), th:not(.hide)");
-
                 // Check if the parent row is collapsed or hidden
                 var parentRow = rows[i].closest(".collapse");
                 var isParentCollapsed = parentRow && (!parentRow.classList.contains("show"));
-
                 if (isParentCollapsed) {
                     continue; // Skip child table rows if parent is collapsed
                 }
-
                 for (var j = 0; j < cols.length; j++) {
                     var cellValue = cols[j].innerText.replace(/,/g, ""); // Remove commas from the cell value
                     row.push(cellValue);
                 }
-
                 csv.push(row.join(","));
             }
-
             // Create a CSV file
             var csvContent = "data:text/csv;charset=utf-8," + csv.join("\n");
             var encodedUri = encodeURI(csvContent);
@@ -449,6 +400,5 @@ function footerfunctions()
             link.click();
         }
     </script>
-
 <?php
 }
diff --git a/account/application/views/accounts/receipt_and_payment.php b/account/application/views/accounts/receipt_and_payment.php
index 4f1a00e..b535004 100644
--- a/account/application/views/accounts/receipt_and_payment.php
+++ b/account/application/views/accounts/receipt_and_payment.php
@@ -91,6 +91,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
         box-shadow: inset 0 0 0 transparent;
         transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
     }
+    .table.table-head-fixed thead tr:nth-child(1) th{
+        padding-left: 6px;;
+    }
 </style>
 
 
@@ -104,7 +107,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
             <div class="card card-primary card-outline ">
 
                 <div class="card-header">
-                    <h3 class="card-title">Receipts And Payments <?php //echo $pageTitle; 
+                    <h3 class="card-title mt-1">Receipts And Payments <?php //echo $pageTitle; 
                                                                     ?> </h3>
 
                     <div class="card-tools">
@@ -156,7 +159,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
                                 </div>
                             </div>
                             <div class="btn-group">
@@ -172,7 +178,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
                 <a href="#" class="dropdown-item">View calendar</a>
               </div> -->
                             </div>
-                            <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
+                            <!-- <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button> -->
 
                             <!-- <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button> -->
 
@@ -259,10 +265,10 @@ $PL = $IncomesTotal - $ExpensesTotal;
                             <tr>
                                 <th class="" width="35%"><?php myLang("Receipts"); ?></th>
                                 <th class="text-right" width="15%"></th>
-                                <th class="text-right" width="15%"><?php myLang("Amount"); ?></th>
+                                <th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th>
                                 <th class="" width="35%"><?php echo myLang("Payments"); ?></th>
                                 <th class="text-right" width="15%"></th>
-                                <th class="text-right" width="15%"><?php myLang("Amount"); ?></th>
+                                <th class="text-right pr-2" width="15%"><?php myLang("Amount"); ?></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -282,15 +288,15 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                             <?php elseif ($Incomes['account'] == "CATEGORY TOTAL") : ?>
                                                 <tr>
                                                     <td class="" width="70%"><b><?php echo $Incomes['category']; ?></b></td>
-                                                    <td class="text-right" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
                                                     <td width="15%"></td>
                                                 </tr>
                                             <?php else : ?>
                                                 <?php $total1 += $Incomes['amount']; ?>
                                                 <tr>
-                                                    <td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
+                                                    <td class="pr-2" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Incomes['account']; ?></td>
                                                     <td width="15%"></td>
-                                                    <td class="text-right" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Incomes['amount']); ?></td>
 
                                                 </tr>
                                             <?php endif; ?>
@@ -313,8 +319,8 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                                 </tr-->
                                             <?php elseif ($Expenses['account'] == "CATEGORY TOTAL") : ?>
                                                 <tr>
-                                                    <td class="" width="70%"><b><?php echo $Expenses['category']; ?></b></td>
-                                                    <td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
+                                                    <td class="pr-2" width="70%"><b><?php echo $Expenses['category']; ?></b></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
                                                     <td width="15%"></td>
 
                                                 </tr>
@@ -324,7 +330,7 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                                 <tr>
                                                     <td class="" width="70%">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $Expenses['account']; ?></td>
                                                     <td width="15%"></td>
-                                                    <td class="text-right" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
+                                                    <td class="text-right pr-2" width="15%"><?php echo myCurrency($Expenses['amount']); ?></td>
 
 
                                                 </tr>
@@ -340,9 +346,9 @@ $PL = $IncomesTotal - $ExpensesTotal;
                             <?php $balance_fi = $total1 - $total; ?>
                             <?php if ($balance_fi < 0) :  $total1 += $balance_fi; ?>
                                 <tr>
-                                    <th><?php echo myLang("Closing Balance"); ?></th>
+                                    <th class="pl-2"><?php echo myLang("Closing Balance"); ?></th>
                                     <th></th>
-                                    <td><span class="text-red"><?php echo myCurrency($balance_fi); ?></span></td>
+                                    <td><span class="text-red pr-2"><?php echo myCurrency($balance_fi); ?></span></td>
                                     <th></th>
                                     <th></th>
                                     <td></td>
@@ -352,20 +358,20 @@ $PL = $IncomesTotal - $ExpensesTotal;
                                     <th></th>
                                     <th></th>
                                     <td></td>
-                                    <th><?php echo myLang("Closing Balance"); ?></th>
+                                    <th class="pl-2"><?php echo myLang("Closing Balance"); ?></th>
                                     <th></th>
-                                    <td><?php echo myCurrency($balance_fi); ?></td>
+                                    <td class="pr-2"><?php echo myCurrency($balance_fi); ?></td>
                                 </tr>
 
                             <?php endif; ?>
 
                             <tr>
-                                <th>Total</th>
+                                <th class="pl-2">Total</th>
                                 <th></th>
-                                <td><?php echo myCurrency($total1); ?></td>
-                                <th>Total</th>
+                                <td class="pr-2"><?php echo myCurrency($total1); ?></td>
+                                <th class="pl-2">Total</th>
                                 <th></th>
-                                <td><?php echo myCurrency($total); ?></td>
+                                <td class="pr-2"><?php echo myCurrency($total); ?></td>
                             </tr>
                         </tbody>
 
diff --git a/account/application/views/accounts/setup/singleentryvoucher/list.php b/account/application/views/accounts/setup/singleentryvoucher/list.php
index 4f5619c..1df38c6 100644
--- a/account/application/views/accounts/setup/singleentryvoucher/list.php
+++ b/account/application/views/accounts/setup/singleentryvoucher/list.php
@@ -37,12 +37,12 @@
               <table class="table table-bordered table-striped dataTable">
                 <thead>
                   <tr>
-                    <th>Sn</th>
-                    <th>Voucher Name</th>
-                    <th>Default Debits</th>
-                    <th>Default Credits</th>
-                    <th>Voucher Color</th>
-                    <th class="table-col col-2">Action</th>
+                    <th >Sn</th>
+                    <th class="col-2">Voucher Name</th>
+                    <th class="col-4">Default Debits</th>
+                    <th class="col-4">Default Credits</th>
+                    <th class="col-1 text-center">Voucher Color</th>
+                    <th class="table-col col-1 text-center">Action</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -57,8 +57,8 @@
                       <td><?php echo showAccountCategoriesByIds(($TableRow->default_credits!="")?explode(",",$TableRow->default_credits):array()); ?></td>
 
 
-                      <td><span class="inline-block" style="padding:0px 8px;border:1px solid <?php echo $TableRow->voucher_color; ?>;background:<?php echo $TableRow->voucher_color; ?>">&nbsp;</span> </td>
-                      <td>
+                      <td class="text-center"><span class="inline-block " style="padding:0px 8px;text-align:center;border:1px solid <?php echo $TableRow->voucher_color; ?>;background:<?php echo $TableRow->voucher_color; ?>">&nbsp;</span> </td>
+                      <td class="text-center">
                         <?php showEditButton($commandURL = "accounts/setup/editvouchertype/" . $TableRow->vouchertype_id , "Edit", ""); ?>
 
                       </td>
diff --git a/account/application/views/accounts/trialbalance_new.php b/account/application/views/accounts/trialbalance_new.php
index 38ac939..0e8de24 100644
--- a/account/application/views/accounts/trialbalance_new.php
+++ b/account/application/views/accounts/trialbalance_new.php
@@ -94,7 +94,7 @@ $BIBAccounts = new BIBAccounts();
         <div class="container-fluid">
             <div class="card card-primary card-outline">
                 <div class="card-header">
-                    <h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
+                    <h2 class="card-title mt-1"><?php echo $pageTitle; ?> <?php //myLang("Report"); ?></h2>
 
                     <div class="card-tools">
                         <form method="post" action="" id="FilterForm">
@@ -145,11 +145,14 @@ $BIBAccounts = new BIBAccounts();
                                         </div>
                                     </div>
                                     <div class="dropdown-divider"></div>
-                                    <button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
+                                    <div class="form-group p-2 pb-0">
+                                    <button type="button" class="btn btn-info btn-sm " onclick="resetForm()">Reset</button>
+                                    <button type="submit" class="btn btn-primary mr-2 btn-sm text-center">Search </button>
+                                    </div>
                                 </div>
                             </div>
                             <div class="btn-group">
-                                <button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                <button type="submit" class="btn btn-warning btn-sm" data-toggle="dropdown" data-offset="-52">
                                     Export
                                 </button>
 
@@ -161,7 +164,7 @@ $BIBAccounts = new BIBAccounts();
                                             <a href="#" class="dropdown-item">View calendar</a>
                                           </div> -->
                             </div>
-                            <button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
+                            <!-- <button type="button" class="btn btn-info btn-sm" onclick="resetForm()">Reset</button> -->
 
                             <button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
 
diff --git a/account/application/views/accounts/vouchers/contra/list.php b/account/application/views/accounts/vouchers/contra/list.php
index efd6525..9e1282e 100644
--- a/account/application/views/accounts/vouchers/contra/list.php
+++ b/account/application/views/accounts/vouchers/contra/list.php
@@ -1,121 +1,82 @@
 <div class="content-wrapper">
-
     <div class="content-header">
-
         <div class="container-fluid">
-
             <div class="row mb-2">
-
                 <div class="col-sm-6">
-
-
                     <h1 class="m-0">
                         <?php echo $pageTitle; ?></h1>
                 </div>
                 <div class="col-sm-6">
-
                     <ol class="breadcrumb float-sm-right">
-
-
                         <li class="breadcrumb-item">
                             <a href="<?php echo base_url(); ?>">
                                 Dashboard</a>
                         </li>
                         <li class="breadcrumb-item active">
                             <?php echo $pageTitle; ?></li>
-
                     </ol>
                 </div>
             </div>
         </div>
     </div>
     <div class="content">
-
         <div class="container-fluid">
-
             <div class="row">
-
                 <div class="col">
-
-
                     <div class="card card-primary card-outline">
-
                         <div class="card-header">
-
-
                             <h5 class="m-0">
                                 <?php echo $pageTitle; ?> <a href="<?php echo site_url("accounts/vouchers/" . $VoucherType->voucher_alias . "/create"); ?>" class="btn btn-sm btn-primary float-right">
                                     Create New <?php echo $pageTitle; ?></a></h5>
-
                         </div>
-
                         <div class="card-body">
-
-
                             <?php $TableData = $Vouchers ?>
-
                             <table class="table table-bordered table-striped" id="voucherList">
-
                                 <thead>
                                     <tr>
                                         <th>ID#</th>
                                         <th>Voucher No</th>
                                         <th>Voucher Date</th>
-
                                         <th>Voucher Type</th>
                                         <th>Voucher State</th>
-
                                         <th class="table-col col-2">Action</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <?php $a=0; foreach ($TableData as $TableRow) : $a++; ?>
+                                    <?php $a = 0;
+                                    foreach ($TableData as $TableRow) : $a++; ?>
                                         <?php foreach ($TableRow as $cols) : $id = $cols;
                                             break;
                                         endforeach; ?><tr data-id="<?php echo $TableRow->voucher_id; ?>" class="<?php echo ($TableRow->voucher_state == "Reversed") ? "table-danger" : ""; ?>">
-
                                             <td><?php echo $TableRow->voucher_id; ?></td>
                                             <td><?php echo $TableRow->voucher_no; ?></td>
-
                                             <td><?php echo $TableRow->voucher_date; ?></td>
-
                                             <td><?php echo $TableRow->voucher_type; ?></td>
                                             <td><?php echo $TableRow->voucher_state; ?></td>
-
                                             <td class="col-1">
-
                                                 <a onClick="javascript:showDetails(<?php echo $id; ?>);" class="btn btn-success btn-xs" title="View Details">
                                                     <i class="fa fa-eye">
                                                     </i></a>
-
                                             </td>
                                         </tr>
-
                                     <?php endforeach; ?>
                                 <tbody>
                             </table>
                             <div class="modal fade" id="voucherdetails_box" tabindex="-1" role="dialog" aria-labelledby="voucherdetails_box" aria-hidden="true">
-
                                 <div class="modal-dialog modal-xl" role="document">
-
                                     <div class="modal-content">
-
                                         <div class="modal-header">
-
                                             <h5 class="modal-title" id="exampleModalLabel">
                                                 Voucher Details</h5>
                                             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-
                                                 <span aria-hidden="true">
                                                     &times;</span>
                                             </button>
                                         </div>
                                         <div class="modal-body" id="details_container">
-
                                             Voucher Details Goes Here
                                         </div>
                                         <div class="modal-footer">
-
                                             <button type="button" onClick='reversalEntry()' id="reversalBtn" class="btn btn-secondary" data-dismiss="modal" data-id="">
                                                 Revarsal Entry</button>
                                             <button type="button" class="btn btn-secondary" data-dismiss="modal">
@@ -138,7 +99,6 @@
 
                                 function reversalEntry() {
                                     var id = $("#reversalBtn").data("id");
-
                                     if (confirm("Are you sure you want to post reversal for this voucher?")) {
                                         window.location = "<?php echo site_url("accounts/vouchers/reversal/"); ?>" + id;
                                     }
@@ -158,7 +118,6 @@ function footerfunctions()
     <script>
         $(document).ready(function() {
             var table = $('#voucherList').DataTable();
-
             var tableRows = $('table#voucherList tbody').find('tr');
             tableRows.each(function() {
                 async: false;
@@ -169,8 +128,6 @@ function footerfunctions()
                 Transactions = getVoucherDetails(id);
                 row.child(Transactions).show();
             });
-
-
         });
 
         function getVoucherDetails(id) {
diff --git a/account/application/views/accounts/vouchers/create.php b/account/application/views/accounts/vouchers/create.php
index ad8ff49..b78bafb 100644
--- a/account/application/views/accounts/vouchers/create.php
+++ b/account/application/views/accounts/vouchers/create.php
@@ -81,7 +81,7 @@ button:hover {
             <div class="row">
                 <div class="col">
                     <div class="card card-primary card-outline">
-                        <!-- <div class="card-header" style="background-color: <?php echo $VoucherType->voucher_color; ?>;">
+                        <!-- <div class="card-header" style="background-color: <?php //echo $VoucherType->voucher_color; ?>;">
                             <h5 class="m-0">
                                 <?php //echo $pageTitle; 
                                 ?>  
diff --git a/account/application/views/includes/sidebar.php b/account/application/views/includes/sidebar.php
index 2a7ab14..b8a64ad 100644
--- a/account/application/views/includes/sidebar.php
+++ b/account/application/views/includes/sidebar.php
@@ -4,7 +4,6 @@ $param = $this->uri->segment(2);
 $subparam = $this->uri->segment(3);
 $subparam2 = $this->uri->segment(4);
 ?>
-
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar main-sidebar-custom sidebar-dark-primary elevation-4">
   <!-- Brand Logo --> <a href="<?php echo base_url(); ?>" class="brand-link"> <img src="<?php echo base_url(); ?>dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3" style="opacity: .8"> <span class="brand-text font-weight-light">
@@ -16,7 +15,6 @@ $subparam2 = $this->uri->segment(4);
     <div class="user-panel mt-3 pb-3 mb-3 d-flex">
       <div class="image"> <img src="<?php echo base_url(); ?>dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image"> </div>
       <div class="info"> <a href="#" class="d-block"><?php echo $this->session->userdata("CompanyName"); ?> (<?php echo ($this->session->userdata("FiscalYear")->fiscalyear_year); ?>)</a></div>
-
     </div> <!-- SidebarSearch Form -->
     <div class="form-inline pb-2">
       <div class="input-group" data-widget="sidebar-search">
@@ -74,7 +72,7 @@ $subparam2 = $this->uri->segment(4);
             <?php if ($LoggedUser == "admin") : ?>
               <?php //showMenu("Create New Ledger", "accounts/accountheads/add"); 
               ?>
-              <?php showMenu("List of Ledgers", "accounts/accountheads/list"); ?>
+              <?php showMenu("Ledgers", "accounts/accountheads/list"); ?>
             <?php endif; ?>
           </ul>
         </li>
@@ -140,7 +138,6 @@ $subparam2 = $this->uri->segment(4);
             <?php if ($LoggedUser == "admin") :
               // showMenu("Inventory Stock", "inventory/stocks/list");
               showMenu("Stock Report", "inventory/stocks/summary");
-
               showMenu("Sales Register", "inventory/sales/sales_register");
               showMenu("Purchase Register", "inventory/purchases/purchase_register");
               showMenu("Purchase Vs Sales", "inventory/reports/purchase_vs_sales");
@@ -163,7 +160,7 @@ $subparam2 = $this->uri->segment(4);
               showMenu("Profit and Loss Statement", "accounts/reports/pl");
               showMenu("Balance Sheet", "accounts/reports/balance_sheet");
               // showMenu("Balance Sheet (Vertical)", "accounts/reports/balance_sheet_vertical");
-              showMenu("Receipt And Payments", "accounts/reports/receipt_and_payment");
+              showMenu("Receipt And Payment", "accounts/reports/receipt_and_payment");
               // showMenu("Income And Expenses", "accounts/reports/incomes_and_expenses");
               showMenu("Cash Flow", "accounts/reports/cash_flow");
               showMenu("Ratio Analysis", "accounts/reports/ratio_analysis");
@@ -189,7 +186,6 @@ $subparam2 = $this->uri->segment(4);
               // showMenu("Group Summary", "accounts/ledger/partyledger");
               showMenu("Group Summary", "accounts/reports/balance_by_group");
               // showMenu("Balance by Category", "accounts/reports/balance_by_category");
-
               showMenu("Accounts Receivables", "accounts/ledger/receiveables");
               showMenu("Accounts Payables", "accounts/ledger/payables");
               showMenu("Purchase Summary", "inventory/purchases/list");
diff --git a/account/application/views/inventory/items/list.php b/account/application/views/inventory/items/list.php
index 07f73ae..8481109 100644
--- a/account/application/views/inventory/items/list.php
+++ b/account/application/views/inventory/items/list.php
@@ -38,7 +38,7 @@
                                     <!--COL START-->
                                     <div class="col-6">
                                         <div class="form-group">
-                                            <?php fillComboWithValue("units_id", "Units", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '',); ?>
+                                            <?php fillComboWithValue("units_id", "Units <span class='text-danger'>*</span>", "units_id", "tbl_units", "title", "unit_id", isset($item) ? $item->units_id : '',); ?>
                                         </div>
                                     </div>
                                     <!--COL END-->
@@ -47,7 +47,7 @@
                                     <!--COL START-->
                                     <div class="col">
                                         <div class="form-group">
-                                            <?php fillComboWithValue("itemcategories_id", "Group", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : ''); ?>
+                                            <?php fillComboWithValue("itemcategories_id", "Group <span class='text-danger'>*</span>", "itemcategories_id", "tbl_itemcategories", "title", "itemcategory_id", isset($item) ? $item->itemcategories_id : ''); ?>
                                         </div>
                                     </div>
                                     <!--COL END-->
diff --git a/account/application/views/inventory/stocks/summary.php b/account/application/views/inventory/stocks/summary.php
index b6eef8b..c8e0fda 100644
--- a/account/application/views/inventory/stocks/summary.php
+++ b/account/application/views/inventory/stocks/summary.php
@@ -159,7 +159,7 @@
                                     </div>
                                 </div>
                                 <div class="btn-group">
-                                    <button type="button" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
+                                    <button type="button" class="btn btn-warning btn-sm " data-toggle="dropdown" data-offset="-52">
                                         Export
                                     </button>
                                     <!-- <div class="dropdown-menu" role="menu">
@@ -177,6 +177,7 @@
                             <table class="table table-bordered table-striped dataTable">
                                 <thead>
                                     <tr>
+                                    <th rowspan="2" width="40"><?php myLang('S.No.'); ?></th>
                                         <th rowspan="2"><?php myLang('Item'); ?></th>
 
                                         <th rowspan="2" width="80"><?php myLang('Units'); ?></th>
@@ -210,7 +211,7 @@
                                     <?php $Total = 0;$PTotal=0;$STotal=0;$CTotal=0;
                                     foreach ($StockRecords as $TableRow) :  ?>
                                         <tr>
-
+<td></td>
                                             <td><?php echo ($TableRow->Item)?$TableRow->Item->title:"N/A"; ?></td>
                                             <td><?php echo getFieldfromValue("tbl_units", "title", "unit_id", $TableRow->Item->units_id); ?></td>
                                             <td class="text-right"><?php echo $TableRow->Summary->Opening->qty; ?></td>
diff --git a/env (2) b/env (2)
index afc1361..c827909 100644
--- a/env (2)	
+++ b/env (2)	
@@ -1,5 +1,5 @@
 APP_NAME="BIB-Accounts"
-APP_URL=http://localhost/School-With-Accounts/account/
+APP_URL=http://localhost/bbnepal/BBnepal-Accounts
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1:3309
 DB_PORT=3309