diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index 0838748..077d44a 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -27,7 +27,7 @@ if (!function_exists('listSekolah')) {
             $res = [];
             $d = '';
             foreach (json_decode($sekolah) as $key => $value) {
-                $d .= '<span class="badge badge-success">'.sekolah($value)->nama_sekolah.'</span><br>';
+                $d .= '<span class="badge bg-success-light text-success">'.sekolah($value)->nama_sekolah.'</span><br>';
                 
             }
             array_push($res, $d);
@@ -223,7 +223,7 @@ if (!function_exists('kuesionerLogStatus')) {
     function kuesionerLogStatus($KuesionerId)
     {
         $log  = KuesionerLog::where('kuesioner_id',$KuesionerId)->orderBy('KuesionerLogId','DESC')->first();
-        $progress = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+        $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
         return $progress;
     }
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 9251a92..c789f0d 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -73,8 +73,8 @@ class HomeController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             if(($row->level+1) == 1){
                 $jenis_usulan = 'Adiwiyata Kab/Kota';
diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php
index 6a032a4..ab53ce2 100644
--- a/app/Http/Controllers/KuesionerController.php
+++ b/app/Http/Controllers/KuesionerController.php
@@ -73,28 +73,28 @@ class KuesionerController extends Controller
 
             $status = '';
             if($row->status == 0){
-                $status = '<span class="badge badge-info">Belum Diverifikasi</span>';
+                $status = '<span class="badge bg-info-light text-info">Belum Diverifikasi</span>';
             }elseif($row->status == 1){
-                $status = '<span class="badge badge-success">Sudah Diverifikasi</span>';
+                $status = '<span class="badge bg-success-light text-success">Sudah Diverifikasi</span>';
             }elseif($row->status == 2){
-                $status = '<span class="badge badge-danger">Ditolak</span>';
+                $status = '<span class="badge bg-danger-light text-danger">Ditolak</span>';
             }else{
                 $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
-                $status = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+                $status = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
             }
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary mt-1">'.@$row->profile->status_sekolah.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-secondary text-left mt-1">'.@$row->profile->alamat_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary mt-1">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-secondary text-secondary text-left mt-1">'.@$row->profile->alamat_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'alamat_sekolah'    => $row->sekolah->alamat_sekolah,
                 'tingkat_sekolah'   => $row->sekolah->tingkat->name,
diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php
index a98d148..df88e29 100644
--- a/app/Http/Controllers/Management/UserController.php
+++ b/app/Http/Controllers/Management/UserController.php
@@ -179,7 +179,7 @@ class UserController extends Controller
         $data['title'] = $this->title;
         $data['route'] = $this->route;
         $data['keyId'] = $id;
-        $data['item'] = User::with('sekolah')->where('id',$keyId)->first();
+        $data['item'] = User::with('profile')->where('id',$keyId)->first();
         $data['group'] = MasterGroup::where('MsGroupId','!=',1)->get();
         return view($this->template.'.form',$data);
     }
diff --git a/app/Http/Controllers/Management/UserSekolahController.php b/app/Http/Controllers/Management/UserSekolahController.php
index 10ec1e2..c9d92ae 100644
--- a/app/Http/Controllers/Management/UserSekolahController.php
+++ b/app/Http/Controllers/Management/UserSekolahController.php
@@ -163,7 +163,7 @@ class UserSekolahController extends Controller
         $data['title'] = $this->title;
         $data['route'] = $this->route;
         $data['keyId'] = $id;
-        $data['item'] = User::with('sekolah')->where('id',$keyId)->first();
+        $data['item'] = User::with('profile')->where('id',$keyId)->first();
         return view($this->template.'.form',$data);
     }
 
diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
index e5c12b2..f060470 100644
--- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
+++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
@@ -105,24 +105,24 @@ class AdministrasiController extends Controller
             
             if(@$dok){
                 if(@$dok->status == 1){
-                    $labelDok = '<span class="badge badge-success">Dokumen Di Verifikasi</span>';
+                    $labelDok = '<span class="badge bg-success-light">Dokumen Di Verifikasi</span>';
                 }elseif(@$dok->status == 2){
-                    $labelDok = '<span class="badge badge-danger">Dokumen Di Tolak</span>';
+                    $labelDok = '<span class="badge bg-danger-light">Dokumen Di Tolak</span>';
                 }else{
-                    $labelDok = '<span class="badge badge-warning">Menuggu Verifikasi Dokumen</span>';
+                    $labelDok = '<span class="badge bg-warning-light">Menuggu Verifikasi Dokumen</span>';
                 }
             }else{
-                $labelDok = '<span class="badge badge-danger">Belum Upload Dokumen</span>';
+                $labelDok = '<span class="badge bg-danger-light">Belum Upload Dokumen</span>';
             }
 
             if($row->status == 0){
-                $labelDok .= '<br><span class="badge badge-danger">Menunggu Usulan Dari Dinas/Sudin</span>';
+                $labelDok .= '<br><span class="badge bg-danger-light">Menunggu Usulan Dari Dinas/Sudin</span>';
             }
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
@@ -131,10 +131,10 @@ class AdministrasiController extends Controller
                 'nama'              => $sekolah,
                 'tahun'             => $row->tahun,
                 'labelDok'          => $labelDok,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'penghargaan'       => $penghargaan,
-                'jenis_usulan'      => '<span class="badge badge-success">'.$jenis_usulan.'</span>',
+                'jenis_usulan'      => '<span class="badge bg-success-light">'.$jenis_usulan.'</span>',
                 'usulan'            => $fileUsulan,
                 'action'            => $action,
             ];
diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index f1b535d..8221480 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -102,32 +102,32 @@ class CSAKController extends Controller
 
             $penilaian = '';
             $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
-                $penilaian .= '<div class="text-white bg-secondary px-1 py-1 rounded w-100">';
+                $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Sekolah </span>';
                         $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
-                $penilaian .= '<div class="text-white bg-primary px-1 py-1 rounded w-100">';
+                $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Kota</span>';
                         $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
             $penilaian .= '</div>';
-            // $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+            // $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-secondary text-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'penghargaan'       => $penghargaan,
                 'penilaian'         => $penilaian,
diff --git a/app/Http/Controllers/Modules/Usulan/CSAMController.php b/app/Http/Controllers/Modules/Usulan/CSAMController.php
index f44ff55..d82882f 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAMController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAMController.php
@@ -50,8 +50,8 @@ class CSAMController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
diff --git a/app/Http/Controllers/Modules/Usulan/CSANController.php b/app/Http/Controllers/Modules/Usulan/CSANController.php
index c20088e..0277b24 100644
--- a/app/Http/Controllers/Modules/Usulan/CSANController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSANController.php
@@ -50,8 +50,8 @@ class CSANController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 45a4d75..111e171 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -102,19 +102,19 @@ class CSAPController extends Controller
             $penilaian = '';
 
             $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
-                $penilaian .= '<div class="text-white bg-secondary px-1 py-1 rounded w-100">';
+                $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Sekolah </span>';
                         $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
-                $penilaian .= '<div class="text-white bg-primary px-1 py-1 rounded w-100">';
+                $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Kota</span>';
                         $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
