diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php
index e609c08..d1e4c07 100644
--- a/app/Http/Controllers/Forms/FormUpCountryController.php
+++ b/app/Http/Controllers/Forms/FormUpCountryController.php
@@ -12,7 +12,6 @@ use App\Models\Region;
 use App\Models\Cabang;
 use App\Models\UserHasCabang;
 use App\Models\Kategori;
-use App\Helpers\NextCloudHelper;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Mail;
 use App\Mail\ExpenseApproved;
@@ -20,6 +19,7 @@ use App\Mail\ExpenseRejected;
 use App\Mail\FinalApprove;
 use App\Helpers\WhatsappHelper;
 use App\Helpers\AuditTrailHelper;
+use App\Helpers\NextCloudHelper;
 use App\Rules\FileType;
 
 class FormUpCountryController extends Controller
@@ -70,9 +70,9 @@ class FormUpCountryController extends Controller
     $this->checkAuthorization(auth()->user(), ['forms.country.view']);
 
     $form = FormUpCountry::with(['rayon', 'user'])->findOrFail($id);
-    $form->bukti1 = NextCloudHelper::getFileUrl($form->bukti1);
-    $form->bukti2 = NextCloudHelper::getFileUrl($form->bukti2);
-    $form->bukti3 = NextCloudHelper::getFileUrl($form->bukti3);
+    $form->bukti1 = $form->bukti1 ? NextCloudHelper::getFileUrl($form->bukti1) : null;
+    $form->bukti2 = $form->bukti2 ? NextCloudHelper::getFileUrl($form->bukti2) : null;
+    $form->bukti3 = $form->bukti3 ? NextCloudHelper::getFileUrl($form->bukti3) : null;
     return response()->json($form);
   }
 
diff --git a/resources/views/backend/pages/admins/expense.blade.php b/resources/views/backend/pages/admins/expense.blade.php
index 9dae772..0288d84 100644
--- a/resources/views/backend/pages/admins/expense.blade.php
+++ b/resources/views/backend/pages/admins/expense.blade.php
@@ -35,150 +35,152 @@
                             <h4 class="header-title">Form Up Country</h4>
                             <div class="data-tables">
 								@include('backend.layouts.partials.messages')
