diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c789f0d..c59dd27 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -77,13 +77,13 @@ class HomeController extends Controller
             $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';
+                $jenis_usulan = '<span class="badge bg-success-light text-success">Adiwiyata Kab/Kota</span>';
             }elseif(($row->level+1) == 2){
-                $jenis_usulan = 'Adiwiyata Provinsi';
+                $jenis_usulan = '<span class="badge bg-primary-light text-primary">Adiwiyata Provinsi</span>';
             }elseif(($row->level+1) == 3){
-                $jenis_usulan = 'Adiwiyata Nasional';
+                $jenis_usulan = '<span class="badge bg-info-light text-info">Adiwiyata Nasional</span>';
             }elseif(($row->level+1) == 4){
-                $jenis_usulan = 'Adiwiyata Mandiri';
+                $jenis_usulan = '<span class="badge bg-warning-light text-warning">Adiwiyata Mandiri</span>';
             }
 
             if($row->level == 0){
@@ -100,12 +100,12 @@ class HomeController extends Controller
 
             
             $_data[] = [
-                'no'                => $key+1,
-                'nama_sekolah'      => @$sekolah,
-                'npsn'              => @$row->sekolah->npsn,
-                'kab'               => @$row->sekolah->kabupaten->name,
-                'usulan_sebelumnya'               => @$usulanAwal,
-                'pengajuan_usulan'               => @$jenis_usulan,
+                'no'                 => $key+1,
+                'nama_sekolah'       => @$sekolah,
+                'npsn'               => @$row->sekolah->npsn,
+                'kab'                => @$row->sekolah->kabupaten->name,
+                'usulan_sebelumnya'  => @$usulanAwal,
+                'pengajuan_usulan'   => @$jenis_usulan,
             ];
         }
         return response()->json($_data);
diff --git a/public/assets/css/custom.css b/public/assets/css/custom.css
index 96cdf02..01029d1 100644
--- a/public/assets/css/custom.css
+++ b/public/assets/css/custom.css
@@ -45,6 +45,18 @@
 .f20{
 	font-size: 20px;
 }
+.f12{
+	font-size: 12px;
+}
+.f14{
+	font-size: 14px;
+}
+.f16{
+	font-size: 16px;
+}
+.f18{
+	font-size: 18px;
+}
 .subheader{margin-bottom: 20px;}
 
 .table-bordered th, .table-bordered td{border: none!important;}
@@ -54,6 +66,12 @@
 .border-success{
 	border: 1px solid #1f6c3c!important;
 }
+.border-left-primary{
+	border-left: 5px solid #4765c0!important;
+}
+.border-left-primary-light{
+	border-left: 5px solid #dbeafe!important;
+}
 .border-primary{
 	border: 1px solid #4765c0!important;
 }
@@ -69,24 +87,57 @@
 .bg-secondary{
 	background: #F3F4F6!important;
 }
+.border-left-success{
+	border-left: 5px solid #1f6c3c!important;
+}
+.border-left-success-light{
+	border-left: 5px solid #dcfce7!important;
+}
 .bg-success{
 	background: #1f6c3c!important;
 }
 .bg-success-light{
 	background: #dcfce7;
 }
+.bg-primary{
+	background: #4765c0!important;
+}
 .bg-primary-light{
 	background: #dbeafe;
 }
+.text-primary-light{
+	color: #dbeafe;
+}
+.border-left-white{
+	border-left: 5px solid #fff!important;
+}
+.border-left-info{
+	border-left: 5px solid #9333ea!important;
+}
+.border-left-info-light{
+	border-left: 5px solid #f3e8ff!important;
+}
 .text-info{
 	color: #9333ea!important;
 }
+.bg-info{
+	background: #9333ea!important;
+}
 .bg-info-light{
 	background: #f3e8ff;
 }
+.border-left-warning{
+	border-left: 5px solid #ca8a04!important;
+}
+.border-left-warning-light{
+	border-left: 5px solid #fef9c3!important;
+}
 .text-warning{
 	color: #ca8a04!important;
 }
+.bg-warning{
+	background: #ca8a04!important;
+}
 .bg-warning-light{
 	background: #fef9c3;
 }
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php
index 44f75f6..1284f8c 100644
--- a/resources/views/modules/dashboard/admin.blade.php
+++ b/resources/views/modules/dashboard/admin.blade.php
@@ -9,95 +9,144 @@
         Dashboard
     </h1>
 </div>