-                $penilaian .= '<div class="text-white bg-success px-1 py-1 rounded w-100">';
+                $penilaian .= '<div class="text-success bg-success-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Provinsi</span>';
                         $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('provinsi',$row->ms_sekolah_id).'</h5>';
@@ -124,8 +124,8 @@ class CSAPController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index c615ac3..bb2fda9 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -71,7 +71,7 @@ class ProfileController extends Controller
             $kuesioner  = Kuesioner::where('ms_sekolah_id',$row->MsSekolahId)->where('tahun',date('Y'))->orderBy('created_at','DESC')->first();
             $log  = KuesionerLog::where('kuesioner_id',@$kuesioner->KuesionerId)->orderBy('created_at','DESC')->first();
             if(@$log){
-                $progress = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+                $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
             }else{
                 $progress = '';
             }
@@ -99,13 +99,13 @@ class ProfileController extends Controller
             }
 
             $penilaian = '';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge bg-secondary text-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'</span></br>';
             if(($kuesioner->level+1) == 1){
-                $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
             }
             if(($kuesioner->level+1) == 2){
-                $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
-                $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
             }
 
             $_data[] = [
@@ -113,7 +113,7 @@ class ProfileController extends Controller
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->npsn,
                 'nama'              => $row->nama_sekolah,
-                'status_level'      => '<span class="badge badge-success">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->kabupaten->name,
                 'tanggal_level'     => '-',
                 'penghargaan'       => $penghargaan,
diff --git a/public/assets/css/custom.css b/public/assets/css/custom.css
index 0c19d86..96cdf02 100644
--- a/public/assets/css/custom.css
+++ b/public/assets/css/custom.css
@@ -1,3 +1,14 @@
+.wrap th, 
+.wrap td {
+    max-width: 100%; /* Sesuaikan max-width kolom */
+}
+.wrap td span {
+    white-space: normal !important; /* Pastikan teks bisa wrap */
+    word-wrap: break-word; /* Bungkus kata yang panjang */
+}
+.nav-link{
+        border-radius: 0px!important;
+    }
 .pageNumber{ list-style:none; padding:0px; margin: 0px;}
     .pageNumber .page{ display: inline-block; padding: 10px;}
     .pageNumber .page:hover,.resume:hover,.progress_usulan:hover{cursor: pointer!important;}
@@ -36,8 +47,19 @@
 }
 .subheader{margin-bottom: 20px;}
 
-
+.table-bordered th, .table-bordered td{border: none!important;}
+.table-bordered{border: none;}
+.table-hover tbody tr:hover{box-shadow: none;}
 /* Color */
+.border-success{
+	border: 1px solid #1f6c3c!important;
+}
+.border-primary{
+	border: 1px solid #4765c0!important;
+}
+.border-secondary{
+	border: 1px solid #D0D0D0!important;
+}
 .text-success{
 	color: #1f6c3c!important;
 }
@@ -47,6 +69,9 @@
 .bg-secondary{
 	background: #F3F4F6!important;
 }
+.bg-success{
+	background: #1f6c3c!important;
+}
 .bg-success-light{
 	background: #dcfce7;
 }
@@ -65,9 +90,20 @@
 .bg-warning-light{
 	background: #fef9c3;
 }
+.bg-danger-light{
+	background: #fc6a6a;
+}
+.text-danger{
+	color: #7D0A0A!important;
+}
 .btn-primary{
-	background: #4796f1;
-	border: 1px solid #4796f1;
+	background: #4765c0;
+/*	border: 1px solid #4796f1;*/
+	border: none;
+}
+.btn-success{
+	border: none;
+	background: #1f6c3c!important;
 }
 /* Color */
 
diff --git a/resources/views/include/breadcrumbs.blade.php b/resources/views/include/breadcrumbs.blade.php
new file mode 100644
index 0000000..50bbb3f
--- /dev/null
+++ b/resources/views/include/breadcrumbs.blade.php
@@ -0,0 +1,13 @@
+@if(@$breadcrumbs)
+<ol class="breadcrumb page-breadcrumb">
+    @foreach($breadcrumbs as $dataBread)
+    <li class="breadcrumb-item {{@$dataBread['active'] == true ? 'active' : ''}}">
+        @if(@$dataBread['url'])
+        <a href="{{@$dataBread['url']}}">{{$dataBread['name']}}</a>
+        @else
+        {{$dataBread['name']}}
+        @endif
+    </li>
+    @endforeach
+</ol>
+@endif
\ No newline at end of file
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index f3d5f8e..5ad2dc4 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -34,14 +34,7 @@
                 margin: 0px;
             }
 
-            .wrap th, 
-            .wrap td {
-                max-width: 100%; /* Sesuaikan max-width kolom */
-            }
-            .wrap td span {
-                white-space: normal !important; /* Pastikan teks bisa wrap */
-                word-wrap: break-word; /* Bungkus kata yang panjang */
-            }
+            
         </style>
         @yield('page-css')
     </head>
@@ -60,7 +53,7 @@
                     <!-- the #js-page-content id is needed for some plugins to initialize -->
                     <main id="js-page-content" role="main" class="page-content">
                         @include('include.alert')
-                        @yield('breadcrumbs')
+                        @include('include.breadcrumbs')
                         @yield('content')
                     </main>
                     <!-- this overlay is activated only when mobile menu is triggered -->
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php
index 71fafaf..44f75f6 100644
--- a/resources/views/modules/dashboard/admin.blade.php
+++ b/resources/views/modules/dashboard/admin.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> Dashboard
+        Dashboard
     </h1>
 </div>
 <div class="row">
@@ -111,7 +111,7 @@
             <div class="panel-container show">
                 <div class="panel-content">
                     <div class="table-responsive">
-                        <table class="table table-bordered table-hover table-striped w-100" 
+                        <table class="table w-100" 
                             data-search="true"
                             data-toggle="table"
                             data-pagination="true"
@@ -123,8 +123,8 @@
                             data-page-size="10"
                             data-id-field="id"
                             id="grid-data">
-                              <thead>
-                                <tr class="table-primary text-white">
+                              <thead class="bg-primary-light text-primary">
+                                <tr>
                                   <th data-field="no">No</th>
                                   <th data-field="npsn">NPSN</th>
                                   <th data-field="nama_sekolah">Nama Sekolah</th>
diff --git a/resources/views/modules/dashboard/sekolah.blade.php b/resources/views/modules/dashboard/sekolah.blade.php
index 21e24f3..ec04236 100644
--- a/resources/views/modules/dashboard/sekolah.blade.php
+++ b/resources/views/modules/dashboard/sekolah.blade.php
@@ -11,7 +11,7 @@
             </h1>
         </div>
     </div>
-    <div class="col-md-6">
+    <div class="col-md-6 pr-0 mt-2">
         <div class="card h-100">
             <div class="card-body">
                 <div class="row">
@@ -56,7 +56,7 @@
             </div>
         </div>
     </div>
-    <div class="col-md-6">
+    <div class="col-md-6 pr-0 mt-2">
         <div class="card h-100">
             <div class="card-header bg-white">
                 <h5 class="fw-500 mb-0">Status Usulan</h5>
@@ -148,7 +148,7 @@
     </div>
 </div>
 <div class="row mt-2">
-    <div class="col-sm-6 col-xl-3">
+    <div class="col-sm-6 col-xl-3 pr-0">
         <div class="card border-none">
             <div class="card-body">
                 <div class="d-flex gap-3 flex-row">