-                                <table id="dataTable-form_up_country">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th>#</th>
-											<th>Nama</th>
-											<th>Rayon</th>
-											<th>Tanggal</th>
-											<th>Tujuan</th>
-											<th>Jarak</th>
-											<th>Total</th>
-											<th>Bukti 1</th>
-											<th>Bukti 2</th>
-											<th>Bukti 3</th>
-											<th>Account Number</th>
-											<th>Status</th>
-											@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
-												<th>Approval</th>
-											@endif
-											<th>Aksi</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($forms['form_up_country'] as $index => $form)
-                                            <tr>
-                                                <td>{{ $loop->iteration }}</td>
-												<td>{{ $form->user->name }}</td>
-												<td>{{ $form->rayon->code }}</td>
-												<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
-												<td>{{ $form->tujuan }}</td>
-												<td>{{ $form->jarak }} km</td>
-												<td>{{ number_format($form->total, 0, ',', '.') }}</td>
-												<td>
-													@if ($form->bukti1)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti2)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti3)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>{{ $form->account_number }}</td>
-												<td>
-													@if ($form->status == 'On Progress')
-														<span class="badge badge-warning text-white">{{ $form->status }}</span>
-													@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
-														<span class="badge badge-success text-white">{{ $form->status }}</span>
-													@else
-														<span class="badge badge-danger text-white">{{ $form->status }}</span>
-													@endif
-												</td>
-												@if (auth()->user()->can('approval.approve'))
+								<div class="table-responsive">
+									<table id="dataTable-form_up_country">
+										<thead class="bg-light text-capitalize">
+											<tr>
+												<th>#</th>
+												<th>Nama</th>
+												<th>Rayon</th>
+												<th>Tanggal</th>
+												<th>Tujuan</th>
+												<th>Jarak</th>
+												<th>Total</th>
+												<th>Bukti 1</th>
+												<th>Bukti 2</th>
+												<th>Bukti 3</th>
+												<th>Account Number</th>
+												<th>Status</th>
+												@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+													<th>Approval</th>
+												@endif
+												<th>Aksi</th>
+											</tr>
+										</thead>
+										<tbody>
+											@foreach ($forms['form_up_country'] as $index => $form)
+												<tr>
+													<td>{{ $loop->iteration }}</td>
+													<td>{{ $form->user->name }}</td>
+													<td>{{ $form->rayon->code }}</td>
+													<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
+													<td>{{ $form->tujuan }}</td>
+													<td>{{ $form->jarak }} km</td>
+													<td>{{ number_format($form->total, 0, ',', '.') }}</td>
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'On Progress')
-															<form action="{{ route('forms.up-country.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Approve
-																</button>
-															</form>
-															
-															<form action="{{ route('forms.up-country.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-danger btn-sm">
-																	Reject
-																</button>
-															</form>
+														@if ($form->bukti1)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->approved_at)
-																{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@elseif($form->rejected_at)
-																{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@else
-																-
-															@endif
+															-
 														@endif
 													</td>
-												@elseif(auth()->user()->can('final_approval.approve'))
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
-															<form action="{{ route('forms.up-country.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Final Approve
-																</button>
-															</form>
+														@if ($form->bukti2)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->final_approved_at)
-																<form action="{{ route('forms.up-country.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+															-
+														@endif
+													</td>
+													<td>
+														@if ($form->bukti3)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
+																Download
+															</a>
+														@else
+															-
+														@endif
+													</td>
+													<td>{{ $form->account_number }}</td>
+													<td>
+														@if ($form->status == 'On Progress')
+															<span class="badge badge-warning text-white">{{ $form->status }}</span>
+														@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
+															<span class="badge badge-success text-white">{{ $form->status }}</span>
+														@else
+															<span class="badge badge-danger text-white">{{ $form->status }}</span>
+														@endif
+													</td>
+													@if (auth()->user()->can('approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'On Progress')
+																<form action="{{ route('forms.up-country.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
 																	@csrf
 																	@method('PUT')
 																	<button type="submit" class="btn btn-success btn-sm">
-																		Open
+																		Approve
+																	</button>
+																</form>
+																
+																<form action="{{ route('forms.up-country.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-danger btn-sm">
+																		Reject
 																	</button>
 																</form>
 															@else
-																-
+																@if ($form->approved_at)
+																	{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@elseif($form->rejected_at)
+																	{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@else
+																	-
+																@endif
 															@endif
+														</td>
+													@elseif(auth()->user()->can('final_approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
+																<form action="{{ route('forms.up-country.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-success btn-sm">
+																		Final Approve
+																	</button>
+																</form>
+															@else
+																@if ($form->final_approved_at)
+																	<form action="{{ route('forms.up-country.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																		@csrf
+																		@method('PUT')
+																		<button type="submit" class="btn btn-success btn-sm">
+																			Open
+																		</button>
+																	</form>
+																@else
+																	-
+																@endif
+															@endif
+														</td>
+													@endif
+													<td>
+														@if (auth()->user()->can('forms.country.edit'))
+															<a href="{{ route('forms.up-country.edit', $form->id) }}" class="btn btn-warning btn-sm">
+																<i class="fas fa-edit text-white"></i>
+															</a>
+														@endif
+
+														@if (auth()->user()->can('forms.country.delete'))
+															<form action="{{ route('forms.up-country.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
+																@csrf
+																@method('DELETE')
+																<button type="submit" class="btn btn-danger btn-sm">
+																	<i class="fas fa-trash"></i>
+																</button>
+															</form>
 														@endif
 													</td>
-												@endif
-												<td>
-													@if (auth()->user()->can('forms.country.edit'))
-														<a href="{{ route('forms.up-country.edit', $form->id) }}" class="btn btn-warning btn-sm">
-															<i class="fas fa-edit text-white"></i>
-														</a>
-													@endif
-
-													@if (auth()->user()->can('forms.country.delete'))
-														<form action="{{ route('forms.up-country.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
-															@csrf
-															@method('DELETE')
-															<button type="submit" class="btn btn-danger btn-sm">
-																<i class="fas fa-trash"></i>
-															</button>
-														</form>
-													@endif
-												</td>
-                                            </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+												</tr>
+											@endforeach
+										</tbody>
+									</table>
+								</div>
                             </div>
                         </div>
                     </div>
@@ -192,152 +194,154 @@
                         <div class="card-body">
                             <h4 class="header-title">Form Vehicle Running Cost</h4>
                             <div class="data-tables">
-                                <table id="dataTable-form_vehicle_running_cost">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th>#</th>
-											<th>Nama</th>
-											<th>Tanggal</th>
-											<th>Liter</th>
-											<th>Harga</th>
-											<th>Jarak</th>
-											<th>Tipe Bensin</th>
-											<th>Nomor Polisi</th>
-											<th>Bukti 1</th>
-											<th>Bukti 2</th>
-											<th>Bukti 3</th>
-											<th>Account Number</th>
-											<th>Status</th>
-											@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
-												<th>Approval</th>
-											@endif
-											<th>Aksi</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($forms['form_vehicle_running_cost'] as $index => $form)
-                                            <tr>
-                                                <td>{{ $loop->iteration }}</td>
-												<td>{{ $form->user->name }}</td>
-												<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('dddd, D MMMM Y HH:mm:ss') }}</td>
-												<td>{{ $form->liter }}</td>
-												<td>{{ number_format($form->harga, 0, ',', '.') }}</td>
-												<td>{{ $form->jarak }}</td>
-												<td>{{ $form->tipe_bensin }}</td>
-												<td>{{ $form->nopol }}</td>
-												<td>
-													@if ($form->bukti1)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti2)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti3)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>{{ $form->account_number }}</td>
-												<td>
-													@if ($form->status == 'On Progress')
-														<span class="badge badge-warning text-white">{{ $form->status }}</span>
-													@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
-														<span class="badge badge-success text-white">{{ $form->status }}</span>
-													@else
-														<span class="badge badge-danger text-white">{{ $form->status }}</span>
-													@endif
-												</td>
-												@if (auth()->user()->can('approval.approve'))
+								<div class="table-responsive">
+									<table id="dataTable-form_vehicle_running_cost">
+										<thead class="bg-light text-capitalize">
+											<tr>
+												<th>#</th>
+												<th>Nama</th>
+												<th>Tanggal</th>
+												<th>Liter</th>
+												<th>Harga</th>
+												<th>Jarak</th>
+												<th>Tipe Bensin</th>
+												<th>Nomor Polisi</th>
+												<th>Bukti 1</th>
+												<th>Bukti 2</th>
+												<th>Bukti 3</th>
+												<th>Account Number</th>
+												<th>Status</th>
+												@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+													<th>Approval</th>
+												@endif
+												<th>Aksi</th>
+											</tr>
+										</thead>
+										<tbody>
+											@foreach ($forms['form_vehicle_running_cost'] as $index => $form)
+												<tr>
+													<td>{{ $loop->iteration }}</td>
+													<td>{{ $form->user->name }}</td>
+													<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('dddd, D MMMM Y HH:mm:ss') }}</td>
+													<td>{{ $form->liter }}</td>
+													<td>{{ number_format($form->harga, 0, ',', '.') }}</td>
+													<td>{{ $form->jarak }}</td>
+													<td>{{ $form->tipe_bensin }}</td>
+													<td>{{ $form->nopol }}</td>
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'On Progress')
-															<form action="{{ route('forms.vehicle.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Approve
-																</button>
-															</form>
-															
-															<form action="{{ route('forms.vehicle.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-danger btn-sm">
-																	Reject
-																</button>
-															</form>
+														@if ($form->bukti1)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->approved_at)
-																{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@elseif($form->rejected_at)
-																{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@else
-																-
-															@endif
+															-
 														@endif
 													</td>
-												@elseif(auth()->user()->can('final_approval.approve'))
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
-															<form action="{{ route('forms.vehicle.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Final Approve
-																</button>
-															</form>
+														@if ($form->bukti2)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->final_approved_at)
-																<form action="{{ route('forms.vehicle.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+															-
+														@endif
+													</td>
+													<td>
+														@if ($form->bukti3)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
+																Download
+															</a>
+														@else
+															-
+														@endif
+													</td>
+													<td>{{ $form->account_number }}</td>
+													<td>
+														@if ($form->status == 'On Progress')
+															<span class="badge badge-warning text-white">{{ $form->status }}</span>
+														@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
+															<span class="badge badge-success text-white">{{ $form->status }}</span>
+														@else
+															<span class="badge badge-danger text-white">{{ $form->status }}</span>
+														@endif
+													</td>
+													@if (auth()->user()->can('approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'On Progress')
+																<form action="{{ route('forms.vehicle.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
 																	@csrf
 																	@method('PUT')
 																	<button type="submit" class="btn btn-success btn-sm">
-																		Open
+																		Approve
+																	</button>
+																</form>
+																
+																<form action="{{ route('forms.vehicle.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-danger btn-sm">
+																		Reject
 																	</button>
 																</form>
 															@else
-																-
+																@if ($form->approved_at)
+																	{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@elseif($form->rejected_at)
+																	{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@else
+																	-
+																@endif
 															@endif
+														</td>
+													@elseif(auth()->user()->can('final_approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
+																<form action="{{ route('forms.vehicle.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-success btn-sm">
+																		Final Approve
+																	</button>
+																</form>
+															@else
+																@if ($form->final_approved_at)
+																	<form action="{{ route('forms.vehicle.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																		@csrf
+																		@method('PUT')
+																		<button type="submit" class="btn btn-success btn-sm">
+																			Open
+																		</button>
+																	</form>
+																@else
+																	-
+																@endif
+															@endif
+														</td>
+													@endif
+													<td>
+														@if (auth()->user()->can('forms.vehicle.edit'))
+															<a href="{{ route('forms.vehicle.edit', $form->id) }}" class="btn btn-warning btn-sm">
+																<i class="fas fa-edit text-white"></i>
+															</a>
+														@endif
+
+														@if (auth()->user()->can('forms.vehicle.delete'))
+															<form action="{{ route('forms.vehicle.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
+																@csrf
+																@method('DELETE')
+																<button type="submit" class="btn btn-danger btn-sm">
+																	<i class="fas fa-trash"></i>
+																</button>
+															</form>
 														@endif
 													</td>
-												@endif
-												<td>
-													@if (auth()->user()->can('forms.vehicle.edit'))
-														<a href="{{ route('forms.vehicle.edit', $form->id) }}" class="btn btn-warning btn-sm">
-															<i class="fas fa-edit text-white"></i>
-														</a>
-													@endif
-
-													@if (auth()->user()->can('forms.vehicle.delete'))
-														<form action="{{ route('forms.vehicle.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
-															@csrf
-															@method('DELETE')
-															<button type="submit" class="btn btn-danger btn-sm">
-																<i class="fas fa-trash"></i>
-															</button>
-														</form>
-													@endif
-												</td>
-                                            </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+												</tr>
+											@endforeach
+										</tbody>
+									</table>
+								</div>
                             </div>
                         </div>
                     </div>
@@ -351,150 +355,152 @@
                         <div class="card-body">
                             <h4 class="header-title">Form Entertainment Presentation</h4>
                             <div class="data-tables">
-                                <table id="dataTable-form_entertainment_presentation">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th>#</th>
-											<th>Nama</th>
-											<th>Tanggal</th>
-											<th>Jenis</th>
-											<th>Keterangan</th>
-											<th>Total</th>
-											<th>Nama Penerima</th>
-											<th>Bukti 1</th>
-											<th>Bukti 2</th>
-											<th>Bukti 3</th>
-											<th>Account Number</th>
-											<th>Status</th>
-											@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
-												<th>Approval</th>
-											@endif
-											<th>Aksi</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($forms['form_entertainment_presentation'] as $index => $form)
-                                            <tr>
-                                                <td>{{ $loop->iteration }}</td>
-												<td>{{ $form->user->name }}</td>
-												<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
-												<td>{{ $form->jenis }}</td>
-												<td>{{ $form->keterangan }}</td>
-												<td>{{ number_format($form->total, 0, ',', '.') }}</td>
-												<td>{{ $form->name }}</td>
-												<td>
-													@if ($form->bukti1)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti2)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti3)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>{{ $form->account_number }}</td>
-												<td>
-													@if ($form->status == 'On Progress')
-														<span class="badge badge-warning text-white">{{ $form->status }}</span>
-													@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
-														<span class="badge badge-success text-white">{{ $form->status }}</span>
-													@else
-														<span class="badge badge-danger text-white">{{ $form->status }}</span>
-													@endif
-												</td>
-												@if (auth()->user()->can('approval.approve'))
+								<div class="table-responsive">
+									<table id="dataTable-form_entertainment_presentation">
+										<thead class="bg-light text-capitalize">
+											<tr>
+												<th>#</th>
+												<th>Nama</th>
+												<th>Tanggal</th>
+												<th>Jenis</th>
+												<th>Keterangan</th>
+												<th>Total</th>
+												<th>Nama Penerima</th>
+												<th>Bukti 1</th>
+												<th>Bukti 2</th>
+												<th>Bukti 3</th>
+												<th>Account Number</th>
+												<th>Status</th>
+												@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+													<th>Approval</th>
+												@endif
+												<th>Aksi</th>
+											</tr>
+										</thead>
+										<tbody>
+											@foreach ($forms['form_entertainment_presentation'] as $index => $form)
+												<tr>
+													<td>{{ $loop->iteration }}</td>
+													<td>{{ $form->user->name }}</td>
+													<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
+													<td>{{ $form->jenis }}</td>
+													<td>{{ $form->keterangan }}</td>
+													<td>{{ number_format($form->total, 0, ',', '.') }}</td>
+													<td>{{ $form->name }}</td>
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'On Progress')
-															<form action="{{ route('forms.entertainment.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Approve
-																</button>
-															</form>
-															
-															<form action="{{ route('forms.entertainment.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-danger btn-sm">
-																	Reject
-																</button>
-															</form>
+														@if ($form->bukti1)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->approved_at)
-																{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@elseif($form->rejected_at)
-																{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@else
-																-
-															@endif
+															-
 														@endif
 													</td>
-												@elseif(auth()->user()->can('final_approval.approve'))
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
-															<form action="{{ route('forms.entertainment.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Final Approve
-																</button>
-															</form>
+														@if ($form->bukti2)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->final_approved_at)
-																<form action="{{ route('forms.entertainment.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+															-
+														@endif
+													</td>
+													<td>
+														@if ($form->bukti3)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
+																Download
+															</a>
+														@else
+															-
+														@endif
+													</td>
+													<td>{{ $form->account_number }}</td>
+													<td>
+														@if ($form->status == 'On Progress')
+															<span class="badge badge-warning text-white">{{ $form->status }}</span>
+														@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
+															<span class="badge badge-success text-white">{{ $form->status }}</span>
+														@else
+															<span class="badge badge-danger text-white">{{ $form->status }}</span>
+														@endif
+													</td>
+													@if (auth()->user()->can('approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'On Progress')
+																<form action="{{ route('forms.entertainment.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
 																	@csrf
 																	@method('PUT')
 																	<button type="submit" class="btn btn-success btn-sm">
-																		Open
+																		Approve
+																	</button>
+																</form>
+																
+																<form action="{{ route('forms.entertainment.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-danger btn-sm">
+																		Reject
 																	</button>
 																</form>
 															@else
-																-
+																@if ($form->approved_at)
+																	{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@elseif($form->rejected_at)
+																	{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@else
+																	-
+																@endif
 															@endif
+														</td>
+													@elseif(auth()->user()->can('final_approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
+																<form action="{{ route('forms.entertainment.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-success btn-sm">
+																		Final Approve
+																	</button>
+																</form>
+															@else
+																@if ($form->final_approved_at)
+																	<form action="{{ route('forms.entertainment.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																		@csrf
+																		@method('PUT')
+																		<button type="submit" class="btn btn-success btn-sm">
+																			Open
+																		</button>
+																	</form>
+																@else
+																	-
+																@endif
+															@endif
+														</td>
+													@endif
+													<td>
+														@if (auth()->user()->can('forms.entertainment.edit'))
+															<a href="{{ route('forms.entertainment.edit', $form->id) }}" class="btn btn-warning btn-sm">
+																<i class="fas fa-edit text-white"></i>
+															</a>
+														@endif
+
+														@if (auth()->user()->can('forms.entertainment.delete'))
+															<form action="{{ route('forms.entertainment.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
+																@csrf
+																@method('DELETE')
+																<button type="submit" class="btn btn-danger btn-sm">
+																	<i class="fas fa-trash"></i>
+																</button>
+															</form>
 														@endif
 													</td>
-												@endif
-												<td>
-													@if (auth()->user()->can('forms.entertainment.edit'))
-														<a href="{{ route('forms.entertainment.edit', $form->id) }}" class="btn btn-warning btn-sm">
-															<i class="fas fa-edit text-white"></i>
-														</a>
-													@endif
-
-													@if (auth()->user()->can('forms.entertainment.delete'))
-														<form action="{{ route('forms.entertainment.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
-															@csrf
-															@method('DELETE')
-															<button type="submit" class="btn btn-danger btn-sm">
-																<i class="fas fa-trash"></i>
-															</button>
-														</form>
-													@endif
-												</td>
-                                            </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+												</tr>
+											@endforeach
+										</tbody>
+									</table>
+								</div>
                             </div>
                         </div>
                     </div>
@@ -508,150 +514,152 @@
                         <div class="card-body">
                             <h4 class="header-title">Form Meeting Seminar</h4>
                             <div class="data-tables">
-                                <table id="dataTable-form_meeting_seminar">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th>#</th>
-											<th>Nama</th>
-											<th>Tanggal</th>
-											<th>Allowance</th>
-											<th>Transport Ankot</th>
-											<th>Hotel</th>
-											<th>Total</th>
-											<th>Bukti 1</th>
-											<th>Bukti 2</th>
-											<th>Bukti 3</th>
-											<th>Account Number</th>
-											<th>Status</th>
-											@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
-												<th>Approval</th>
-											@endif
-											<th>Aksi</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($forms['form_meeting_seminar'] as $index => $form)
-                                            <tr>
-                                                <td>{{ $loop->iteration }}</td>
-												<td>{{ $form->user->name }}</td>
-												<td>{{ \Carbon\Carbon::parse($form->created_at)->locale('id')->isoFormat('D MMMM Y') }}</td>
-												<td>{{ number_format($form->allowance, 0, ',', '.') }}</td>
-												<td>{{ number_format($form->transport_ankot, 0, ',', '.') }}</td>
-												<td>{{ number_format($form->hotel, 0, ',', '.') }}</td>
-												<td>{{ number_format($form->total, 0, ',', '.') }}</td>
-												<td>
-													@if ($form->bukti1)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti2)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti3)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>{{ $form->account_number }}</td>
-												<td>
-													@if ($form->status == 'On Progress')
-														<span class="badge badge-warning text-white">{{ $form->status }}</span>
-													@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
-														<span class="badge badge-success text-white">{{ $form->status }}</span>
-													@else
-														<span class="badge badge-danger text-white">{{ $form->status }}</span>
-													@endif
-												</td>
-												@if (auth()->user()->can('approval.approve'))
+								<div class="table-responsive">
+									<table id="dataTable-form_meeting_seminar">
+										<thead class="bg-light text-capitalize">
+											<tr>
+												<th>#</th>
+												<th>Nama</th>
+												<th>Tanggal</th>
+												<th>Allowance</th>
+												<th>Transport Ankot</th>
+												<th>Hotel</th>
+												<th>Total</th>
+												<th>Bukti 1</th>
+												<th>Bukti 2</th>
+												<th>Bukti 3</th>
+												<th>Account Number</th>
+												<th>Status</th>
+												@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+													<th>Approval</th>
+												@endif
+												<th>Aksi</th>
+											</tr>
+										</thead>
+										<tbody>
+											@foreach ($forms['form_meeting_seminar'] as $index => $form)
+												<tr>
+													<td>{{ $loop->iteration }}</td>
+													<td>{{ $form->user->name }}</td>
+													<td>{{ \Carbon\Carbon::parse($form->created_at)->locale('id')->isoFormat('D MMMM Y') }}</td>
+													<td>{{ number_format($form->allowance, 0, ',', '.') }}</td>
+													<td>{{ number_format($form->transport_ankot, 0, ',', '.') }}</td>
+													<td>{{ number_format($form->hotel, 0, ',', '.') }}</td>
+													<td>{{ number_format($form->total, 0, ',', '.') }}</td>
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'On Progress')
-															<form action="{{ route('forms.meeting.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Approve
-																</button>
-															</form>
-															
-															<form action="{{ route('forms.meeting.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-danger btn-sm">
-																	Reject
-																</button>
-															</form>
+														@if ($form->bukti1)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->approved_at)
-																{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@elseif($form->rejected_at)
-																{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@else
-																-
-															@endif
+															-
 														@endif
 													</td>
-												@elseif(auth()->user()->can('final_approval.approve'))
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
-															<form action="{{ route('forms.meeting.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Final Approve
-																</button>
-															</form>
+														@if ($form->bukti2)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->final_approved_at)
-																<form action="{{ route('forms.meeting.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+															-
+														@endif
+													</td>
+													<td>
+														@if ($form->bukti3)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
+																Download
+															</a>
+														@else
+															-
+														@endif
+													</td>
+													<td>{{ $form->account_number }}</td>
+													<td>
+														@if ($form->status == 'On Progress')
+															<span class="badge badge-warning text-white">{{ $form->status }}</span>
+														@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
+															<span class="badge badge-success text-white">{{ $form->status }}</span>
+														@else
+															<span class="badge badge-danger text-white">{{ $form->status }}</span>
+														@endif
+													</td>
+													@if (auth()->user()->can('approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'On Progress')
+																<form action="{{ route('forms.meeting.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
 																	@csrf
 																	@method('PUT')
 																	<button type="submit" class="btn btn-success btn-sm">
-																		Open
+																		Approve
+																	</button>
+																</form>
+																
+																<form action="{{ route('forms.meeting.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-danger btn-sm">
+																		Reject
 																	</button>
 																</form>
 															@else
-																-
+																@if ($form->approved_at)
+																	{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@elseif($form->rejected_at)
+																	{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@else
+																	-
+																@endif
 															@endif
+														</td>
+													@elseif(auth()->user()->can('final_approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
+																<form action="{{ route('forms.meeting.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-success btn-sm">
+																		Final Approve
+																	</button>
+																</form>
+															@else
+																@if ($form->final_approved_at)
+																	<form action="{{ route('forms.meeting.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																		@csrf
+																		@method('PUT')
+																		<button type="submit" class="btn btn-success btn-sm">
+																			Open
+																		</button>
+																	</form>
+																@else
+																	-
+																@endif
+															@endif
+														</td>
+													@endif
+													<td>
+														@if (auth()->user()->can('forms.meeting.edit'))
+															<a href="{{ route('forms.meeting.edit', $form->id) }}" class="btn btn-warning btn-sm">
+																<i class="fas fa-edit text-white"></i>
+															</a>
+														@endif
+
+														@if (auth()->user()->can('forms.meeting.delete'))
+															<form action="{{ route('forms.meeting.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
+																@csrf
+																@method('DELETE')
+																<button type="submit" class="btn btn-danger btn-sm">
+																	<i class="fas fa-trash"></i>
+																</button>
+															</form>
 														@endif
 													</td>
-												@endif
-												<td>
-													@if (auth()->user()->can('forms.meeting.edit'))
-														<a href="{{ route('forms.meeting.edit', $form->id) }}" class="btn btn-warning btn-sm">
-															<i class="fas fa-edit text-white"></i>
-														</a>
-													@endif
-
-													@if (auth()->user()->can('forms.meeting.delete'))
-														<form action="{{ route('forms.meeting.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
-															@csrf
-															@method('DELETE')
-															<button type="submit" class="btn btn-danger btn-sm">
-																<i class="fas fa-trash"></i>
-															</button>
-														</form>
-													@endif
-												</td>
-                                            </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+												</tr>
+											@endforeach
+										</tbody>
+									</table>
+								</div>
                             </div>
                         </div>
                     </div>
@@ -665,148 +673,150 @@
                         <div class="card-body">
                             <h4 class="header-title">Form Others</h4>
                             <div class="data-tables">
-                                <table id="dataTable-form_others">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th>#</th>
-											<th>Nama</th>
-											<th>Tanggal</th>
-											<th>Jenis</th>
-											<th>Keterangan</th>
-											<th>Total</th>
-											<th>Bukti 1</th>
-											<th>Bukti 2</th>
-											<th>Bukti 3</th>
-											<th>Account Number</th>
-											<th>Status</th>
-											@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
-												<th>Approval</th>
-											@endif
-											<th>Aksi</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($forms['form_others'] as $index => $form)
-                                            <tr>
-                                                <td>{{ $loop->iteration }}</td>
-												<td>{{ $form->user->name }}</td>
-												<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
-												<td>{{ $form->kategori->name }}</td>
-												<td>{{ $form->keterangan }}</td>
-												<td>{{ number_format($form->total, 0, ',', '.') }}</td>
-												<td>
-													@if ($form->bukti1)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti2)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>
-													@if ($form->bukti3)
-														<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
-															Download
-														</a>
-													@else
-														-
-													@endif
-												</td>
-												<td>{{ $form->account_number }}</td>
-												<td>
-													@if ($form->status == 'On Progress')
-														<span class="badge badge-warning text-white">{{ $form->status }}</span>
-													@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
-														<span class="badge badge-success text-white">{{ $form->status }}</span>
-													@else
-														<span class="badge badge-danger text-white">{{ $form->status }}</span>
-													@endif
-												</td>
-												@if (auth()->user()->can('approval.approve'))
+								<div class="table-responsive">
+									<table id="dataTable-form_others">
+										<thead class="bg-light text-capitalize">
+											<tr>
+												<th>#</th>
+												<th>Nama</th>
+												<th>Tanggal</th>
+												<th>Jenis</th>
+												<th>Keterangan</th>
+												<th>Total</th>
+												<th>Bukti 1</th>
+												<th>Bukti 2</th>
+												<th>Bukti 3</th>
+												<th>Account Number</th>
+												<th>Status</th>
+												@if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+													<th>Approval</th>
+												@endif
+												<th>Aksi</th>
+											</tr>
+										</thead>
+										<tbody>
+											@foreach ($forms['form_others'] as $index => $form)
+												<tr>
+													<td>{{ $loop->iteration }}</td>
+													<td>{{ $form->user->name }}</td>
+													<td>{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
+													<td>{{ $form->kategori->name }}</td>
+													<td>{{ $form->keterangan }}</td>
+													<td>{{ number_format($form->total, 0, ',', '.') }}</td>
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'On Progress')
-															<form action="{{ route('forms.other.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Approve
-																</button>
-															</form>
-															
-															<form action="{{ route('forms.other.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-danger btn-sm">
-																	Reject
-																</button>
-															</form>
+														@if ($form->bukti1)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti1) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->approved_at)
-																{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@elseif($form->rejected_at)
-																{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
-															@else
-																-
-															@endif
+															-
 														@endif
 													</td>
-												@elseif(auth()->user()->can('final_approval.approve'))
 													<td>
-														{{-- approve / reject button --}}
-														@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
-															<form action="{{ route('forms.other.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
-																@csrf
-																@method('PUT')
-																<button type="submit" class="btn btn-success btn-sm">
-																	Final Approve
-																</button>
-															</form>
+														@if ($form->bukti2)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti2) }}" target="_blank">
+																Download
+															</a>
 														@else
-															@if ($form->final_approved_at)
-																<form action="{{ route('forms.other.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+															-
+														@endif
+													</td>
+													<td>
+														@if ($form->bukti3)
+															<a href="{{ NextCloudHelper::getFileUrl($form->bukti3) }}" target="_blank">
+																Download
+															</a>
+														@else
+															-
+														@endif
+													</td>
+													<td>{{ $form->account_number }}</td>
+													<td>
+														@if ($form->status == 'On Progress')
+															<span class="badge badge-warning text-white">{{ $form->status }}</span>
+														@elseif ($form->status == 'Approved' || $form->status == 'Final Approved')
+															<span class="badge badge-success text-white">{{ $form->status }}</span>
+														@else
+															<span class="badge badge-danger text-white">{{ $form->status }}</span>
+														@endif
+													</td>
+													@if (auth()->user()->can('approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'On Progress')
+																<form action="{{ route('forms.other.approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
 																	@csrf
 																	@method('PUT')
 																	<button type="submit" class="btn btn-success btn-sm">
-																		Open
+																		Approve
+																	</button>
+																</form>
+																
+																<form action="{{ route('forms.other.reject', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-danger btn-sm">
+																		Reject
 																	</button>
 																</form>
 															@else
-																-
+																@if ($form->approved_at)
+																	{{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@elseif($form->rejected_at)
+																	{{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
+																@else
+																	-
+																@endif
 															@endif
+														</td>
+													@elseif(auth()->user()->can('final_approval.approve'))
+														<td>
+															{{-- approve / reject button --}}
+															@if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at)
+																<form action="{{ route('forms.other.final-approve', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																	@csrf
+																	@method('PUT')
+																	<button type="submit" class="btn btn-success btn-sm">
+																		Final Approve
+																	</button>
+																</form>
+															@else
+																@if ($form->final_approved_at)
+																	<form action="{{ route('forms.other.open', $form->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this form?');">
+																		@csrf
+																		@method('PUT')
+																		<button type="submit" class="btn btn-success btn-sm">
+																			Open
+																		</button>
+																	</form>
+																@else
+																	-
+																@endif
+															@endif
+														</td>
+													@endif
+													<td>
+														@if (auth()->user()->can('forms.other.edit'))
+															<a href="{{ route('forms.other.edit', $form->id) }}" class="btn btn-warning btn-sm">
+																<i class="fas fa-edit text-white"></i>
+															</a>
+														@endif
+
+														@if (auth()->user()->can('forms.other.delete'))
+															<form action="{{ route('forms.other.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
+																@csrf
+																@method('DELETE')
+																<button type="submit" class="btn btn-danger btn-sm">
+																	<i class="fas fa-trash"></i>
+																</button>
+															</form>
 														@endif
 													</td>
-												@endif
-												<td>
-													@if (auth()->user()->can('forms.other.edit'))
-														<a href="{{ route('forms.other.edit', $form->id) }}" class="btn btn-warning btn-sm">
-															<i class="fas fa-edit text-white"></i>
-														</a>
-													@endif
-
-													@if (auth()->user()->can('forms.other.delete'))
-														<form action="{{ route('forms.other.destroy', $form->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this form?');">
-															@csrf
-															@method('DELETE')
-															<button type="submit" class="btn btn-danger btn-sm">
-																<i class="fas fa-trash"></i>
-															</button>
-														</form>
-													@endif
-												</td>
-                                            </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+												</tr>
+											@endforeach
+										</tbody>
+									</table>
+								</div>
                             </div>
                         </div>
                     </div>
@@ -820,19 +830,19 @@
     <script>
         // Initialize DataTables for each table
         if ($('#dataTable-form_up_country').length) {
-            $('#dataTable-form_up_country').DataTable({ responsive: true });
+            $('#dataTable-form_up_country').DataTable({ responsive: false });
         }
 		if ($('#dataTable-form_vehicle_running_cost').length) {
-			$('#dataTable-form_vehicle_running_cost').DataTable({ responsive: true });
+			$('#dataTable-form_vehicle_running_cost').DataTable({ responsive: false });
 		}
         if ($('#dataTable-form_entertainment_presentation').length) {
-            $('#dataTable-form_entertainment_presentation').DataTable({ responsive: true });
+            $('#dataTable-form_entertainment_presentation').DataTable({ responsive: false });
         }
         if ($('#dataTable-form_meeting_seminar').length) {
-			$('#dataTable-form_meeting_seminar').DataTable({ responsive: true });
+			$('#dataTable-form_meeting_seminar').DataTable({ responsive: false });
 		}
 		if ($('#dataTable-form_others').length) {
-			$('#dataTable-form_others').DataTable({ responsive: true });
+			$('#dataTable-form_others').DataTable({ responsive: false });
 		}
     </script>
 @endsection
diff --git a/resources/views/backend/pages/admins/index.blade.php b/resources/views/backend/pages/admins/index.blade.php
index 80da4b6..f8d468c 100644
--- a/resources/views/backend/pages/admins/index.blade.php
+++ b/resources/views/backend/pages/admins/index.blade.php
@@ -40,58 +40,60 @@
                             <div class="clearfix"></div>
                             <div class="data-tables">
                                 @include('backend.layouts.partials.messages')
-                                <table id="dataTable" class="text-center">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th width="5%">{{ __('Sl') }}</th>
-                                            <th width="10%">{{ __('Name') }}</th>
-                                            <th width="10%">{{ __('Email') }}</th>
-                                            <th width="20%">{{ __('Roles') }}</th>
-                                            <th width="5%">Region</th>
-                                            <th width="5%">Cabang</th>
-                                            <th width="15%">{{ __('Action') }}</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($admins as $admin)
+                                <div class="table-responsive">
+                                    <table id="dataTable" class="text-center">
+                                        <thead class="bg-light text-capitalize">
                                             <tr>
-                                                <td>{{ $loop->index + 1 }}</td>
-                                                <td>{{ $admin->name }}</td>
-                                                <td>{{ $admin->email }}</td>
-                                                <td>
-                                                    @foreach ($admin->roles as $role)
-                                                        <span class="badge badge-info mr-1">
-                                                            {{ $role->name }}
-                                                        </span>
-                                                    @endforeach
-                                                </td>
-                                                <td>{{ $admin->getMyCabangAndRegion()['region'] }}</td>
-                                                <td>{{ $admin->getMyCabangAndRegion()['cabang'] }}</td>
-                                                <td>
-                                                    <a class="btn btn-success text-white" href="{{ route('admin.admins.expense', $admin->id) }}">View Expense</a>
-                                                    @if (auth()->user()->can('admin.edit'))
-                                                        <a class="btn btn-success text-white"
-                                                            href="{{ route('admin.admins.edit', $admin->id) }}">Edit</a>
-                                                    @endif
-
-                                                    @if (auth()->user()->can('admin.delete'))
-                                                        <a class="btn btn-danger text-white" href="javascript:void(0);"
-                                                            onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $admin->id }}').submit(); }">
-                                                            {{ __('Delete') }}
-                                                        </a>
-
-                                                        <form id="delete-form-{{ $admin->id }}"
-                                                            action="{{ route('admin.admins.destroy', $admin->id) }}"
-                                                            method="POST" style="display: none;">
-                                                            @method('DELETE')
-                                                            @csrf
-                                                        </form>
-                                                    @endif
-                                                </td>
+                                                <th width="5%">{{ __('Sl') }}</th>
+                                                <th width="10%">{{ __('Name') }}</th>
+                                                <th width="10%">{{ __('Email') }}</th>
+                                                <th width="20%">{{ __('Roles') }}</th>
+                                                <th width="5%">Region</th>
+                                                <th width="5%">Cabang</th>
+                                                <th width="15%">{{ __('Action') }}</th>
                                             </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($admins as $admin)
+                                                <tr>
+                                                    <td>{{ $loop->index + 1 }}</td>
+                                                    <td>{{ $admin->name }}</td>
+                                                    <td>{{ $admin->email }}</td>
+                                                    <td>
+                                                        @foreach ($admin->roles as $role)
+                                                            <span class="badge badge-info mr-1">
+                                                                {{ $role->name }}
+                                                            </span>
+                                                        @endforeach
+                                                    </td>
+                                                    <td>{{ $admin->getMyCabangAndRegion()['region'] }}</td>
+                                                    <td>{{ $admin->getMyCabangAndRegion()['cabang'] }}</td>
+                                                    <td>
+                                                        <a class="btn btn-success text-white" href="{{ route('admin.admins.expense', $admin->id) }}">View Expense</a>
+                                                        @if (auth()->user()->can('admin.edit'))
+                                                            <a class="btn btn-success text-white"
+                                                                href="{{ route('admin.admins.edit', $admin->id) }}">Edit</a>
+                                                        @endif
+
+                                                        @if (auth()->user()->can('admin.delete'))
+                                                            <a class="btn btn-danger text-white" href="javascript:void(0);"
+                                                                onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $admin->id }}').submit(); }">
+                                                                {{ __('Delete') }}
+                                                            </a>
+
+                                                            <form id="delete-form-{{ $admin->id }}"
+                                                                action="{{ route('admin.admins.destroy', $admin->id) }}"
+                                                                method="POST" style="display: none;">
+                                                                @method('DELETE')
+                                                                @csrf
+                                                            </form>
+                                                        @endif
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -106,7 +108,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: true,
+                    responsive: false,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'
diff --git a/resources/views/backend/pages/audit_trail/index.blade.php b/resources/views/backend/pages/audit_trail/index.blade.php
index 6bf439c..e477919 100644
--- a/resources/views/backend/pages/audit_trail/index.blade.php
+++ b/resources/views/backend/pages/audit_trail/index.blade.php
@@ -33,50 +33,52 @@
                             <div class="clearfix"></div>
                             <div class="data-tables">
                                 @include('backend.layouts.partials.messages')
-                                <table id="dataTable" class="text-center">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th width="5%">{{ __('User') }}</th>
-                                            <th width="5%">{{ __('Ip Address') }}</th>
-                                            <th width="5%">{{ __('Action') }}</th>
-                                            <th width="15%">{{ __('Activity') }}</th>
-                                            <th width="5%">Browser</th>
-                                            <th width="15%">User Agent</th>
-                                            <th width="5%">Tanggal</th>
-                                            <th width="5%">Waktu</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($data as $item)
+                                <div class="table-responsive">
+                                    <table id="dataTable" class="text-center">
+                                        <thead class="bg-light text-capitalize">
                                             <tr>
-												<td>
-													{{ $item->user ? $item->user->username : preg_replace('/\).*$/', '', explode('(', $item->activity)[1]) }}
-												</td>
-												<td>{{ $item->ip_address }}</td>
-												<td>
-													@php
-														$color = 'info';
-														if ($item->action == 'Create') {
-															$color = 'success';
-														} elseif ($item->action == 'Update') {
-															$color = 'warning';
-														} elseif ($item->action == 'Delete') {
-															$color = 'danger';
-														}
-													@endphp
-													<div class="badge badge-{{ $color }} text-white">
-														{{ $item->action }}
-													</div>
-												</td>
-												<td>{{ $item->activity }}</td>
-												<td>{{ $item->browser }}</td>
-												<td>{{ $item->user_agent }}</td>
-                                                <td>{{ $item->created_at }}</td>
-                                                <td>{{ $item->created_at->diffForHumans() }}</td>
+                                                <th width="5%">{{ __('User') }}</th>
+                                                <th width="5%">{{ __('Ip Address') }}</th>
+                                                <th width="5%">{{ __('Action') }}</th>
+                                                <th width="15%">{{ __('Activity') }}</th>
+                                                <th width="5%">Browser</th>
+                                                <th width="15%">User Agent</th>
+                                                <th width="5%">Tanggal</th>
+                                                <th width="5%">Waktu</th>
                                             </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($data as $item)
+                                                <tr>
+                                                    <td>
+                                                        {{ $item->user ? $item->user->username : preg_replace('/\).*$/', '', explode('(', $item->activity)[1]) }}
+                                                    </td>
+                                                    <td>{{ $item->ip_address }}</td>
+                                                    <td>
+                                                        @php
+                                                            $color = 'info';
+                                                            if ($item->action == 'Create') {
+                                                                $color = 'success';
+                                                            } elseif ($item->action == 'Update') {
+                                                                $color = 'warning';
+                                                            } elseif ($item->action == 'Delete') {
+                                                                $color = 'danger';
+                                                            }
+                                                        @endphp
+                                                        <div class="badge badge-{{ $color }} text-white">
+                                                            {{ $item->action }}
+                                                        </div>
+                                                    </td>
+                                                    <td>{{ $item->activity }}</td>
+                                                    <td>{{ $item->browser }}</td>
+                                                    <td>{{ $item->user_agent }}</td>
+                                                    <td>{{ $item->created_at }}</td>
+                                                    <td>{{ $item->created_at->diffForHumans() }}</td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -91,7 +93,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: true,
+                    responsive: false,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'
diff --git a/resources/views/backend/pages/master/category/index.blade.php b/resources/views/backend/pages/master/category/index.blade.php
index c1559e4..129507f 100644
--- a/resources/views/backend/pages/master/category/index.blade.php
+++ b/resources/views/backend/pages/master/category/index.blade.php
@@ -35,45 +35,47 @@
                     <div class="clearfix"></div>
                     <div class="dataTables_wrapper dt-bootstrap4 mt-2">
                         @include('backend.layouts.partials.messages')
-						<table id="dataTable"
-                        	class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
-                            style="width:100%">
-                            <thead class="bg-light text-capitalize">
-                                <tr>
-									<th>#</th>
-                                    <th>Nama</th>
-									<th>Account Number</th>
-									<th>Aksi</th>
-								</tr>
-                            </thead>
-							<tbody>
-								@foreach ($categories as $category)
-									<tr>
-										<td>{{ $loop->index + 1 }}</td>
-                                        <td>{{ $category->name }}</td>
-										<td>{{ $category->account_number }}</td>
-										<td>
-											@if (auth()->user()->can('admin.edit'))
-                                                <a class="btn btn-success btn-sm text-white" href="{{ route('admin.category.edit', $category->id) }}">Edit</a>
-                                            @endif
-                                            @if (auth()->user()->can('admin.delete'))
-                                                <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
-                                                    onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $category->id }}').submit(); }">
-                                                    {{ __('Delete') }}
-                                                </a>
+                        <div class="table-responsive">
+                            <table id="dataTable"
+                                class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
+                                style="width:100%">
+                                <thead class="bg-light text-capitalize">
+                                    <tr>
+                                        <th>#</th>
+                                        <th>Nama</th>
+                                        <th>Account Number</th>
+                                        <th>Aksi</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach ($categories as $category)
+                                        <tr>
+                                            <td>{{ $loop->index + 1 }}</td>
+                                            <td>{{ $category->name }}</td>
+                                            <td>{{ $category->account_number }}</td>
+                                            <td>
+                                                @if (auth()->user()->can('admin.edit'))
+                                                    <a class="btn btn-success btn-sm text-white" href="{{ route('admin.category.edit', $category->id) }}">Edit</a>
+                                                @endif
+                                                @if (auth()->user()->can('admin.delete'))
+                                                    <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
+                                                        onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $category->id }}').submit(); }">
+                                                        {{ __('Delete') }}
+                                                    </a>
 
-                                                <form id="delete-form-{{ $category->id }}"
-                                                    action="{{ route('admin.category.destroy', $category->id) }}"
-                                                    method="POST" style="display: none;">
-                                                    @method('DELETE')
-                                                    @csrf
-                                                </form>
-                                            @endif
-										</td>
-									</tr>
-								@endforeach
-							</tbody>
-						</table>
+                                                    <form id="delete-form-{{ $category->id }}"
+                                                        action="{{ route('admin.category.destroy', $category->id) }}"
+                                                        method="POST" style="display: none;">
+                                                        @method('DELETE')
+                                                        @csrf
+                                                    </form>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
 					</div>
                 </div>
             </div>
@@ -86,7 +88,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: true,
+                    responsive: false,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'
diff --git a/resources/views/backend/pages/master/cost/index.blade.php b/resources/views/backend/pages/master/cost/index.blade.php
index 8efb131..b21dffb 100644
--- a/resources/views/backend/pages/master/cost/index.blade.php
+++ b/resources/views/backend/pages/master/cost/index.blade.php
@@ -35,45 +35,47 @@
                     <div class="clearfix"></div>
                     <div class="dataTables_wrapper dt-bootstrap4 mt-2">
                         @include('backend.layouts.partials.messages')
-						<table id="dataTable"
-                        	class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
-                            style="width:100%">
-                            <thead class="bg-light text-capitalize">
-                                <tr>
-									<th>#</th>
-                                    <th>Code</th>
-									<th>Nama</th>
-									<th>Aksi</th>
-								</tr>
-                            </thead>
-							<tbody>
-								@foreach ($costs as $cost)
-									<tr>
-										<td>{{ $loop->index + 1 }}</td>
-                                        <td>{{ $cost->code }}</td>
-										<td>{{ $cost->name }}</td>
-										<td>
-											@if (auth()->user()->can('admin.edit'))
-                                                <a class="btn btn-success btn-sm text-white" href="{{ route('admin.cost.edit', $cost->id) }}">Edit</a>
-                                            @endif
-                                            @if (auth()->user()->can('admin.delete'))
-                                                <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
-                                                    onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $cost->id }}').submit(); }">
-                                                    {{ __('Delete') }}
-                                                </a>
+                        <div class="table-responsive">
+                            <table id="dataTable"
+                                class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
+                                style="width:100%">
+                                <thead class="bg-light text-capitalize">
+                                    <tr>
+                                        <th>#</th>
+                                        <th>Code</th>
+                                        <th>Nama</th>
+                                        <th>Aksi</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach ($costs as $cost)
+                                        <tr>
+                                            <td>{{ $loop->index + 1 }}</td>
+                                            <td>{{ $cost->code }}</td>
+                                            <td>{{ $cost->name }}</td>
+                                            <td>
+                                                @if (auth()->user()->can('admin.edit'))
+                                                    <a class="btn btn-success btn-sm text-white" href="{{ route('admin.cost.edit', $cost->id) }}">Edit</a>
+                                                @endif
+                                                @if (auth()->user()->can('admin.delete'))
+                                                    <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
+                                                        onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $cost->id }}').submit(); }">
+                                                        {{ __('Delete') }}
+                                                    </a>
 
-                                                <form id="delete-form-{{ $cost->id }}"
-                                                    action="{{ route('admin.cost.destroy', $cost->id) }}"
-                                                    method="POST" style="display: none;">
-                                                    @method('DELETE')
-                                                    @csrf
-                                                </form>
-                                            @endif
-										</td>
-									</tr>
-								@endforeach
-							</tbody>
-						</table>
+                                                    <form id="delete-form-{{ $cost->id }}"
+                                                        action="{{ route('admin.cost.destroy', $cost->id) }}"
+                                                        method="POST" style="display: none;">
+                                                        @method('DELETE')
+                                                        @csrf
+                                                    </form>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
 					</div>
                 </div>
             </div>
@@ -86,7 +88,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: true,
+                    responsive: false,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'
diff --git a/resources/views/backend/pages/master/rayon/index.blade.php b/resources/views/backend/pages/master/rayon/index.blade.php
index 396b561..ddd42c9 100644
--- a/resources/views/backend/pages/master/rayon/index.blade.php
+++ b/resources/views/backend/pages/master/rayon/index.blade.php
@@ -35,45 +35,47 @@
                     <div class="clearfix"></div>
                     <div class="dataTables_wrapper dt-bootstrap4 mt-2">
                         @include('backend.layouts.partials.messages')
-						<table id="dataTable"
-                        	class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
-                            style="width:100%">
-                            <thead class="bg-light text-capitalize">
-                                <tr>
-									<th>#</th>
-                                    <th>Code</th>
-									<th>Nama</th>
-									<th>Aksi</th>
-								</tr>
-                            </thead>
-							<tbody>
-								@foreach ($rayons as $rayon)
-									<tr>
-										<td>{{ $loop->index + 1 }}</td>
-                                        <td>{{ $rayon->code }}</td>
-										<td>{{ $rayon->name }}</td>
-										<td>
-											@if (auth()->user()->can('admin.edit'))
-                                                <a class="btn btn-success btn-sm text-white" href="{{ route('admin.rayon.edit', $rayon->id) }}">Edit</a>
-                                            @endif
-                                            @if (auth()->user()->can('admin.delete'))
-                                                <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
-                                                    onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $rayon->id }}').submit(); }">
-                                                    {{ __('Delete') }}
-                                                </a>
+                        <div class="table-responsive">
+                            <table id="dataTable"
+                                class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
+                                style="width:100%">
+                                <thead class="bg-light text-capitalize">
+                                    <tr>
+                                        <th>#</th>
+                                        <th>Code</th>
+                                        <th>Nama</th>
+                                        <th>Aksi</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach ($rayons as $rayon)
+                                        <tr>
+                                            <td>{{ $loop->index + 1 }}</td>
+                                            <td>{{ $rayon->code }}</td>
+                                            <td>{{ $rayon->name }}</td>
+                                            <td>
+                                                @if (auth()->user()->can('admin.edit'))
+                                                    <a class="btn btn-success btn-sm text-white" href="{{ route('admin.rayon.edit', $rayon->id) }}">Edit</a>
+                                                @endif
+                                                @if (auth()->user()->can('admin.delete'))
+                                                    <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
+                                                        onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $rayon->id }}').submit(); }">
+                                                        {{ __('Delete') }}
+                                                    </a>
 