-<div class="row">
+<div class="row mb-2">
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-primary-300 rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                    <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                        {{$total_usulan_kab}}
-                    </h3>
-                    <span class="m-0 l-h-n">Total Usulan Adiwiyata Kota</span>
+        <div class="card border-left-primary">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Kota</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_usulan_kab}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-primary"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n1" style="font-size:6rem"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-warning-300 rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{$total_usulan_prov}}
-                </h3>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Provinsi</span>
+        <div class="card border-left-success">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Provinsi</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_usulan_prov}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-success"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15  mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-success-200 rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{$total_usulan_nasional}}
-                </h3>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Nasional</span>
+        <div class="card border-left-warning">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Nasional</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_usulan_nasional}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-warning"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n5 mr-n6" style="font-size: 8rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-info-200 rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{$total_usulan_mandiri}}
-                </h3>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Mandiri</span>
+        <div class="card border-left-info">
+            <div class="card-body">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Mandiri</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_usulan_mandiri}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-info"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row mb-2">
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-danger rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                    <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                        {{@$total_sekolah_kab}}
-                    </h3>
-                    <span class="m-0 l-h-n">Total Sekolah Adiwiyata Kota</span>
+        <div class="card bg-primary text-white">
+            <div class="card-body">
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Kota</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_kab}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-primary"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n1" style="font-size:6rem"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-warning rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{@$total_sekolah_prov}}
-                </h3>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Provinsi</span>
+        <div class="card bg-success text-white">
+            <div class="card-body">
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Provinsi</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_prov}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-success"></i>
+                        </div> 
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-sm-6 col-xl-3">
+        <div class="card bg-warning text-white">
+            <div class="card-body">
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Nasional</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_nasional}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-warning"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15  mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-success rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{@$total_sekolah_nasional}}
-                </h3>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Nasional</span>
+        <div class="card bg-info text-white">
+            <div class="card-body">
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Mandiri</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_mandiri}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-info"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n5 mr-n6" style="font-size: 8rem;"></i>
-        </div>
-    </div>
-    <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-info rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{@$total_sekolah_mandiri}}
-                </h3>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Mandiri</span>
-            </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
 </div>
@@ -105,12 +154,12 @@
     
     <div class="col-lg-12">
         <div id="panel-4" class="panel">
-            <div class="panel-hdr">
-                <h2>Usulan Adiwiyata Tahun {{date('Y')}}</h2>
-            </div>
             <div class="panel-container show">
                 <div class="panel-content">
                     <div class="table-responsive">
+                        <div id="toolbar">
+                            <h5 class="fw-500">Usulan Adiwiyata Tahun {{date('Y')}}</h5>
+                        </div>
                         <table class="table w-100" 
                             data-search="true"
                             data-toggle="table"
diff --git a/resources/views/modules/usulan/kriteria/form.blade.php b/resources/views/modules/usulan/kriteria/form.blade.php
index 92f8cf2..0ea8264 100644
--- a/resources/views/modules/usulan/kriteria/form.blade.php
+++ b/resources/views/modules/usulan/kriteria/form.blade.php
@@ -69,7 +69,7 @@
                         @endforeach
                     </div>
                     <div class="row mt-2 gap-1 justify-content-center">
-                        <div class="col-5 text-center resume border-secondary rounded" style="padding: 10px;">
+                        <div class="col-5 d-none text-center resume border-secondary rounded" style="padding: 10px;">
                             <span>Resume</span>
                         </div>
                         <div class="col-5 text-center progress_usulan border-secondary rounded" style="padding: 10px;">
diff --git a/resources/views/modules/usulan/kriteria/progress.blade.php b/resources/views/modules/usulan/kriteria/progress.blade.php
index 0d9aa10..718ff42 100644
--- a/resources/views/modules/usulan/kriteria/progress.blade.php
+++ b/resources/views/modules/usulan/kriteria/progress.blade.php
@@ -1,161 +1,6 @@
 @extends('layouts.master')
 
 @section('page-css')
