diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php
index d01dcbc..8da0f6b 100644
--- a/resources/views/includes/bayaran/pembayaransag.blade.php
+++ b/resources/views/includes/bayaran/pembayaransag.blade.php
@@ -27,13 +27,14 @@
 
         </div>
 
-        <div class="row justify-content-center">
-            <div class="col-md-10 col-sm-12">
+        <div class="d-flex">
+        <div class="col">
+            <div class="col-md-8 col-sm-12 mb-4">
                 <div class="card shadow">
                     <div class="card-header mb-4 bg-dark border-0">
                         <div class="row align-items-center">
                             <div class="d-flex">
-                                <h4 class="text-white" style="margin-right: 1%;">Pembayaran</h4>
+                                <h4 class="text-white" style="margin-right: 1%;">Pembayaran PKB</h4>
                                 <i class="fas fa-clipboard-list fa-2x text-white"></i>
                             </div>
 
@@ -43,20 +44,11 @@
                         <div style="overflow-x: auto;">
                             <table class="table align-items-left" id="selepas_tawarruq" style="width: 100%;">
                                 <thead class="thead-light">
-                                    <!-- <div style="margin-bottom: 15px; text-align: left;">
-                                        <i class="text-danger" style="font-size:12px;">Klik 'Klik Di Sini' untuk Pilihan Bayaran</i><br>
-                                        <i class="text-danger" style="font-size:12px;">Amaun Semasa -> Amaun Keuntungan Semasa Sahaja.</i><br>
-                                        <i class="text-danger" style="font-size:12px;">Amaun Lain -> Amaun Ansuran Pembiayaan & Amaun Keuntungan Semasa, Sila Masukkan Amaun</i>
-                                    </div> -->
                                     <tr style="text-align: center;">
-                                        <!-- <th width="10%">No</th> -->
-                                        <th width="10%">No <br>Rujukan</th>
+                                        <th width="10%">No Rujukan</th>
                                         <th width="10%">Tarikh Akhir</th>
                                         <th width="10%">Bayaran</th>
-                                        <th width="10%">Baki <br>Pembiayaan</th>
-                                        <!-- <th width="10%">Pembiayaan Asal</th>
-                                            <th width="10%">Tempoh</th>                                    -->
-
+                                        <th width="10%">Baki Pembiayaan</th>
                                     </tr>
                                 </thead>
                                 @php $counter = 1;$jenisbayaran = 'tawarruq'; $totalupahasal = 1; $errorcount = 0; @endphp
@@ -64,9 +56,6 @@
                                 @if($bayar['hargajualan'] != '')
                                 <tbody class="list" style="text-align: center;">
                                     <tr>
-                                        <!-- <td>
-                                                {{ $counter }}
-                                            </td> -->
                                         <td>
                                             {{ $bayar['norujukan'] }}
                                         </td>
@@ -96,20 +85,6 @@
                                         }
 
                                         @endphp
-                                        <!-- <td>
-
-                                                <select name="sltbayaran" value="{{ old('sltbayaran') ? old('sltbayaran') : '' }}" class="form-control mb-2" data-upah="{{ $upahtawarruq }}" data-jenis="tawarruq" style="text-align: center; border: revert;">
-                                                    <option selected disabled></option>
-                                                    <option value="fixed">Amaun Semasa</option>
-                                                    <option value="otheramount">Amaun Lain</option>
-                                                </select>
-
-                                                <input type="text" value="{{ old('txtbayarantawarruq') ? old('txtbayarantawarruq') : '' }}" data-bakipjm="{{ $bayar['bakipjm'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" class="form-control txtbayaran" style="text-align: center; border: outset;" />
-                                                <input type="hidden" name="txtbayaranhidden[]" class="bayaran" style="text-align: center;" />
-                                                <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
-                                                <input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
-                                                <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" />
-                                                </td>-->
                                         <td><input name="txtbayarantawarruq" type="number" step="0.01" value="{{ sprintf('%0.2f', $upahtawarruq) }}" class="form-control" style="text-align: center; border: outset;" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-taglel="{{ $bayar['taglel'] }}">
                                             <input type="hidden" name="txtbayaranhidden[]" value="{{ $upahtawarruq }}" class="bayaran" style="text-align: center;" />
                                             <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