-                                                <form id="delete-form-{{ $rayon->id }}"
-                                                    action="{{ route('admin.rayon.destroy', $rayon->id) }}"
-                                                    method="POST" style="display: none;">
-                                                    @method('DELETE')
-                                                    @csrf
-                                                </form>
-                                            @endif
-										</td>
-									</tr>
-								@endforeach
-							</tbody>
-						</table>
+                                                    <form id="delete-form-{{ $rayon->id }}"
+                                                        action="{{ route('admin.rayon.destroy', $rayon->id) }}"
+                                                        method="POST" style="display: none;">
+                                                        @method('DELETE')
+                                                        @csrf
+                                                    </form>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
 					</div>
                 </div>
             </div>
diff --git a/resources/views/backend/pages/roles/index.blade.php b/resources/views/backend/pages/roles/index.blade.php
index 70f44ac..7eb2a0c 100644
--- a/resources/views/backend/pages/roles/index.blade.php
+++ b/resources/views/backend/pages/roles/index.blade.php
@@ -38,56 +38,58 @@
                             <div class="clearfix"></div>
                             <div class="dataTables_wrapper dt-bootstrap4">
                                 @include('backend.layouts.partials.messages')
-                                <table id="dataTable"
-                                    class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
-                                    style="width:100%">
-                                    <thead class="bg-light text-capitalize">
-                                        <tr>
-                                            <th width="5%">{{ __('Sl') }}</th>
-                                            <th width="10%">{{ __('Role Name') }}</th>
-                                            <th width="30%">{{ __('Permission List') }}</th>
-                                            <th width="10%">{{ __('Action') }}</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach ($roles as $role)
+                                <div class="table-responsive">
+                                    <table id="dataTable"
+                                        class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
+                                        style="width:100%">
+                                        <thead class="bg-light text-capitalize">
                                             <tr>