-<link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    /* The actual timeline (the vertical ruler) */
-.main-timeline {
-  position: relative;
-}
-
-/* The actual timeline (the vertical ruler) */
-.main-timeline::after {
-  content: '';
-  position: absolute;
-  width: 6px;
-  background-color: #939597;
-  top: 0;
-  bottom: 0;
-  left: 50%;
-  margin-left: -3px;
-}
-
-/* Container around content */
-.timeline {
-  position: relative;
-  background-color: inherit;
-  width: 50%;
-}
-
-/* The circles on the timeline */
-.timeline::after {
-  content: '';
-  position: absolute;
-  width: 25px;
-  height: 25px;
-  right: -13px;
-  background-color: #939597;
-  border: 5px solid #F5DF4D;
-  top: 15px;
-  border-radius: 50%;
-  z-index: 1;
-}
-
-/* Place the container to the left */
-.left {
-  padding: 0px 40px 20px 0px;
-  left: 0;
-}
-
-/* Place the container to the right */
-.right {
-  padding: 0px 0px 20px 40px;
-  left: 50%;
-}
-
-/* Add arrows to the left container (pointing right) */
-.left::before {
-  content: " ";
-  position: absolute;
-  top: 18px;
-  z-index: 1;
-  right: 30px;
-  border: medium solid white;
-  border-width: 10px 0 10px 10px;
-  border-color: transparent transparent transparent white;
-}
-
-/* Add arrows to the right container (pointing left) */
-.right::before {
-  content: " ";
-  position: absolute;
-  top: 18px;
-  z-index: 1;
-  left: 30px;
-  border: medium solid white;
-  border-width: 10px 10px 10px 0;
-  border-color: transparent white transparent transparent;
-}
-
-/* Fix the circle for containers on the right side */
-.right::after {
-  left: -12px;
-}
-
-/* Media queries - Responsive timeline on screens less than 600px wide */
-@media screen and (max-width: 600px) {
-  /* Place the timelime to the left */
-  .main-timeline::after {
-    left: 31px;
-  }
-
-  /* Full-width containers */
-  .timeline {
-    width: 100%;
-    padding-left: 70px;
-    padding-right: 25px;
-  }
-
-  /* Make sure that all arrows are pointing leftwards */
-  .timeline::before {
-    left: 60px;
-    border: medium solid white;
-    border-width: 10px 10px 10px 0;
-    border-color: transparent white transparent transparent;
-  }
-
-  /* Make sure all circles are at the same spot */
-  .left::after, .right::after {
-    left: 18px;
-  }
-
-  .left::before {
-    right: auto;
-  }
-
-  /* Make all right containers behave like the left ones */
-  .right {
-    left: 0%;
-  }
-}
-
-    .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;
-    }
-    .pageNumber{ list-style:none; padding:0px; margin: 0px;}
-    .pageNumber > li{ display: inline-block; padding: 12px; background: rgba(255, 255, 255, 0.5); margin: 5px 1px;}
-    .pageNumber > li:hover{cursor: pointer;}
-    .pageNumber > li.active {
-        background-color: #007bff; /* Warna biru */
-        color: white;
-        font-weight: bold;
-    }
-</style>
 @endsection
 @section('content')
 <div class="row">
diff --git a/resources/views/modules/usulan/kriteria/resume.blade.php b/resources/views/modules/usulan/kriteria/resume.blade.php
index 649b5df..b55145d 100644
--- a/resources/views/modules/usulan/kriteria/resume.blade.php
+++ b/resources/views/modules/usulan/kriteria/resume.blade.php
@@ -1,126 +1,77 @@
 @extends('layouts.master')
 
 @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;
-    }
-    .pageNumber{ list-style:none; padding:0px; margin: 0px;}
-    .pageNumber > li{ display: inline-block; padding: 12px; background: rgba(255, 255, 255, 0.5); margin: 5px 1px;}
-    .pageNumber > li:hover{cursor: pointer;}
-    .pageNumber > li.active {
-        background-color: #007bff; /* Warna biru */
-        color: white;
-        font-weight: bold;
-    }
-</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="row" id="accordion">
+    <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
-        <form method="POST" id="form">
-        {{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>
-                        <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>
-                        <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 active">Resume</li>
-                                <li class="progress_usulan">Progress Usulan</li>
-                            </ul>
-                        </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">
-                                @foreach($page as $dataNumber)
-                                <div class="card mb-2" style="background:#EDE8DC;">
-                                    <div class="card-header color-white bg-success">
-                                        {{$dataNumber}}
-                                    </div>
-                                    <div class="card-body color-black">
-                                        {!! formKriteria($dataNumber) !!}  
-                                    </div>
-                                </div>
-                                @endforeach
-                            </div>
-                        </div>
-                        
+        </div>
+    @endif
+
+        
+        @foreach($page as $k => $dataNumber)
+        <div class="col-lg-12 mb-2">
+            <div class="card mb-2">
+                <div class="card-header bg-primary-light py-1 px-0" id="heading{{$k}}">
+                    <h5 class="mb-0">
+                      <button class="btn btn-link" data-toggle="collapse" data-target="#collapse{{$k}}" aria-expanded="true" aria-controls="collapse{{$k}}">
+                        {{$k+1}}
+                      </button>
+                    </h5>
+                  </div>
+                <div id="collapse{{$k}}" class="collapse" aria-labelledby="heading{{$k}}" data-parent="#accordion">
+                    <div class="card-body">
+                        {!! formKriteria($dataNumber) !!}  
                     </div>
                 </div>
-                
             </div>
-        </form>
-    </div>
+        </div>
+        @endforeach
 </div>
 @endsection
 @section('page-js')