diff --git a/customers/.hta_slug/list.php b/customers/.hta_slug/list.php
index 7da7637..93ac870 100644
--- a/customers/.hta_slug/list.php
+++ b/customers/.hta_slug/list.php
@@ -1,11 +1,11 @@
 <?php
     require('../.hta_config/conf.php');
 ?>
-<div class="container mt-4">
-    <h2 class="mb-3 text-center">Customer List</h2>
+<div class="container-xxl mt-4">
+    <h3 class="mb-3 ">Customer List</h3><hr>
     <div class="table-responsive">
-        <table class="table table-bordered table-striped table-hover">
-            <thead class="bg-primary text-white text-center" style="font-size: 12px;">
+        <table class="table table-bordered table-striped table-hover w-100" style="font-size: 12px;">
+            <thead class="bg-primary text-white text-center" >
                 <tr>
                     <th>Sl No</th>
                     <th>Name</th>
@@ -14,7 +14,7 @@
                     <th>Number of Installments</th>
                     <th>Monthly Payment Date</th>
                     <th>Monthly Payment Amount</th>
-                    <th>Totoal Amount</th>
+                    <th>Total Amount</th>
                     <th>Action</th>
                 </tr>
             </thead>
@@ -30,6 +30,11 @@
                         $stmt->execute();
                         $content = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
+                        // Fetch EMI data
+                        $stmt = $db->prepare("SELECT * FROM emi ORDER BY invoiceId ASC");
+                        $stmt->execute();
+                        $emiContent = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
                         // Fetch invoice data
                         $stmt2 = $db->prepare("SELECT * FROM invoice");
                         $stmt2->execute();