-                                                <td>{{ $loop->index + 1 }}</td>
-                                                <td>{{ $role->name }}</td>
-                                                <td>
-                                                    @foreach ($role->permissions as $permission)
-                                                        <span class="badge badge-info mr-1">
-                                                            {{ $permission->name }}
-                                                        </span>
-                                                    @endforeach
-                                                </td>
-                                                <td>
-                                                    @if (auth()->user()->can('admin.edit'))
-                                                        <a class="btn btn-success btn-sm text-white"
-                                                            href="{{ route('admin.roles.edit', $role->id) }}">Edit</a>
-                                                    @endif
-                                                    @if (auth()->user()->can('admin.delete'))
-                                                        <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
-                                                            onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $role->id }}').submit(); }">
-                                                            {{ __('Delete') }}
-                                                        </a>
-
-                                                        <form id="delete-form-{{ $role->id }}"
-                                                            action="{{ route('admin.roles.destroy', $role->id) }}"
-                                                            method="POST" style="display: none;">
-                                                            @method('DELETE')
-                                                            @csrf
-                                                        </form>
-                                                    @endif
-                                                    <a class="btn btn-primary btn-sm text-white"
-                                                        href="{{ route('auth.menurole.index', $role->id) }}">Assign
-                                                        Menus</a>
-
-                                                </td>
+                                                <th width="5%">{{ __('Sl') }}</th>
+                                                <th width="10%">{{ __('Role Name') }}</th>
+                                                <th width="30%">{{ __('Permission List') }}</th>
+                                                <th width="10%">{{ __('Action') }}</th>
                                             </tr>