@@ -120,14 +95,105 @@
                                         <td>
                                             <input style="border: none; text-align: center;" type="text" value="{{ number_format($bayar['bakipjm'],2) }}" class="bakibaru" readonly>
                                         </td>
+                                    </tr>
+                                </tbody>
+                                @php $counter++; @endphp
+                                @endif
+                                @endforeach
+                            </table>
+                            <hr>
+                        </div>
 
-                                        <!-- <td>
-                                                {{ number_format($bayar['pinjaman'],2) }}
-                                            </td>
-                                            <td>
-                                                {{ $bayar['tempoh'] }}
-                                            </td>     -->
+                    </div>
+                    {{-- <div class="row pb-4 font-weight-light">
+                        <div class="col-6">
+                            <label style="text-transform: uppercase; text-align: center;"><strong>Fi Pengurusan</strong></label>
+                        </div>
 
+                        <div class="col-6">
+                            <span class="text-primary"><strong>RM<span>1.00</span></strong></span>
+                        </div>
+                    </div>
+                    <div class="row pb-4 font-weight-light">
+                        <div class="col-6">
+                            <label style="text-transform: uppercase; text-align: center;"><strong>Jumlah Keseluruhan</strong></label>
+                        </div>
+
+                        <div class="col-6">
+                            <span class="text-primary"><strong>RM<span id="spanjumlah">{{ number_format($totalupahasal,2) }}</span></strong></span>
+                        </div>
+                    </div> --}}
+
+                    <span class="text-danger d-none" id="spanamarankosong">*Jangan biarkan kotak bayaran ditinggalkan kosong, Sila masukkan amaun!</span>
+                </div>
+            </div>
+
+            <div class="col-md-8 col-sm-12">
+                <div class="card shadow">
+                    <div class="card-header mb-4 bg-dark border-0">
+                        <div class="row align-items-center">
+                            <div class="d-flex">
+                                <h4 class="text-white" style="margin-right: 1%;">Pembayaran KOPKB</h4>
+                                <i class="fas fa-clipboard-list fa-2x text-white"></i>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="form">
+                        <div style="overflow-x: auto;">
+                            <table class="table align-items-left" id="selepas_tawarruq" style="width: 100%;">
+                                <thead class="thead-light">
+                                    <tr style="text-align: center;">
+                                        <th width="10%">No <br>Rujukan</th>
+                                        <th width="10%">Tarikh Akhir</th>
+                                        <th width="10%">Bayaran</th>
+                                        <th width="10%">Baki <br>Pembiayaan</th>
+                                    </tr>
+                                </thead>
+                                @php $counter = 1;$jenisbayaran = 'tawarruq'; $totalupahasal = 1; $errorcount = 0; @endphp
+                                @foreach($arraybayar as $index=>$bayar)
+                                @if($bayar['hargajualan'] != '')
+                                <tbody class="list" style="text-align: center;">
+                                    <tr>
+                                        <td>
+                                            {{ $bayar['norujukan'] }}
+                                        </td>
+                                        @php
+
+                                        $t_matang = strtotime($bayar['t_matang']);
+                                        $t_akhir = date("d/m/Y", $t_matang);
+
+                                        if($bayar['lelong_tawarruq'] == 0)
+                                        {
+                                        $t_matang = strtotime($bayar['t_matang1']);
+                                        $t_akhir = date("d/m/Y", $t_matang);
+                                        }
+                                        @endphp
+                                        <td>
+                                            {{ $t_akhir }}
+                                        </td>
+                                        @php
+                                        $upahtawarruq = $bayar['upah_tawarruq'];
+                                        $upahtawarruq = floatval(str_replace(',','',$upahtawarruq));
+
+                                        $totalupahasal = $totalupahasal + $upahtawarruq;
+
+
+                                        if(floatval($upahtawarruq) == 0){
+                                        $errorcount++;
+                                        }
+
+                                        @endphp
+                                        <td><input name="txtbayarantawarruq" type="number" step="0.01" value="{{ sprintf('%0.2f', $upahtawarruq) }}" class="form-control" style="text-align: center; border: outset;" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-taglel="{{ $bayar['taglel'] }}">
+                                            <input type="hidden" name="txtbayaranhidden[]" value="{{ $upahtawarruq }}" class="bayaran" style="text-align: center;" />
+                                            <input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
+                                            <input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
+                                            <input type="hidden" name="txtkodcawhidden[]" value="{{ $bayar['kodcaw'] }}" style="text-align: center;" />
+                                        </td>
+
+                                        <td>
+                                            <input style="border: none; text-align: center;" type="text" value="{{ number_format($bayar['bakipjm'],2) }}" class="bakibaru" readonly>
+                                        </td>
                                     </tr>
                                 </tbody>
                                 @php $counter++; @endphp