@@ -163,7 +163,7 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-6 col-xl-3">
+    <div class="col-sm-6 col-xl-3 pr-0">
         <div class="card border-none">
             <div class="card-body">
                 <div class="d-flex gap-3 flex-row">
@@ -178,7 +178,7 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-6 col-xl-3">
+    <div class="col-sm-6 col-xl-3 pr-0">
         <div class="card border-none">
             <div class="card-body">
                 <div class="d-flex gap-3 flex-row">
@@ -193,7 +193,7 @@
             </div>
         </div>
     </div>
-    <div class="col-sm-6 col-xl-3">
+    <div class="col-sm-6 col-xl-3 pr-0">
         <div class="card border-none">
             <div class="card-body">
                 <div class="d-flex gap-3 flex-row">
diff --git a/resources/views/modules/kuesioner/form.blade.php b/resources/views/modules/kuesioner/form.blade.php
index 55e21a9..88cce5f 100644
--- a/resources/views/modules/kuesioner/form.blade.php
+++ b/resources/views/modules/kuesioner/form.blade.php
@@ -22,13 +22,13 @@
                                 <i class="fal fa-home"></i>
                             </div>
                             <div>
-                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
-                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                                <h5 class="fw-700 mb-1">{{$nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$npsn}}</p>
                             </div>
                             <div class="d-flex flex-column gap-1">
-                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
-                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
-                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                                <span class="badge bg-primary-light text-primary">{{$tingkat}}</span>
+                                <span class="badge bg-success-light text-success">{{$status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($npsn)}}</span>
                             </div>
                         </div>  
                     </div>
diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 45f0b1f..c852fa8 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100 wrap" 
+                    <table class="table w-100 wrap" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="status_level">Status Level</th>
diff --git a/resources/views/modules/management/role/akses/form.blade.php b/resources/views/modules/management/role/akses/form.blade.php
index 9d3c640..9cd8744 100644
--- a/resources/views/modules/management/role/akses/form.blade.php
+++ b/resources/views/modules/management/role/akses/form.blade.php
@@ -16,8 +16,8 @@
 <div class="row">
     <div class="col-lg-12">
         <div class="card">
-            <div class="card-header">
-                <i class="fal fa-align-justify"></i> {{$title}}
+            <div class="card-header bg-white">
+                <h5 class="mb-0 fw-500">{{$title}}</h5>
             </div>
             <form action="{{route($route.'.store')}}" method="POST" class="">
             {{csrf_field()}}
diff --git a/resources/views/modules/management/role/index.blade.php b/resources/views/modules/management/role/index.blade.php
index 117d29e..843ba94 100644
--- a/resources/views/modules/management/role/index.blade.php
+++ b/resources/views/modules/management/role/index.blade.php
@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </button>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
-                        <tr class="table-primary text-white">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-width="50" data-field="action">#</th>
                           <th data-width="50" data-field="no">No</th>
                           <th data-field="name">Name</th>
diff --git a/resources/views/modules/management/user/index.blade.php b/resources/views/modules/management/user/index.blade.php
index b054ae4..cdb40ab 100644
--- a/resources/views/modules/management/user/index.blade.php
+++ b/resources/views/modules/management/user/index.blade.php
@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
-                        <tr class="table-primary text-white">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="role">Role</th>
diff --git a/resources/views/modules/management/user_sekolah/index.blade.php b/resources/views/modules/management/user_sekolah/index.blade.php
index c880648..d3c99df 100644
--- a/resources/views/modules/management/user_sekolah/index.blade.php
+++ b/resources/views/modules/management/user_sekolah/index.blade.php
@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </button>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
-                        <tr class="table-primary text-white">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="name">Name</th>
diff --git a/resources/views/modules/master/form-kriteria/index.blade.php b/resources/views/modules/master/form-kriteria/index.blade.php
index a1ed30f..02f05ae 100644
--- a/resources/views/modules/master/form-kriteria/index.blade.php
+++ b/resources/views/modules/master/form-kriteria/index.blade.php
@@ -2,23 +2,10 @@
 
 @section('page-css')
 @endsection
-@section('breadcrumbs')
-<ol class="breadcrumb page-breadcrumb">
-    @foreach($breadcrumbs as $dataBread)
-    <li class="breadcrumb-item {{@$dataBread['active'] == true ? 'active' : ''}}">
-        @if(@$dataBread['url'])
-        <a href="{{@$dataBread['url']}}">{{$dataBread['name']}}</a>
-        @else
-        {{$dataBread['name']}}
-        @endif
-    </li>
-    @endforeach
-</ol>
-@endsection
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +19,7 @@
                         </a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +31,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
-                        <tr class="table-primary text-white">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="kategori">Kategori</th>
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php
index ed7e089..9fcb678 100644
--- a/resources/views/modules/profile/admin.blade.php
+++ b/resources/views/modules/profile/admin.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <!-- <th data-field="action">#</th> -->
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
diff --git a/resources/views/modules/profile/sekolah.blade.php b/resources/views/modules/profile/sekolah.blade.php
index 5b8dfd8..c382b21 100644
--- a/resources/views/modules/profile/sekolah.blade.php
+++ b/resources/views/modules/profile/sekolah.blade.php
@@ -2,36 +2,6 @@
 
 @section('page-css')
 <link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-</style>
 @endsection
 @section('content')
 
diff --git a/resources/views/modules/usulan/administrasi/index.blade.php b/resources/views/modules/usulan/administrasi/index.blade.php
index 9cd4ac7..c602465 100644
--- a/resources/views/modules/usulan/administrasi/index.blade.php
+++ b/resources/views/modules/usulan/administrasi/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -113,7 +113,7 @@
                     <div id="toolbar">
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,7 +126,7 @@
                     data-id-field="id"
                     id="grid-data">
                       <thead class="text-white">
-                        <tr class="table-primary">
+                        <tr class="bg-primary-light text-primary">
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="tahun">Tahun</th>
@@ -160,7 +160,7 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <div class="alert alert-info">
+                    <div class="alert bg-primary-light text-primary mb-2">
                         <p class="mb-0"><i>Silahkan Upload Kembali File, Untuk Update Data</i></p>
                     </div>
                     <div class="bodyModal"></div>
diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php
index 033dc3e..ba553c4 100644
--- a/resources/views/modules/usulan/csak/form.blade.php
+++ b/resources/views/modules/usulan/csak/form.blade.php
@@ -42,12 +42,38 @@
 </style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{$sekolah->nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$sekolah->npsn}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{$sekolah->tingkat->name}}</span>
+                                <span class="badge bg-success-light text-success">{{$sekolah->status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($sekolah->npsn)}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -61,307 +87,215 @@
         <form method="POST" id="form">
         <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
         {{csrf_field()}}
-            <div class="card">
-                <div class="card-body">
+            <div class="">
+                <div class="">
                     <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{$sekolah->npsn}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{$sekolah->nama_sekolah}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{$sekolah->tingkat->name}}</span> <span class="badge badge-success">{{$sekolah->status}}</span></td>
-                                </tr>
-                            </table>
-                        </div>
+                        
                         <div class="col-12">