@@ -46,25 +51,42 @@
                             // If there are matching invoices, loop through them
                             if (!empty($matchingInvoices)) {
                                 foreach ($matchingInvoices as $invoice) {
-                ?> 
+                                    // Find corresponding EMI records for this invoice
+                                    $matchingEMIs = array_filter($emiContent, function ($emi) use ($invoice) {
+                                        return $emi['invoiceId'] === $invoice['invoiceId'];
+                                    });
+
+                                    // If EMI exists, use its data; otherwise, display empty fields
+                                    // $emi = reset($matchingEMIs) ?: [];
+                                    $matchingEmis = array_filter($emiContent, function ($emi) use ($invoice) {
+                                        return $emi['invoiceId'] === $invoice['invoiceId'];
+                                    });
+                                    
+                                    if (!empty($matchingEmis)) {
+                                        $emi = reset($matchingEmis); // Get the first matching EMI record safely
+                                    } else {
+                                        $emi = [];
+                                    }
+
+                                    ?> 
                                     <tr>
                                         <td><?php echo $customerSerial++; ?></td>
-                                        <td><a href="/customers/billing-details/?customerId=<?php echo $customer['customerId'] . '&invoiceId=' . $invoice['invoiceId']; ?>"><?php echo htmlspecialchars($customer['name']); ?></a></td>
-                                        <td>$<?php echo htmlspecialchars($invoice['totalAmount']); ?></td>
-                                        <td><?php echo htmlspecialchars($invoice['tenure']); ?></td>
-
-                                        <!-- Invoice Data -->
-                                        <td><?php echo htmlspecialchars($invoice['invoiceId']); ?></td>
-                                        <td><?php echo htmlspecialchars($invoice['invoiceDate']); ?></td>
-                                        <td>$<?php echo htmlspecialchars($invoice['totalAmount']); ?></td>
-
                                         <td>
-                                            <!-- <a href="/customers/edit/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">Edit</a> -->
-                                            <a href="/customers/generate-invoice/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">New Invoice</a>
-                                            <a href="/customers/edit-invoice/?customerId=<?php echo $customer['customerId'].'&invoiceId='.$invoice['invoiceId']; ?>" class="btn btn-primary btn-sm">Edit Invoice</a>
-                                            <!-- <a href="/customers/billing-details/?customerId=<?php echo $customer['customerId'] . '&invoiceId=' . $invoice['invoiceId']; ?>" class="btn btn-primary btn-sm">EMI Details</a> -->
-                                            <!-- <a href="/customers/print-invoice/?customerId=<?php echo $customer['customerId'] . '&invoiceId=' . $invoice['invoiceId']; ?>" class="btn btn-primary btn-sm">Print</a> -->
-                                            <a href="/customers/additional-payment/?customerId=<?php echo $customer['customerId'].'&invoiceId='.$invoice['invoiceId']; ?>" class="btn btn-primary btn-sm">Payment</a>
+                                            <a href="/customers/billing-details/?customerId=<?php echo $customer['customerId'] . '&invoiceId=' . $invoice['invoiceId']; ?>">
+                                                <?php echo htmlspecialchars($customer['name']); ?>
+                                            </a>
+                                        </td>
+                                        <td><?php echo isset($emi['bookingDate']) ? date('d-m-Y', strtotime($emi['bookingDate'])) : 'N/A'; ?></td>
+                                        <td><?php echo isset($emi['bookingDate']) ? (new DateTime($emi['bookingDate']))->modify('+'.$emi['tenure']-'1'.'months')->format('d-m-Y') : 'N/A'; ?></td>
+                                        <td><?php echo isset($emi['tenure']) ? htmlspecialchars($emi['tenure']) : 'N/A'; ?></td>
+                                        <td><?php echo isset($emi['bookingDate']) ? date('d', strtotime($emi['bookingDate'])) .' Each Month': 'N/A'; ?></td>
+                                        <td>$<?php echo isset($emi['emiAmount']) ? htmlspecialchars($emi['emiAmount']) : '0.00'; ?></td>
+                                        <td>$<?php echo isset($emi['totalAmount']) ? htmlspecialchars($emi['totalAmount']) : '0.00'; ?></td>
+
+                                        <td class="d-flex gap-1">
+                                            <a href="/customers/generate-invoice/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm" style="font-size: 13px;">New Invoice</a>
+                                            <a href="/customers/edit-invoice/?customerId=<?php echo $customer['customerId'].'&invoiceId='.$invoice['invoiceId']; ?>" class="btn btn-primary btn-sm" style="font-size: 13px;">Edit Invoice</a>
+                                            <a href="/customers/additional-payment/?customerId=<?php echo $customer['customerId'].'&invoiceId='.$invoice['invoiceId']; ?>" class="btn btn-primary btn-sm" style="font-size: 13px;">Payment</a>
                                         </td>
                                     </tr>
                 <?php
@@ -75,28 +97,19 @@
                                 <tr>
                                     <td><?php echo $customerSerial++; ?></td>
                                     <td><?php echo htmlspecialchars($customer['name']); ?></td>
-                                    <td><?php echo htmlspecialchars($customer['mobile']); ?></td>
-                                    <td><?php echo htmlspecialchars($customer['email']); ?></td>
-                                    <td colspan="3">No invoice available</td>
+                                    <td colspan="6" class="text-center">No EMI or Invoice Data</td>
                                     <td>
-                                        <!-- <a href="/customers/edit/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">Edit Invoice</a> -->
-                                        <!-- <a href="/customers/edit/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">Edit</a> -->
                                         <a href="/customers/generate-invoice/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">Create Invoice</a>
-                                        <!-- <a href="/customers/billing-details/?customerId=<?php echo $customer['customerId']; ?>" class="btn btn-primary btn-sm">EMI Details</a> -->
-                                        <a href="" class="btn btn-primary btn-sm">Additional  Payment</a>
-
                                     </td>
                                 </tr>
                                 <?php
                             }
                         }
                     } catch (PDOException $e) {
-                        echo '<tr><td colspan="5" class="text-danger text-center">Error: ' . $e->getMessage() . '</td></tr>';
+                        echo '<tr><td colspan="9" class="text-danger text-center">Error: ' . $e->getMessage() . '</td></tr>';
                     }
                 ?>
             </tbody>
-
-
         </table>
     </div>
 </div>