@@ -181,6 +247,20 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-md-4">
+                <div class="card shadow">
+                    <div class="card-header mb-4 bg-dark border-0">
+                        <div class="row align-items-center">
+                            <div class="d-flex">
+                                <h4 class="text-white" style="margin-right: 1%;">Pembayaran KOPKB</h4>
+                                <i class="fas fa-clipboard-list fa-2x text-white"></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </form>
 </div>
 
diff --git a/resources/views/includes/partials/table-pembiayaan.blade.php b/resources/views/includes/partials/table-pembiayaan.blade.php
index 2fb48e4..c1af081 100644
--- a/resources/views/includes/partials/table-pembiayaan.blade.php
+++ b/resources/views/includes/partials/table-pembiayaan.blade.php
@@ -1,104 +1,35 @@
-<div class="row justify-space-between py-2">
-    <div class="col-lg-6 col-md-8 col-sm-6 mx-auto">
-        <div class="nav-wrapper position-relative end-0">
-            <ul class="nav nav-pills nav-fill p-1" role="tablist">
-                <li class="nav-item">
-                    <a class="nav-link mb-0 px-0 py-1 d-flex align-items-center justify-content-center active" 
-                       data-bs-toggle="tab" 
-                       href="#tabs-icons-text-2" 
-                       role="tab" 
-                       aria-controls="tabs-icons-text-2" 
-                       aria-selected="true">
-                        <i class="material-icons text-sm me-2">person</i> PKB
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link mb-0 px-0 py-1 d-flex align-items-center justify-content-center" 
-                       data-bs-toggle="tab" 
-                       href="#tabs-icons-text-3" 
-                       role="tab" 
-                       aria-controls="tabs-icons-text-3" 
-                       aria-selected="false">
-                        <i class="material-icons text-sm me-2">group</i> KOPKB
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
-
-<div class="tab-content table-hover">
-    <!-- Tab Content 1 -->
-    <div class="tab-pane fade show active table-responsive table-bordered table-hover" id="tabs-icons-text-2" role="tabpanel" aria-labelledby="tabs-icons-text-2">
-        <table class="table align-items-center table-flush border" style="text-align: center; width: 100%">
-            <thead class="thead-light bg-dark text-white text-center">
+<div class="table-responsive table-bordered table-hover">
+    <table class="table align-items-center table-flush border" id="main-table" style="text-align: center; width: 100%">
+        <thead class="thead-light bg-dark text-white text-center">
+            <tr>
+                <th>#</th>
+                <th>No Rujukan</th>
+                <th class="hide-xs">Tempoh</th>
+                <th>T Akhir</th>
+                <th>Keuntungan</th>
+                <th class="hide-xs">Cawangan</th>
+            </tr>
+        </thead>
+        <tbody class="list">
+            @foreach ($pembiayaan as $data)
                 <tr>