-                            <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                    <ul class="nav nav-pills" role="tablist">
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
-                                    <!-- <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li> -->
-                                    <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
-                                </ul>
+                            <div class="card">
+                                <div class="card-body">
+                                    <ul class="nav nav-tabs" role="tablist">
+                                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
+                                        <!-- <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li> -->
+                                        <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
+                                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
+                                    </ul>
+                                </div>
                             </div>
                             
                             <div class="tab-content py-3">
                                 <div class="tab-pane fade" id="profile" role="tabpanel">
-                                    <table class="table table-nobordered">
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Profile Sekolah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>NPSN</td>
-                                            <td>{{@$sekolah->npsn}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Nama Sekolah</td>
-                                            <td>{{@$sekolah->nama_sekolah}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Tingkat Sekolah</td>
-                                            <td>{{@$sekolah->tingkat->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Status Sekolah</td>
-                                            <td>{{@$sekolah->status}}</td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Alamat Sekolah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Provinsi</td>
-                                            <td>{{@$sekolah->provinsi->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kabupaten/Kota</td>
-                                            <td>{{@$sekolah->kabupaten->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kecamatan</td>
-                                            <td>{{@$sekolah->kecamatan->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Alamat Lengkap</td>
-                                            <td>{{@$sekolah->profile->alamat_sekolah}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kontak Person</td>
-                                            <td>{{@$sekolah->profile->kontak_person}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Telp</td>
-                                            <td>{{@$sekolah->profile->telp}}</td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Data Jumlah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Peserta Didik</td>
-                                            <td>
-                                              <input readonly name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Tenaga Pendidik</td>
-                                            <td>
-                                              <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Tenaga kependidikan</td>
-                                            <td>
-                                              <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Warga Sekolah Lainnya</td>
-                                            <td>
-                                              <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Biopori</td>
-                                            <td>
-                                              <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Sumur Resapan</td>
-                                            <td>
-                                              <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Pohon/Tanaman yang ditanam dan tumbuh</td>
-                                            <td>
-                                              <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></td>
-                                            <td>
-                                              <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                          </tr>
-                                          <tr>
-                                            <td> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></smald>
-                                            </th>
-                                            <td>
-                                              <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan ber AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan non AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-
-                                          <tr>
-                                            <td> Jumlah Kader</td>
-                                            <td>
-                                              <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
-                                          </tr>
-                                    </table>
-                                </div>
-                                <div class="tab-pane fade" id="dokumen" role="tabpanel">
-                                    <table class="table table-bordered">
-                                        <tr>
-                                            <td class="table-info">Seleksi Isian Dokumen Administrasi CSA</td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah nama CSAN tercantum dalam SK/Piagam Sekolah Adiwiyata Provinsi (untuk SAP 2021/2022/2023/2024/2025) atau SK/Piagam Perpanjangan Adiwiyata Tahun 2023/2024/2025  </b></p>
-
-                                                <input value="1" {{@$dokumen->nama_dalam_sk == 1 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Ya<br>
-                                                <input value="2" {{@$dokumen->nama_dalam_sk == 2 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak<br>
-                                                <input value="3" {{@$dokumen->nama_dalam_sk == 3 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak Ada Bukti/Dokumen <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah salinan SK/Piagam Sekolah Adiwiyata provinsi di tandatangani Gubernur atau pejabat yang diberi kewenangan untuk menandatangani atau SK/Piagam Perpanjangan di Tandatangani Kepala Dinas LH ?</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->sk_ttd == 1 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Ya <br>
-                                                <input value="2" {{@$dokumen->sk_ttd == 2 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak <br>
-                                                <input value="3" {{@$dokumen->sk_ttd == 3 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak Ada Bukti/Dokumen  <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Waktu Penetapan Penghargaan SAP</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->waktu_penetapan == 1 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022/ 2023/ 2024 ditetapkan SEBELUM 1 Agustus 2024 <br>
-                                                <input value="2" {{@$dokumen->waktu_penetapan == 2 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022 /2023/ 2024 ditetapkan SETELAH 1 Agustus 2024 <br>
-                                                <input value="3" {{@$dokumen->waktu_penetapan == 3 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP/SAN/SAM perolehan tahun 2020 atau sebelumnya serta lolos perpanjangan sebagai SAP <br>
-                                                <input value="4" {{@$dokumen->waktu_penetapan == 4 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP perolehan tahun 2020 atau sebelumnya serta tidak ada SK/piagam perpanjangan sebagai SAP <br>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveAdministrasi" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                        </tr>
-                                        @endif
-                                    </table>
+                                   <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Data Jumlah</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Jumlah Peserta Didik</label>
+                                                        <input disabled name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Tenaga kependidikan</label>
+                                                        <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Biopori</label>
+                                                        <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Pohon/Tanaman yang ditanam dan tumbuh</label>
+                                                        <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Jumlah Tenaga Pendidik</label>
+                                                        <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Warga Sekolah Lainnya</label>
+                                                        <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Sumur Resapan</label>
+                                                        <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
+                                                        <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
+                                                    <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></small></label>
+                                                        <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Luas ruangan ber AC</label>
+                                                        <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Kader</label>
+                                                        <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small></label>
+                                                        <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Luas ruangan non AC</label>
+                                                        <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="tab-pane fade active show" id="kriteria" role="tabpanel">
                                     <div class="row">
-                                        <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                            <ul class="pageNumber">
-                                                @foreach($page as $hal)
-                                                <li class="page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
-                                                @endforeach
-                                                <!-- <li class="resume">Resume</li> -->
-                                            </ul>
-                                        </div>
-                                        <div class="col-md-12 mt-3">
-                                            <div class="alert alert-primary mb-2 p-2">
-                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                        <div class="col-md-4">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="my-3 text-center ">
+                                                        <a href="#" class="btn btn-outline-primary mr-2 ">
+                                                            Sekolah
+                                                            <br>
+                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
+                                                        </a>
+                                                        <a href="#" class="btn btn-outline-warning mr-2 ">
+                                                            Kab/Kota
+                                                            <br>
+                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
+                                                        </a>
+                                                    </div>
+                                                    <div class="pageNumber row gap-1 justify-content-center">
+                                                        @foreach($page as $hal)
+                                                        <div class="col-3 text-center page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
+                                                                <span>{{$hal}}</span>
+                                                        </div>
+                                                        @endforeach
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-8 bodyInput">
-                                            <div id="loading-spinner" style="display: none; text-align: center;">
-                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                            </div>
-                                            <div class="changeForm">
-                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                        <div class="col-md-8">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <div class="alert alert-primary mb-2 p-2">
+                                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-12 bodyInput">
+                                                            <div id="loading-spinner" style="display: none; text-align: center;">
+                                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
+                                                            </div>
+                                                            <div class="changeForm">
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                            </div>
+                                                        </div>
+                                                        @if(@$kuesioner->status < 4)
+                                                            <div class="col-md-12 mt-3">
+                                                                <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                            </div>
+                                                        @endif
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-4 mt-5 mx-auto">
-                                            <div class="mx-auto text-center">
-                                                <a href="#" class="btn btn-outline-primary mr-2 ">
-                                                    Sekolah
-                                                    <br>
-                                                    <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                                <a href="#" class="btn btn-outline-warning mr-2 ">
-                                                    Kab/Kota
-                                                    <br>
-                                                    <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                                <a href="#" class="btn btn-outline-danger mr-2 d-none">
-                                                    Provinsi
-                                                    <br>
-                                                    <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                            </div>
-                                        </div>
-                                        @if(@$kuesioner->status < 4)
-                                        <div class="col-md-12 mt-3">
-                                            <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                        </div>
-                                        @endif
                                     </div>
                                 </div>
                                 <div class="tab-pane fade" id="usulan" role="tabpanel">
-                                    <table class="table table-nobordered">
-                                        <tr>
-                                            <th colspan="2" class="table-info">Usulan</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Jenis Usulan CSA</td>
-                                            <td>{{getUsulan($sekolah->MsSekolahId)}}</td>
-                                        </tr>
-                                        <tr>
-                                            <th colspan="2" class="table-info">Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}} :</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Validasi</td>
-                                            <td>
-                                                <select class="form-control select2" id="validasi" name="validasi">
-                                                    <option value="">- Pilih Validasi -</option>
-                                                    <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Selesai</option>
-                                                    <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Catatan</td>
-                                            <td>
-                                                <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                            <td></td>
-                                        </tr>
-                                        @endif
-                                    </table>
+                                    <div class="card">
+                                        <div class="card-header bg-white">
+                                            <h4 class="mb-0 fw-500">Form Validasi</h4>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-12">
+                                                    <div class="alert bg-primary-light text-primary mb-3">
+                                                        <i class="fal fa-info-circle"></i>&nbsp;Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Jenis Usulan CSA</label>
+                                                        <input disabled type="text" class="form-control" name="" value="{{getUsulan($sekolah->MsSekolahId)}}">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Validasi</label>
+                                                        <select class="form-control select2" id="validasi" name="validasi">
+                                                            <option value="">- Pilih Validasi -</option>
+                                                            <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Selesai</option>
+                                                            <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-12 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Catatan</label>
+                                                        <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
+                                                    </div>
+                                                </div>
+                                                @if(@$kuesioner->status < 4)
+                                                <div class="col-md-12 my-2">
+                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                </div>
+                                                @endif
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index 88d3ce1..1b8ae41 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
diff --git a/resources/views/modules/usulan/csam/index.blade.php b/resources/views/modules/usulan/csam/index.blade.php
index 88d3ce1..b441191 100644
--- a/resources/views/modules/usulan/csam/index.blade.php
+++ b/resources/views/modules/usulan/csam/index.blade.php
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
diff --git a/resources/views/modules/usulan/csan/index.blade.php b/resources/views/modules/usulan/csan/index.blade.php
index 88d3ce1..b441191 100644
--- a/resources/views/modules/usulan/csan/index.blade.php
+++ b/resources/views/modules/usulan/csan/index.blade.php
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php
index cec129b..26e5e90 100644
--- a/resources/views/modules/usulan/csap/form.blade.php
+++ b/resources/views/modules/usulan/csap/form.blade.php
@@ -42,12 +42,38 @@
 </style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{$sekolah->nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$sekolah->npsn}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{$sekolah->tingkat->name}}</span>
+                                <span class="badge bg-success-light text-success">{{$sekolah->status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($sekolah->npsn)}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -61,318 +87,224 @@
         <form method="POST" id="form">
         <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
         {{csrf_field()}}
-            <div class="card">
-                <div class="card-body">
+            <div class="">
+                <div class="">
                     <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{$sekolah->npsn}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{$sekolah->nama_sekolah}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{$sekolah->tingkat->name}}</span> <span class="badge badge-success">{{$sekolah->status}}</span></td>
-                                </tr>
-                            </table>
-                        </div>
+                        
                         <div class="col-12">
-                            <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                    <ul class="nav nav-pills" role="tablist">
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
-                                    <li class="nav-item d-none"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
-                                    <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
-                                </ul>
+                            <div class="card">
+                                <div class="card-body">
+                                    <ul class="nav nav-tabs" role="tablist">
+                                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
+                                        <li class="nav-item d-none"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
+                                        <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
+                                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
+                                    </ul>
+                                </div>
                             </div>
-                            
                             <div class="tab-content py-3">
                                 <div class="tab-pane fade" id="profile" role="tabpanel">
-                                    <table class="table table-nobordered">
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Profile Sekolah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>NPSN</td>
-                                            <td>{{@$sekolah->npsn}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Nama Sekolag</td>
-                                            <td>{{@$sekolah->nama_sekolah}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Tingkat Sekolah</td>
-                                            <td>{{@$sekolah->tingkat->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Status Sekolah</td>
-                                            <td>{{@$sekolah->status}}</td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Alamat Sekolah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>Provinsi</td>
-                                            <td>{{@$sekolah->provinsi->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kabupaten/Kota</td>
-                                            <td>{{@$sekolah->kabupaten->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kecamatan</td>
-                                            <td>{{@$sekolah->kecamatan->name}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Alamat Lengkap</td>
-                                            <td>{{@$sekolah->profile->alamat_sekolah}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Kontak Person</td>
-                                            <td>{{@$sekolah->profile->kontak_person}}</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Telp</td>
-                                            <td>{{@$sekolah->profile->telp}}</td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Data Jumlah</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Peserta Didik</td>
-                                            <td>
-                                              <input readonly name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Tenaga Pendidik</td>
-                                            <td>
-                                              <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Tenaga kependidikan</td>
-                                            <td>
-                                              <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Warga Sekolah Lainnya</td>
-                                            <td>
-                                              <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Biopori</td>
-                                            <td>
-                                              <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Sumur Resapan</td>
-                                            <td>
-                                              <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Jumlah Pohon/Tanaman yang ditanam dan tumbuh</td>
-                                            <td>
-                                              <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></td>
-                                            <td>
-                                              <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                          </tr>
-                                          <tr>
-                                            <td> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></smald>
-                                            </th>
-                                            <td>
-                                              <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan ber AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan non AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-
-                                          <tr>
-                                            <td> Jumlah Kader</td>
-                                            <td>
-                                              <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
-                                          </tr>
-                                    </table>
-                                </div>
-                                <div class="tab-pane fade" id="dokumen" role="tabpanel">
-                                    <table class="table table-bordered">
-                                        <tr>
-                                            <td class="table-info">Seleksi Isian Dokumen Administrasi CSA</td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah nama CSAN tercantum dalam SK/Piagam Sekolah Adiwiyata Provinsi (untuk SAP 2021/2022/2023/2024/2025) atau SK/Piagam Perpanjangan Adiwiyata Tahun 2023/2024/2025  </b></p>
-
-                                                <input value="1" {{@$dokumen->nama_dalam_sk == 1 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Ya<br>
-                                                <input value="2" {{@$dokumen->nama_dalam_sk == 2 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak<br>
-                                                <input value="3" {{@$dokumen->nama_dalam_sk == 3 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak Ada Bukti/Dokumen <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah salinan SK/Piagam Sekolah Adiwiyata provinsi di tandatangani Gubernur atau pejabat yang diberi kewenangan untuk menandatangani atau SK/Piagam Perpanjangan di Tandatangani Kepala Dinas LH ?</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->sk_ttd == 1 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Ya <br>
-                                                <input value="2" {{@$dokumen->sk_ttd == 2 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak <br>
-                                                <input value="3" {{@$dokumen->sk_ttd == 3 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak Ada Bukti/Dokumen  <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Waktu Penetapan Penghargaan SAP</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->waktu_penetapan == 1 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022/ 2023/ 2024 ditetapkan SEBELUM 1 Agustus 2024 <br>
-                                                <input value="2" {{@$dokumen->waktu_penetapan == 2 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022 /2023/ 2024 ditetapkan SETELAH 1 Agustus 2024 <br>
-                                                <input value="3" {{@$dokumen->waktu_penetapan == 3 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP/SAN/SAM perolehan tahun 2020 atau sebelumnya serta lolos perpanjangan sebagai SAP <br>
-                                                <input value="4" {{@$dokumen->waktu_penetapan == 4 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP perolehan tahun 2020 atau sebelumnya serta tidak ada SK/piagam perpanjangan sebagai SAP <br>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveAdministrasi" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                        </tr>
-                                        @endif
-                                    </table>
+                                    <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Data Jumlah</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Jumlah Peserta Didik</label>
+                                                        <input disabled name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Tenaga kependidikan</label>
+                                                        <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Biopori</label>
+                                                        <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Pohon/Tanaman yang ditanam dan tumbuh</label>
+                                                        <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Jumlah Tenaga Pendidik</label>
+                                                        <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Warga Sekolah Lainnya</label>
+                                                        <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Sumur Resapan</label>
+                                                        <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
+                                                        <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
+                                                    <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="card my-2">
+                                        <div class="card-header bg-white">
+                                            <h5 class="mb-0 fw-500">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS</h5>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></small></label>
+                                                        <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Luas ruangan ber AC</label>
+                                                        <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Jumlah Kader</label>
+                                                        <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6">
+                                                    <div class="form-group">
+                                                        <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small></label>
+                                                        <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                    </div>
+                                                    <div class="form-group">
+                                                        <label>Luas ruangan non AC</label>
+                                                        <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="tab-pane fade active show" id="kriteria" role="tabpanel">
                                     <div class="row">
-                                        <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                            <ul class="pageNumber">
-                                                @foreach($page as $hal)
-                                                <li class="page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
-                                                @endforeach
-                                                <!-- <li class="resume">Resume</li> -->
-                                            </ul>
-                                        </div>
-                                        <div class="col-md-12 mt-3">
-                                            <div class="alert alert-primary mb-2 p-2">
-                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                        <div class="col-md-4">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="my-3 text-center ">
+                                                        <a href="#" class="btn btn-outline-primary mr-2 ">
+                                                            Sekolah
+                                                            <br>
+                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
+                                                        </a>
+                                                        <a href="#" class="btn btn-outline-warning mr-2 ">
+                                                            Kab/Kota
+                                                            <br>
+                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
+                                                        </a>
+                                                        <a href="#" class="btn btn-outline-danger mr-2 ">
+                                                            Provinsi
+                                                            <br>
+                                                            <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
+                                                        </a>
+                                                    </div>
+                                                    <div class="pageNumber row gap-1 justify-content-center">
+                                                        @foreach($page as $hal)
+                                                        <div class="col-3 text-center page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
+                                                                <span>{{$hal}}</span>
+                                                        </div>
+                                                        @endforeach
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-8 bodyInput">
-                                            <div id="loading-spinner" style="display: none; text-align: center;">
-                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                            </div>
-                                            <div class="changeForm">
-                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                        <div class="col-md-8">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <div class="alert alert-primary mb-2 p-2">
+                                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-12 bodyInput">
+                                                            <div id="loading-spinner" style="display: none; text-align: center;">
+                                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
+                                                            </div>
+                                                            <div class="changeForm">
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                            </div>
+                                                        </div>
+                                                        @if(@$kuesioner->status <= 4)
+                                                            <div class="col-md-12 mt-3">
+                                                                <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                            </div>
+                                                        @endif
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="col-md-4 mt-5 mx-auto">
-                                            <div class="mx-auto text-center">
-                                                <a href="#" class="btn btn-outline-primary mr-2 ">
-                                                    Sekolah
-                                                    <br>
-                                                    <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                                <a href="#" class="btn btn-outline-warning mr-2 ">
-                                                    Kab/Kota
-                                                    <br>
-                                                    <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                                <a href="#" class="btn btn-outline-danger mr-2 ">
-                                                    Provinsi
-                                                    <br>
-                                                    <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
-                                                </a>
-                                            </div>
-                                        </div>
-                                        @if(@$kuesioner->status <= 4)
-                                        <div class="col-md-12 mt-3">
-                                            <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                        </div>
-                                        @endif
                                     </div>
                                 </div>
                                 <div class="tab-pane fade" id="usulan" role="tabpanel">
-                                    <table class="table table-nobordered">
-                                        <tr>
-                                            <th colspan="2" class="table-info">Usulan</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Jenis Usulan CSA</td>
-                                            <td>{{getUsulan($sekolah->MsSekolahId)}}</td>
-                                        </tr>
-                                        <!-- <tr>
-                                            <th colspan="2" class="table-info">Penghargaan</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Penghargaan Terakhir</td>
-                                            <td>{{getPenghargaanTerakhir($sekolah->MsSekolahId)}}</td>
-                                        </tr> -->
-                                        <tr>
-                                            <th colspan="2" class="table-info">Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}} :</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Validasi</td>
-                                            <td>
-                                                <select class="form-control select2" id="validasi" name="validasi">
-                                                    <option value="">- Pilih Validasi -</option>
-                                                    @if(session('group_alias') == 'penilai_kota')
-                                                    <option value="1">Diteruskan</option>
-                                                    <option value="2">Dikembalikan</option>
-                                                    @elseif(session('group_alias') == 'penilai_provinsi')
-                                                    <option value="1">Selesai</option>
-                                                    @endif
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>Catatan</td>
-                                            <td>
-                                                <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status <= 4)
-                                        <tr>
-                                            <td><button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                            <td></td>
-                                        </tr>
-                                        @endif
-                                    </table>
+                                    <div class="card">
+                                        <div class="card-header bg-white">
+                                            <h4 class="mb-0 fw-500">Form Validasi</h4>
+                                        </div>
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-12">
+                                                    <div class="alert bg-primary-light text-primary mb-3">
+                                                        <i class="fal fa-info-circle"></i>&nbsp;Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Jenis Usulan CSA</label>
+                                                        <input disabled type="text" class="form-control" name="" value="{{getUsulan($sekolah->MsSekolahId)}}">
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-6 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Validasi</label>
+                                                        <select class="form-control select2" id="validasi" name="validasi">
+                                                            <option value="">- Pilih Validasi -</option>
+                                                            @if(session('group_alias') == 'penilai_kota')
+                                                            <option value="1">Diteruskan</option>
+                                                            <option value="2">Dikembalikan</option>
+                                                            @elseif(session('group_alias') == 'penilai_provinsi')
+                                                            <option value="1">Selesai</option>
+                                                            @endif
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-12 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Catatan</label>
+                                                        <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
+                                                    </div>
+                                                </div>
+                                                @if(@$kuesioner->status <= 4)
+                                                <div class="col-md-12 my-2">
+                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                </div>
+                                                @endif
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
                                 </div>
                             </div>
                         
@@ -396,8 +328,8 @@
         let number = $(this).data('number');
         let base_url = "{{url('/')}}";
         // Tambahkan kelas active dan hapus dari yang lain
-        $('.page').removeClass('activePage');
-        $(this).addClass('activePage');
+        $('.page').removeClass('bg-primary-light border-primary text-primary');
+        $(this).addClass('bg-primary-light border-primary text-primary');
 
         $.ajax({
             url: base_url+'/getForm', // Ganti dengan URL API-mu
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index 88d3ce1..1b8ae41 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -114,7 +114,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -126,8 +126,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
diff --git a/resources/views/modules/usulan/kriteria/form.blade.php b/resources/views/modules/usulan/kriteria/form.blade.php
index dfb0619..92f8cf2 100644
--- a/resources/views/modules/usulan/kriteria/form.blade.php
+++ b/resources/views/modules/usulan/kriteria/form.blade.php
@@ -3,37 +3,6 @@
 @section('page-css')
 <link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
 <link rel="stylesheet" href="{{asset('assets/css/formplugins/dropzone/dropzone.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-    
-</style>
 @endsection
 @section('content')
 <form method="POST" id="form">
@@ -94,27 +63,19 @@
                 <div class="card-body">
                     <div class="pageNumber row gap-1 justify-content-center">
                         @foreach($page as $hal)
-                        <div class="col-3 text-center page {{ (checkPenilaian($hal) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>
+                        <div class="col-3 text-center page {{ (checkPenilaian($hal) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
                             <span>{{$hal}}</span>
                         </div>
                         @endforeach
                     </div>
                     <div class="row mt-2 gap-1 justify-content-center">
-                        <div class="col-5 text-center resume bg-secondary" style="padding: 10px;">
+                        <div class="col-5 text-center resume border-secondary rounded" style="padding: 10px;">
                             <span>Resume</span>
                         </div>
-                        <div class="col-5 text-center progress_usulan  bg-secondary" style="padding: 10px;">
+                        <div class="col-5 text-center progress_usulan border-secondary rounded" style="padding: 10px;">
                             <span>Progress Usulan</span>
                         </div>
                     </div>
-
-                    <ul class="pageNumber d-none">
-                        @foreach($page as $hal)
-                        <li class="page {{ (checkPenilaian($hal) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
-                        @endforeach
-                        <li class="resume">Resume</li>
-                        <li class="progress_usulan">Progress Usulan</li>
-                    </ul>
                 </div>
             </div>
         </div>
@@ -207,8 +168,8 @@
         let number = $(this).data('number');
         let base_url = "{{url('/')}}";
         // Tambahkan kelas active dan hapus dari yang lain
-        $('.page').removeClass('active');
-        $(this).addClass('active');
+        $('.page').removeClass('bg-primary-light border-primary text-primary');
+        $(this).addClass('bg-primary-light border-primary text-primary');
 
         $.ajax({
             url: base_url+'/getForm', // Ganti dengan URL API-mu
diff --git a/resources/views/modules/usulan/kriteria/progress.blade.php b/resources/views/modules/usulan/kriteria/progress.blade.php
index 4d05288..0d9aa10 100644
--- a/resources/views/modules/usulan/kriteria/progress.blade.php
+++ b/resources/views/modules/usulan/kriteria/progress.blade.php
@@ -158,167 +158,152 @@
 </style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
-    <div class="col-lg-12">
-        @if ($errors->any())
-            <div class="alert alert-danger">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
+                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12">
+        <div class="alert alert-warning mb-2">
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
+        </div>
+    </div>
+    @if ($errors->any())
+        <div class="col-md-12">
+            <div class="alert alert-danger mb-2">
                 <ul>
                     @foreach ($errors->all() as $error)
                         <li>{{ $error }}</li>
                     @endforeach
                 </ul>
             </div>
-        @endif
+        </div>
+    @endif
+    <div class="col-md-6">
+        <div class="card">
+            <div class="card-body">
+                <h4 class="mb-3 fw-700">Status Usulan</h4>
+                <?php
+                    if(($kuesioner->level+1) == 1){
+                        $jenis_usulan = 'Kabupaten/Kota';
+                    }elseif(($kuesioner->level+1) == 2){
+                        $jenis_usulan = 'Provinsi';
+                    }elseif(($kuesioner->level+1) == 3){
+                        $jenis_usulan = 'Nasional';
+                    }elseif(($kuesioner->level+1) == 4){
+                        $jenis_usulan = 'Mandiri';
+                    }
+                ?>
+                <p>
+                    Sekolah diusulan untuk menjadi CSA (Calon Sekolah Adiwiyata) <b>{{$jenis_usulan}}</b><br>
+                </p>
+                <span class="text-primary">Silahkan lengkapi data pada menu Usulan Adiwiyata. </span>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-6">
         <form method="POST" id="form">
-        {{csrf_field()}}
+            {{csrf_field()}}
             <div class="card">
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{session('npsn')}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{session('name')}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{session('tingkat_sekolah')}}</span> <span class="badge badge-success">{{session('status_sekolah')}}</span></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><p>{{session('alamat_sekolah')}}</p></td>
-                                </tr>
-                            </table>
+                <div class="card-body p-4">
+                <h4 class="mb-3 fw-700">Kirim Kelengkapan Data</h4>
+                <p>Kab/Kota akan melakukan validasi, jika data sekolah lengkap akan diproses. apabila data belum lengkap akan dikembalikan ke sekolah untuk melakukan perbaikan. </p>
+                <div class="alert bg-primary-light mb-3">
+                    <p class="text-primary mb-0">Pastikan NPSN, Profile, Dok Adminstrasi dan Pemenuhan Kriteria sudah sesuai.</p>
+                </div>
+                <div class="d-flex flex-column gap-3">
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-envelope"></i>&nbsp;Dokumen Administrasi 
                         </div>
-                        <div class="col-md-12">
-                            <div class="alert alert-warning">
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
-                            </div>
+                        <div>
+                            @if(@$dok)
+                                @if(@$dok->status == 1)
+                                    <span class="badge bg-success-light text-success">Dokumen Sudah Di Verifikasi</span>
+                                @elseif(@$dok->status == 2)
+                                    <span class="badge bg-danger-light text-danger">Dokumen Ditolak</span>
+                                @else
+                                    <span class="badge bg-warning-light text-warning">Menunggu Verifikasi Dokumen</span>
+                                @endif
+                            @else
+                                <span class="badge badge-danger">Belum Upload Dokumen</span>
+                            @endif
                         </div>
-                        <div class="col-md-12 mb-4" style="background: rgba(23, 162, 184, 0.2) !important;">
-                            <ul class="pageNumber">
-                                <li class="back"><i class="fal fa-arrow-left"></i></li>
-                                <li class="resume">Resume</li>
-                                <li class="progress_usulan active">Progress Usulan</li>
-                            </ul>
+                    </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-list"></i>&nbsp;Pemenuhan Kriteria
                         </div>
-                        <div class="col-md-12 bodyInput">
-                            <section style="background-color: #F0F2F5;">
-                                  <div class="container py-5">
-                                    <div class="main-timeline">
-                                    @foreach($log as $logs)
-                                      <div class="timeline left d-none">
-                                        <div class="card">
-                                          <div class="card-body p-4">
-                                            <h3><b>{{\Str::title(str_replace('_',' ',$logs->step))}}</b></h3>
-                                            <p class="mb-0">Oleh : {{user($logs->created_by)->name}} <span class="badge badge-primary">{{group($logs->created_by)->name}}</span></p>
-                                            <p class="mb-0">Tanggal : {{$logs->created_at}}</p>
-                                          </div>
-                                        </div>
-                                      </div>
-                                      @endforeach
-
-                                    <div class="timeline left">
-                                        <div class="card">
-                                          <div class="card-body p-4">
-                                            <h3><b>Status Usulan</b></h3>
-                                            <?php
-                                                if(($kuesioner->level+1) == 1){
-                                                    $jenis_usulan = 'Kabupaten/Kota';
-                                                }elseif(($kuesioner->level+1) == 2){
-                                                    $jenis_usulan = 'Provinsi';
-                                                }elseif(($kuesioner->level+1) == 3){
-                                                    $jenis_usulan = 'Nasional';
-                                                }elseif(($kuesioner->level+1) == 4){
-                                                    $jenis_usulan = 'Mandiri';
-                                                }
-                                            ?>
-                                            <p class="">
-                                                Sekolah diusulan untuk menjadi CSA (Calon Sekolah Adiwiyata) <b>{{$jenis_usulan}}</b><br>
-                                            </p>
-                                            <span class="text-primary">Silahkan lengkapi data pada menu Usulan Adiwiyata. </span>
-                                          </div>
-                                        </div>
-                                      </div>
-                                     
-                                      <div class="timeline right">
-                                        <div class="card">
-                                          <div class="card-body p-4">
-                                            <h3><b>
-                                                @if($kuesioner->status == 3)
-                                                <span class="badge badge-success"><i class="fal fa-check"></i></span>&nbsp;
-                                                @endif
-                                                Kirim Kelengkapan Data
-                                            </b></h3>
-                                            <p>Kab/Kota akan melakukan validasi, jika data sekolah lengkap akan diproses. apabila data belum lengkap akan dikembalikan ke sekolah untuk melakukan perbaikan. </p>
-                                            <p class="text-primary">Pastikan NPSN, Profile, Dok Adminstrasi dan Pemenuhan Kriteria sudah sesuai.</p>
-                                            <ul>
-                                                <li>
-                                                    Dokumen Administrasi 
-                                                    @if(@$dok)
-                                                        @if(@$dok->status == 1)
-                                                            <span class="badge badge-success">Dokumen Sudah Di Verifikasi</span>
-                                                        @elseif(@$dok->status == 2)
-                                                            <span class="badge badge-danger">Dokumen Ditolak</span>
-                                                        @else
-                                                            <span class="badge badge-warning">Menunggu Verifikasi Dokumen</span>
-                                                        @endif
-                                                    @else
-                                                        <span class="badge badge-danger">Belum Upload Dokumen</span>
-                                                    @endif
-                                                </li>
-                                                <li>Pemenuhan Kriteria {{count(@$penilaian)}} / {{count(@$page)}} 
-                                                    @if(count(@$penilaian) == count(@$page))
-                                                    <span class="badge badge-success">Sudah Lengkap</span>
-                                                    @else
-                                                    <span class="badge badge-danger">Belum Lengkap</span>
-                                                    @endif
-                                                </li>
-                                            </ul>
-                                            @if(session('group_alias') == 'sekolah')
-                                                @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
-                                                    <div class="custom-control custom-checkbox m-2">
-                                                        <input type="checkbox" class="custom-control-input is-required check" id="true" value="1" name="check">
-                                                        <label class="custom-control-label" for="true">Dengan ini menyatakan bahwa kelengkapan data sudah benar.</label>
-                                                    </div>
-                                                    <button class="btn btn-success btnSend">Kirim Data</button>
-
-                                                    @if(@$kuesioner->status == 5)
-                                                    <div class="alert alert-danger mt-2">
-                                                        Status : {!!kuesionerLogStatus(@$kuesioner->KuesionerId)!!} <br>
-                                                        <p class="mb-0"><i>Pastikan isian sudah diperbaiki sebelum dikirim kembali</i></p>
-                                                    </div>
-                                                    @endif
-                                                @endif
-                                            @endif
-                                          </div>
-                                        </div>
-                                        <div id="loading-spinner" style="display: none; text-align: center;">
-                                            <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                        </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </section>
+                        <div>
+                            {{count(@$penilaian)}} / {{count(@$page)}} &nbsp;
+                            @if(count(@$penilaian) == count(@$page))
+                                <span class="badge bg-success-light text-success">Sudah Lengkap</span>
+                            @else
+                                <span class="badge bg-danger-light text-danger">Belum Lengkap</span>
+                            @endif
                         </div>
-                        
                     </div>
                 </div>
-                
+                @if(session('group_alias') == 'sekolah')
+                    <div class="d-flex flex-row justify-content-between my-3">
+                        @if(session('group_alias') == 'sekolah')
+                            @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                                <div class="custom-control custom-checkbox">
+                                    <input type="checkbox" class="custom-control-input is-required check" id="true" value="1" name="check">
+                                    <label class="custom-control-label" for="true">Dengan ini menyatakan bahwa kelengkapan data sudah benar.</label>
+                                </div>
+                            @endif
+                        @endif
+                    </div>
+                    @if(session('group_alias') == 'sekolah')
+                        @if(@$kuesioner->status == 5)
+                            <div class="alert alert-danger my-2">
+                                Status : {!!kuesionerLogStatus(@$kuesioner->KuesionerId)!!} <br>
+                                <p class="mb-0"><i>Pastikan isian sudah diperbaiki sebelum dikirim kembali</i></p>
+                            </div>
+                        @endif
+                        @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                            <button class="btn btn-success btnSend">Kirim Data</button>
+                        @endif
+                    @endif
+                @endif
+              </div>
+            </div>
+            <div id="loading-spinner" style="display: none; text-align: center;">
+                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
             </div>
         </form>
     </div>
+
+    
 </div>
 @endsection
 @section('page-js')
diff --git a/resources/views/modules/usulan/sk/index.blade.php b/resources/views/modules/usulan/sk/index.blade.php
index 01c87a3..c6e5b95 100644
--- a/resources/views/modules/usulan/sk/index.blade.php
+++ b/resources/views/modules/usulan/sk/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -117,7 +117,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -129,8 +129,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="judul">Judul SK</th>
diff --git a/resources/views/modules/usulan/surat/form.blade.php b/resources/views/modules/usulan/surat/form.blade.php
index 34e8aa9..a739b04 100644
--- a/resources/views/modules/usulan/surat/form.blade.php
+++ b/resources/views/modules/usulan/surat/form.blade.php
@@ -4,7 +4,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> Tambah {{$title}}
+        Tambah {{$title}}
     </h1>
 </div>
 <div class="row">
diff --git a/resources/views/modules/usulan/surat/index.blade.php b/resources/views/modules/usulan/surat/index.blade.php
index 3c13a66..993de9b 100644
--- a/resources/views/modules/usulan/surat/index.blade.php
+++ b/resources/views/modules/usulan/surat/index.blade.php
@@ -6,7 +6,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -117,7 +117,7 @@
                         <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -129,8 +129,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
-                        <tr class="table-primary">
+                      <thead class="bg-primary-light text-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="judul">Judul Surat</th>