-                                        @endforeach
-                                    </tbody>
-                                </table>
+                                        </thead>
+                                        <tbody>
+                                            @foreach ($roles as $role)
+                                                <tr>
+                                                    <td>{{ $loop->index + 1 }}</td>
+                                                    <td>{{ $role->name }}</td>
+                                                    <td>
+                                                        @foreach ($role->permissions as $permission)
+                                                            <span class="badge badge-info mr-1">
+                                                                {{ $permission->name }}
+                                                            </span>
+                                                        @endforeach
+                                                    </td>
+                                                    <td>
+                                                        @if (auth()->user()->can('admin.edit'))
+                                                            <a class="btn btn-success btn-sm text-white"
+                                                                href="{{ route('admin.roles.edit', $role->id) }}">Edit</a>
+                                                        @endif
+                                                        @if (auth()->user()->can('admin.delete'))
+                                                            <a class="btn btn-danger text-white btn-sm" href="javascript:void(0);"
+                                                                onclick="event.preventDefault(); if(confirm('Are you sure you want to delete?')) { document.getElementById('delete-form-{{ $role->id }}').submit(); }">
+                                                                {{ __('Delete') }}
+                                                            </a>
+
+                                                            <form id="delete-form-{{ $role->id }}"
+                                                                action="{{ route('admin.roles.destroy', $role->id) }}"
+                                                                method="POST" style="display: none;">
+                                                                @method('DELETE')
+                                                                @csrf
+                                                            </form>
+                                                        @endif
+                                                        <a class="btn btn-primary btn-sm text-white"
+                                                            href="{{ route('auth.menurole.index', $role->id) }}">Assign
+                                                            Menus</a>
+
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -103,7 +105,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: true,
+                    responsive: false,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'