-                    <th>#</th>
-                    <th>No Rujukan</th>
-                    <th class="hide-xs">Tempoh</th>
-                    <th>T Akhir</th>
-                    <th>Keuntungan</th>
-                    <th class="hide-xs">Cawangan</th>
+                    <td>
+                        <input type="checkbox"  name="chkboxsag[]" value="{{ $data->norujukan }}"
+                            id="sag-{{ $loop->iteration }}" data-norujukan="{{ $data->norujukan }}"
+                            {{ $data->disabled_payment ? 'disabled' : '' }} />
+                    </td>
+                    <td>
+                        <a href="#" class="marhun-detail-link">
+                            <span class="text-sm text-info">{{ $data->norujukan }}</span>
+                        </a>
+                    </td>
+                    <td class="hide-xs">{{ $data->tempoh }}</td>
+                    <td>{{ $data->tarikh_akhir }}</td>
+                    <td>{{ $data->upah_tawarruq_formatted }}</td>
+                    <td class="hide-xs">{{ $data->cawangan_name }}</td>
                 </tr>
-            </thead>
-            <tbody class="list">
-                @foreach ($pembiayaan as $data)
-                    <tr>
-                        <td>
-                            <input type="checkbox" name="chkboxsag[]" value="{{ $data->norujukan }}" 
-                                id="sag-{{ $loop->iteration }}" data-norujukan="{{ $data->norujukan }}" 
-                                {{ $data->disabled_payment ? 'disabled' : '' }} />
-                        </td>
-                        <td>
-                            <a href="#" class="marhun-detail-link">
-                                <span class="text-sm text-info">{{ $data->norujukan }}</span>
-                            </a>
-                        </td>
-                        <td class="hide-xs">{{ $data->tempoh }}</td>
-                        <td>{{ $data->tarikh_akhir }}</td>
-                        <td>{{ $data->upah_tawarruq_formatted }}</td>
-                        <td class="hide-xs">{{ $data->cawangan_name }}</td>
-                    </tr>
-                @endforeach
-            </tbody>
-        </table>
-        <i class="hide-xs text-success" style="font-size:12px;">"Swipe" ke kiri</i>
-    </div>
-
-    <!-- Tab Content 2 -->
-    <div class="tab-pane fade table-responsive table-bordered table-hover" id="tabs-icons-text-3" role="tabpanel" aria-labelledby="tabs-icons-text-3">
-        <table class="table align-items-center table-flush border" style="text-align: center; width: 100%">
-            <thead class="thead-light bg-dark text-white text-center">
-                <tr>
-                    <th>#</th>
-                    <th>No Rujukan</th>
-                    <th class="hide-xs">Tempoh</th>
-                    <th>T Akhir</th>
-                    <th>Keuntungan</th>
-                    <th class="hide-xs">Cawangan</th>
-                </tr>
-            </thead>
-            <tbody class="list">
-                @foreach ($pembiayaan as $data)
-                    <tr>
-                        <td>
-                            <input type="checkbox" name="chkboxsag[]" value="{{ $data->norujukan }}" 
-                                id="sag-{{ $loop->iteration }}" data-norujukan="{{ $data->norujukan }}" 
-                                {{ $data->disabled_payment ? 'disabled' : '' }} />
-                        </td>
-                        <td>
-                            <a href="#" class="marhun-detail-link">
-                                <span class="text-sm text-info">{{ $data->norujukan }}</span>
-                            </a>
-                        </td>
-                        <td class="hide-xs">{{ $data->tempoh }}</td>
-                        <td>{{ $data->tarikh_akhir }}</td>
-                        <td>{{ $data->upah_tawarruq_formatted }}</td>
-                        <td class="hide-xs">{{ $data->cawangan_name }}</td>
-                    </tr>
-                @endforeach
-            </tbody>
-        </table>
-        <i class="hide-xs text-success" style="font-size:12px;">"Swipe" ke kiri</i>
-    </div>
-</div>
+            @endforeach
+        </tbody>
+    </table>
+    <i class="hide-xs text-success" style="font-size:12px;">"Swipe" ke kiri</i>
+</div>
\ No newline at end of file