diff --git a/app/Http/Controllers/Dashboard/ClassificationController.php b/app/Http/Controllers/Dashboard/ClassificationController.php
index 3ab4a40..1369570 100644
--- a/app/Http/Controllers/Dashboard/ClassificationController.php
+++ b/app/Http/Controllers/Dashboard/ClassificationController.php
@@ -34,7 +34,7 @@ public function store(ClassificationRequest $request){
             $createdClassification = Classification::create($validatedData);
 
             return redirect()->route('dashboard.classifications.index')->with('success-status', 'Berhasil membuat klasifikasi baru.')
-            ->with('new_data', $createdClassification->id);
+            ->with('new_data', encrypt_id($createdClassification->id));
         }catch (\Exception $e){
             return redirect()->back()->with('failed-status', 'Gagal membuat klasifikasi baru.');
 
diff --git a/app/Http/Controllers/Dashboard/DatatableController.php b/app/Http/Controllers/Dashboard/DatatableController.php
index a12c2b4..d9af561 100644
--- a/app/Http/Controllers/Dashboard/DatatableController.php
+++ b/app/Http/Controllers/Dashboard/DatatableController.php
@@ -52,7 +52,7 @@ public function classification(Request $request){
                 ->addIndexColumn()
                 ->addColumn('name', function ($data) use ($newData) {
 
-                    if(filled($newData) && $newData == $data->id){
+                    if(filled($newData) && decrypt_id($newData) == $data->id){
                         return '<span class="badge bg-info" style="display:inline-block;font-size:0.8rem; margin-right:0.5rem;">Baru</span>'. $data->name;
                     }else{
                         return $data->name;
@@ -163,7 +163,7 @@ public function subClassification(Request $request){
                 ->addIndexColumn()
                 ->addColumn('name', function ($data) use ($newData) {
 
-                    if(filled($newData) && $newData == $data->id){
+                    if(filled($newData) && decrypt_id($newData) == $data->id){
                         return '<span class="badge bg-info" style="display:inline-block;font-size:0.8rem; margin-right:0.5rem;">Baru</span>'. $data->name;
                     }else{
                         return $data->name;
@@ -236,8 +236,18 @@ public function location(Request $request){
 
             $data = Location::with(['subLocations'])->get();
 
+            $newData = $request->input('new_data', null);
+
             return DataTables::of($data)
                 ->addIndexColumn()
+                ->addColumn('name', function ($data) use ($newData) {
+
+                    if(filled($newData) && decrypt_id($newData) == $data->id){
+                        return '<span class="badge bg-info" style="display:inline-block;font-size:0.8rem; margin-right:0.5rem;">Baru</span>'. $data->name;
+                    }else{
+                        return $data->name;
+                    }
+                })
                 ->addColumn('status', function ($data) {
                     if ($data->status == '0') {
                         return '<span class="badge bg-danger" style="display:inline-block;font-size:0.8rem;">Nonaktif</span>';
@@ -300,7 +310,7 @@ public function location(Request $request){
                         return $dropdown;
                 })
 
-                ->rawColumns(['sub_locations', 'issues', 'status', 'action'])
+                ->rawColumns(['name', 'sub_locations', 'issues', 'status', 'action'])
                 ->make(true);
         }
 
@@ -319,10 +329,20 @@ public function subLocation(Request $request){
                 $data = SubLocation::with(['location'])->get();
             }
 
+            $newData = $request->input('new_data', null);
+
             return DataTables::of($data)
                 ->addIndexColumn()
+                ->addColumn('name', function ($data) use ($newData) {
+
+                    if(filled($newData) && decrypt_id($newData) == $data->id){
+                        return '<span class="badge bg-info" style="display:inline-block;font-size:0.8rem; margin-right:0.5rem;">Baru</span>'. $data->name;
+                    }else{
+                        return $data->name;
+                    }
+                })
                 ->addColumn('location', function ($data) {
-                    return $data->location->name;
+                    return '<a href="'.route('dashboard.locations.show', ['id' => encrypt_id($data->location->id), 'sub_location' => true]).'" class="text-dark">'.$data->location->name.'</a>';
                 })
                 ->addColumn('status', function ($data) {
                     if ($data->status == '0') {
@@ -370,7 +390,7 @@ public function subLocation(Request $request){
                         return $dropdown;
                 })
 
-                ->rawColumns(['issues', 'status', 'action'])
+                ->rawColumns(['name', 'location', 'issues', 'status', 'action'])
                 ->make(true);
         }
 
diff --git a/app/Http/Controllers/Dashboard/LocationController.php b/app/Http/Controllers/Dashboard/LocationController.php
index f20c385..4c73782 100644
--- a/app/Http/Controllers/Dashboard/LocationController.php
+++ b/app/Http/Controllers/Dashboard/LocationController.php
@@ -13,13 +13,14 @@ class LocationController extends Controller
 {
     public function index(){
         return view('dashboard.locations.index', [
-            'title' => 'Lokus'
+            'title' => 'Data Lokus',
+            'new_data' => session()->get('new_data', null),
         ]);
     }
 
     public function create(){
         return view('dashboard.locations.create', [
-            'title' => 'Tambah Lokus'
+            'title' => 'Buat Lokus Baru'
         ]);
     }
 
@@ -27,11 +28,12 @@ public function store(LocationRequest $request){
         $validatedData = $request->validated();
         $validatedData['enhancer_id'] = Auth::id();
 
-        $createdLocation = Location::create($validatedData);
+        try{
+            $createdLocation = Location::create($validatedData);
 
-        if($createdLocation){
-            return redirect()->route('dashboard.locations.index')->with('success-status', 'Berhasil menambahkan lokus.');
-        }else{
+            return redirect()->route('dashboard.locations.index')->with('success-status', 'Berhasil membuat lokus baru.')
+            ->with('new_data', encrypt_id($createdLocation->id));
+        }catch(\Exception $e){
             return redirect()->back()->with('failed-status', 'Gagal menambahkan lokus.');
         }
     }
@@ -49,18 +51,18 @@ public function update(LocationRequest $request, $id){
         $validatedData = $request->validated();
         $validatedData['enhancer_id'] = Auth::id();
 
-        $location = Location::findOrFail(decrypt_id($id));
-        $updatedLocation = $location->update($validatedData);
+        try{
+            $location = Location::findOrFail(decrypt_id($id));
+            $location->update($validatedData);
 
-        if($updatedLocation){
-            return redirect()->back()->with('success-status', 'Berhasil mengubah lokus.');
-        }else{
+            return redirect()->route('dashboard.locations.show', ['id' => encrypt_id($location->id)])->with('success-status', 'Berhasil mengubah lokus.');
+        }catch(\Exception $e){
             return redirect()->back()->with('failed-status', 'Gagal mengubah lokus.');
         }
     }
 
     public function show($id){
-        $location = Location::find(decrypt_id($id));
+        $location = Location::findOrFail(decrypt_id($id));
 
         return view('dashboard.locations.show', [
             'title' => 'Detail Lokus',
@@ -71,7 +73,6 @@ public function show($id){
     public function destroy($id){
         try {
             $location = Location::findOrFail(decrypt_id($id));
-
             $location->delete();
 
             return response()->json(['message' => 'Berhasil menghapus lokus.']);
diff --git a/app/Http/Controllers/Dashboard/SubClassificationController.php b/app/Http/Controllers/Dashboard/SubClassificationController.php
index fa25b42..1487e42 100644
--- a/app/Http/Controllers/Dashboard/SubClassificationController.php
+++ b/app/Http/Controllers/Dashboard/SubClassificationController.php
@@ -50,7 +50,7 @@ public function store(SubClassificationRequest $request){
             $createdSubClassification = SubClassification::create($validatedData);
 
             return redirect()->route('dashboard.sub.classifications.index')->with('success-status', 'Berhasil membuat sub klasifikasi baru.')
-            ->with('new_data', $createdSubClassification->id);
+            ->with('new_data', encrypt_id($createdSubClassification->id));
         }catch(\Exception $e){
             return redirect()->back()->with('failed-status', 'Gagal membuat sub klasifikasi baru.');
         }
diff --git a/app/Http/Controllers/Dashboard/SubLocationController.php b/app/Http/Controllers/Dashboard/SubLocationController.php
index bc45176..fa52a89 100644
--- a/app/Http/Controllers/Dashboard/SubLocationController.php
+++ b/app/Http/Controllers/Dashboard/SubLocationController.php
@@ -15,8 +15,9 @@ class SubLocationController extends Controller
     public function index(Request $request){
 
         $viewData = [
-            'title' => 'Sub Lokus',
+            'title' => 'Data Sub Lokus',
             'location' => $request->input('location', null),
+            'new_data' => session()->get('new_data', null),
         ];
 
         return view('dashboard.sub-locations.index', $viewData);
@@ -25,7 +26,7 @@ public function index(Request $request){
     public function create(Request $request){
 
         $viewData = [
-            'title' => 'Tambah Sub Lokus',
+            'title' => 'Buat Sub Lokus Baru',
             'fromLocation' => false
         ];
 
@@ -44,11 +45,12 @@ public function store(SubLocationRequest $request){
         $validatedData = $request->validated();
         $validatedData['enhancer_id'] = Auth::id();
 
-        $createdSubLocation = SubLocation::create($validatedData);
+        try{
+            $createdSubLocation = SubLocation::create($validatedData);
 
-        if($createdSubLocation){
-            return redirect()->route('dashboard.sub.locations.index')->with('success-status', 'Berhasil menambahkan sub lokus.');
-        }else{
+            return redirect()->route('dashboard.sub.locations.index')->with('success-status', 'Berhasil membuat sub lokus baru.')
+            ->with('new_data', encrypt_id($createdSubLocation->id));
+        }catch(\Exception $e){
             return redirect()->back()->with('failed-status', 'Gagal menambahkan sub lokus.');
         }
     }
@@ -67,18 +69,18 @@ public function update(SubLocationRequest $request, $id){
         $validatedData = $request->validated();
         $validatedData['enhancer_id'] = Auth::id();
 
-        $subLocation = SubLocation::findOrFail(decrypt_id($id));
-        $updatedSubLocation = $subLocation->update($validatedData);
+        try{
+            $subLocation = SubLocation::findOrFail(decrypt_id($id));
+            $subLocation->update($validatedData);
 
-        if($updatedSubLocation){
-            return redirect()->back()->with('success-status', 'Berhasil mengubah sub lokus.');
-        }else{
+            return redirect()->route('dashboard.sub.locations.show', ['id' => encrypt_id($subLocation->id)])->with('success-status', 'Berhasil mengubah sub lokus.');
+        }catch(\Exception  $e){
             return redirect()->back()->with('failed-status', 'Gagal mengubah sub lokus.');
         }
     }
 
     public function show($id){
-        $subLocation = SubLocation::with(['location'])->find(decrypt_id($id));
+        $subLocation = SubLocation::with(['location'])->findOrFail(decrypt_id($id));
 
         return view('dashboard.sub-locations.show', [
             'title' => 'Detail Sub Lokus',
@@ -89,7 +91,6 @@ public function show($id){
     public function destroy($id){
         try {
             $subLocation = SubLocation::findOrFail(decrypt_id($id));
-
             $subLocation->delete();
 
             return response()->json(['message' => 'Berhasil menghapus sub lokus.']);
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 69bb28b..4799277 100644
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -22,4 +22,8 @@ public function subLocations(){
     public function issues(){
         return $this->hasMany(IssueManagement::class, 'location_id', 'id');
     }
+
+    public function enhancer(){
+        return $this->belongsTo(User::class, 'enhancer_id', 'id');
+    }
 }
diff --git a/app/Models/SubLocation.php b/app/Models/SubLocation.php
index 9ab94f0..0022f8c 100644
--- a/app/Models/SubLocation.php
+++ b/app/Models/SubLocation.php
@@ -23,4 +23,8 @@ public function location(){
     public function issues(){
         return $this->hasMany(IssueManagement::class, 'sub_location_id', 'id');
     }
+
+    public function enhancer(){
+        return $this->belongsTo(User::class, 'enhancer_id', 'id');
+    }
 }
diff --git a/resources/views/dashboard/classifications/show.blade.php b/resources/views/dashboard/classifications/show.blade.php
index 6dfd9a6..a2834ef 100644
--- a/resources/views/dashboard/classifications/show.blade.php
+++ b/resources/views/dashboard/classifications/show.blade.php
@@ -51,7 +51,7 @@
                                                         <div class="profile-ud-list">
                                                             <div class="profile-ud-item">
                                                                 <div class="profile-ud wider">
-                                                                    <span class="profile-ud-label">Nama Klasifikasi</span>
+                                                                    <span class="profile-ud-label">Nama</span>
                                                                     <span class="profile-ud-value">{{$classification->name}}</span>
                                                                 </div>
                                                             </div>
@@ -61,7 +61,7 @@
                                                                     @if (filled($classification->deleted_at))
                                                                     <span class="profile-ud-value"><span class="badge bg-danger">Dihapus</span></span>
                                                                     @elseif ($classification->status == 0)
-                                                                        <span class="profile-ud-value"><span class="badge bg-warning">Nonaktif</span></span>
+                                                                        <span class="profile-ud-value"><span class="badge bg-danger">Nonaktif</span></span>
                                                                     @elseif ($classification->status == 1)
                                                                         <span class="profile-ud-value"><span class="badge bg-primary">Aktif</span></span>
                                                                     @else
diff --git a/resources/views/dashboard/locations/create.blade.php b/resources/views/dashboard/locations/create.blade.php
index 776fc65..42070b2 100644
--- a/resources/views/dashboard/locations/create.blade.php
+++ b/resources/views/dashboard/locations/create.blade.php
@@ -10,16 +10,19 @@
                                     <div class="card card-bordered card-preview">
                                         <div class="card-inner">
                                             <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                                <div class="nk-block-head">
+                                                    <h5 class="title">Buat Lokus Baru</h5>
+                                                    <p>Masukkan informasi yang diperlukan untuk membuat lokus.</p>
+                                                </div>
                                             </div>
                                             <form action="{{route('dashboard.locations.store')}}" method="post" id="myForm">
                                                 @csrf
                                                 <div class="row g-4">
                                                     <div class="col-lg-6">
                                                         <div class="form-group">
-                                                            <label class="form-label" for="name">Nama Lokus<span class="required-input">*</span></label>
+                                                            <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama lokus" value="{{old('name')}}">
+                                                                <input type="text" class="form-control" id="name" name="name" placeholder="Contoh: Wanayasa, Plered, Pasawahan" value="{{old('name')}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -31,10 +34,14 @@
                                                             <label class="form-label">Status<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
                                                                 <select class="form-select js-select2" name="status">
+                                                                    <option value="select" selected disabled>Pilih Status</option>
                                                                     <option value="1" {{old('status') == '1' ? 'selected' : ''}}>Aktif</option>
                                                                     <option value="0" {{old('status') == '0' ? 'selected' : ''}}>Tidak Aktif</option>
                                                                 </select>
                                                             </div>
+                                                            @error('status')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-lg-12">
@@ -43,6 +50,9 @@
                                                             <div class="form-control-wrap">
                                                                 <textarea class="tinymce-basic form-control" name="description">{!!old('description')!!}</textarea>
                                                             </div>
+                                                            @error('description')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-12">
diff --git a/resources/views/dashboard/locations/edit.blade.php b/resources/views/dashboard/locations/edit.blade.php
index 9db8073..d436af8 100644
--- a/resources/views/dashboard/locations/edit.blade.php
+++ b/resources/views/dashboard/locations/edit.blade.php
@@ -10,7 +10,10 @@
                                     <div class="card card-bordered card-preview">
                                         <div class="card-inner">
                                             <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                                <div class="nk-block-head">
+                                                    <h5 class="title">Ubah Lokus</h5>
+                                                    <p>Perbarui informasi lokus ini.</p>
+                                                </div>
                                             </div>
                                             <form action="{{route('dashboard.locations.update', ['id' => encrypt_id($location->id)])}}" method="post" id="myForm">
                                                 @csrf
@@ -18,9 +21,9 @@
                                                 <div class="row g-4">
                                                     <div class="col-lg-6">
                                                         <div class="form-group">
-                                                            <label class="form-label" for="name">Nama Lokus<span class="required-input">*</span></label>
+                                                            <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama lokus" value="{{ $location->name}}">
+                                                                <input type="text" class="form-control" id="name" name="name" placeholder="Contoh: Wanayasa, Plered, Pasawahan" value="{{ $location->name}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -36,6 +39,9 @@
                                                                     <option value="0" {{$location->status == '0' ? 'selected' : ''}}>Tidak Aktif</option>
                                                                 </select>
                                                             </div>
+                                                            @error('status')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-lg-12">
@@ -45,6 +51,9 @@
                                                                 <textarea class="tinymce-basic form-control" name="description">{!!$location->description!!}</textarea>
                                                             </div>
                                                         </div>
+                                                        @error('description')
+                                                        <span class="validation-error">{{$message}}</span>
+                                                        @enderror
                                                     </div>
                                                     <div class="col-12">
                                                         <hr>
diff --git a/resources/views/dashboard/locations/index.blade.php b/resources/views/dashboard/locations/index.blade.php
index 7e9032d..aa25cd5 100644
--- a/resources/views/dashboard/locations/index.blade.php
+++ b/resources/views/dashboard/locations/index.blade.php
@@ -46,9 +46,9 @@
                                                         <tr>
                                                             <th>No</th>
                                                             <th>Nama</th>
+                                                            <th>Jumlah Sub Lokasi</th>
+                                                            <th>Jumlah Isu</th>
                                                             <th>Status</th>
-                                                            <th>Sub Lokasi</th>
-                                                            <th>Isu</th>
                                                             <th></th>
                                                         </tr>
                                                     </thead>
diff --git a/resources/views/dashboard/locations/show.blade.php b/resources/views/dashboard/locations/show.blade.php
index 9ea01b6..6182c5f 100644
--- a/resources/views/dashboard/locations/show.blade.php
+++ b/resources/views/dashboard/locations/show.blade.php
@@ -6,13 +6,40 @@
                     <div class="container-fluid">
                         <div class="nk-content-inner">
                             <div class="nk-content-body">
+                                <div class="nk-block-head nk-block-head-sm">
+                                    <div class="nk-block-between g-3">
+                                        <div class="nk-block-head-content">
+                                            <h3 class="nk-block-title page-title">Detail Lokus</h3>
+                                            <div class="nk-block-des text-soft">
+                                                <ul class="list-inline">
+                                                    <li>Detail lokus dapat dilihat di sini.</li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <div class="nk-block-head-content">
+                                            @if (request()->query('sub_location') && request()->query('sub_location') === '1')
+                                            <a href="{{route('dashboard.sub.locations.index')}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                            <a href="{{route('dashboard.sub.locations.index')}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                            @elseif (request()->query('sub_location') && request()->query('sub_location') !== 1)
+                                            <a href="{{route('dashboard.sub.locations.show', ['id' => request()->query('sub_location')])}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                            <a href="{{route('dashboard.sub.locations.show', ['id' => request()->query('sub_location')])}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                            @else
+                                            <a href="{{route('dashboard.locations.index')}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                            <a href="{{route('dashboard.locations.index')}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                            @endif
+                                        </div>
+                                    </div>
+                                </div><!-- .nk-block-head -->
                                 <div class="nk-block nk-block-lg">
                                     <div class="card">
                                         <div class="card-aside-wrap">
                                             <div class="card-content">
                                                 <ul class="nav nav-tabs nav-tabs-mb-icon nav-tabs-card">
                                                     <li class="nav-item">
-                                                        <a class="nav-link text-primary" href="#"><em class="icon ni ni-info"></em><span>Detail Lokus</span></a>
+                                                        <a class="nav-link text-primary" href="javascript:void(0);"><em class="icon ni ni-info"></em><span>Detail Informasi</span></a>
+                                                    </li>
+                                                    <li class="nav-item nav-item-trigger d-xxl-none">
+                                                        <a href="{{route('dashboard.locations.edit', ['id' => encrypt_id($location->id), 'show' => true])}}" class="btn btn-icon btn-trigger"><em class="icon ni ni-edit"></em></a>
                                                     </li>
                                                 </ul><!-- .nav-tabs -->
                                                 <div class="card-inner">
@@ -24,7 +51,7 @@
                                                         <div class="profile-ud-list">
                                                             <div class="profile-ud-item">
                                                                 <div class="profile-ud wider">
-                                                                    <span class="profile-ud-label">Nama Lokasi</span>
+                                                                    <span class="profile-ud-label">Nama</span>
                                                                     <span class="profile-ud-value">{{$location->name}}</span>
                                                                 </div>
                                                             </div>
@@ -34,7 +61,7 @@
                                                                     @if (filled($location->deleted_at))
                                                                     <span class="profile-ud-value"><span class="badge bg-danger">Dihapus</span></span>
                                                                     @elseif ($location->status == 0)
-                                                                        <span class="profile-ud-value"><span class="badge bg-warning">Nonaktif</span></span>
+                                                                        <span class="profile-ud-value"><span class="badge bg-danger">Nonaktif</span></span>
                                                                     @elseif ($location->status == 1)
                                                                         <span class="profile-ud-value"><span class="badge bg-primary">Aktif</span></span>
                                                                     @else
@@ -73,6 +100,12 @@
                                                                     <span class="profile-ud-value">{{idn_date($location->created_at, 'l, d F Y')}}</span>
                                                                 </div>
                                                             </div>
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Dibuat Oleh</span>
+                                                                    <span class="profile-ud-value">{{$location->enhancer->name}}</span>
+                                                                </div>
+                                                            </div>
                                                         </div><!-- .profile-ud-list -->
                                                     </div><!-- .nk-block -->
                                                     {{-- <div class="nk-divider divider md"></div> --}}
@@ -83,16 +116,11 @@
                                                         <div class="bq-note">
                                                             <div class="bq-note-item">
                                                                 <div class="bq-note-text">
-                                                                    {!!$location->description ?? '-' !!}
+                                                                    {!!$classification->description ?? '-' !!}
                                                                 </div>
                                                             </div><!-- .bq-note-item -->
                                                         </div><!-- .bq-note -->
                                                     </div><!-- .nk-block -->
-                                                    <hr>
-                                                    <div class="nk-block d-flex justify-content-end">
-                                                        <a href="{{route('dashboard.locations.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                            <a href="{{route('dashboard.locations.edit', ['id' => encrypt_id($location->id), 'show' => true])}}" class="btn btn-warning"><span>Ubah</span></a>
-                                                    </div><!-- .nk-block -->
                                                 </div><!-- .card-inner -->
                                             </div><!-- .card-content -->
                                         </div><!-- .card-aside-wrap -->
diff --git a/resources/views/dashboard/sub-classifications/show.blade.php b/resources/views/dashboard/sub-classifications/show.blade.php
index 3dd3b0b..49cdfc3 100644
--- a/resources/views/dashboard/sub-classifications/show.blade.php
+++ b/resources/views/dashboard/sub-classifications/show.blade.php
@@ -73,7 +73,7 @@
                                                                     @if (filled($subClassification->deleted_at))
                                                                     <span class="profile-ud-value"><span class="badge bg-danger">Dihapus</span></span>
                                                                     @elseif ($subClassification->status == 0)
-                                                                        <span class="profile-ud-value"><span class="badge bg-warning">Nonaktif</span></span>
+                                                                        <span class="profile-ud-value"><span class="badge bg-danger">Nonaktif</span></span>
                                                                     @elseif ($subClassification->status == 1)
                                                                         <span class="profile-ud-value"><span class="badge bg-primary">Aktif</span></span>
                                                                     @else
diff --git a/resources/views/dashboard/sub-locations/create.blade.php b/resources/views/dashboard/sub-locations/create.blade.php
index a953af1..aa42392 100644
--- a/resources/views/dashboard/sub-locations/create.blade.php
+++ b/resources/views/dashboard/sub-locations/create.blade.php
@@ -10,16 +10,19 @@
                                     <div class="card card-bordered card-preview">
                                         <div class="card-inner">
                                             <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                                <div class="nk-block-head">
+                                                    <h5 class="title">Buat Sub Lokus Baru</h5>
+                                                    <p>Masukkan informasi yang diperlukan untuk membuat sub lokus.</p>
+                                                </div>
                                             </div>
                                             <form action="{{route('dashboard.sub.locations.store')}}" method="post" id="myForm">
                                                 @csrf
                                                 <div class="row g-4">
                                                     <div class="col-lg-6">
                                                         <div class="form-group">
-                                                            <label class="form-label" for="name">Nama Sub Lokus<span class="required-input">*</span></label>
+                                                            <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama sub lokus" value="{{old('name')}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Contoh: Citalang, Sempur, Gunungkarung" value="{{old('name')}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -36,12 +39,16 @@
                                                                 </select>
                                                                 @else
                                                                 <select class="form-select js-select2" data-search="on" name="location_id">
+                                                                    <option value="select" selected disabled>Pilih Lokus</option>
                                                                     @foreach ($locations as $location)
                                                                     <option value="{{$location->id}}" {{old('location_id') == $location->id ? 'selected' : ''}}>{{$location->name}}</option>
                                                                     @endforeach
                                                                 </select>
                                                                 @endif
                                                             </div>
+                                                            @error('location_id')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-lg-6">
@@ -49,10 +56,14 @@
                                                             <label class="form-label">Status<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
                                                                 <select class="form-select js-select2" name="status">
+                                                                    <option value="select" selected disabled>Pilih Status</option>
                                                                     <option value="1" {{old('status') == '1' ? 'selected' : ''}}>Aktif</option>
                                                                     <option value="0" {{old('status') == '0' ? 'selected' : ''}}>Tidak Aktif</option>
                                                                 </select>
                                                             </div>
+                                                            @error('status')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-lg-12">
@@ -62,6 +73,9 @@
                                                                 <textarea class="tinymce-basic form-control" name="description">{!!old('description')!!}</textarea>
                                                             </div>
                                                         </div>
+                                                        @error('description')
+                                                        <span class="validation-error">{{$message}}</span>
+                                                        @enderror
                                                     </div>
                                                     <div class="col-12">
                                                         <hr>
diff --git a/resources/views/dashboard/sub-locations/edit.blade.php b/resources/views/dashboard/sub-locations/edit.blade.php
index 449a3c4..6b110c0 100644
--- a/resources/views/dashboard/sub-locations/edit.blade.php
+++ b/resources/views/dashboard/sub-locations/edit.blade.php
@@ -10,7 +10,10 @@
                                     <div class="card card-bordered card-preview">
                                         <div class="card-inner">
                                             <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                                <div class="nk-block-head">
+                                                    <h5 class="title">Ubah Sub Lokus</h5>
+                                                    <p>Perbarui informasi sub lokus ini.</p>
+                                                </div>
                                             </div>
                                             <form action="{{route('dashboard.sub.locations.update', ['id' => encrypt_id($subLocation->id)])}}" method="post" id="myForm">
                                                 @csrf
@@ -20,7 +23,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama Sub Lokus<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama sub lokus" value="{{$subLocation->name}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Contoh: Citalang, Sempur, Gunungkarung" value="{{$subLocation->name}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -38,6 +41,9 @@
                                                                 </select>
                                                             </div>
                                                         </div>
+                                                        @error('location_id')
+                                                        <span class="validation-error">{{$message}}</span>
+                                                        @enderror
                                                     </div>
                                                     <div class="col-lg-6">
                                                         <div class="form-group">
@@ -49,6 +55,9 @@
                                                                 </select>
                                                             </div>
                                                         </div>
+                                                        @error('status')
+                                                        <span class="validation-error">{{$message}}</span>
+                                                        @enderror
                                                     </div>
                                                     <div class="col-lg-12">
                                                         <div class="form-group">
@@ -57,6 +66,9 @@
                                                                 <textarea class="tinymce-basic form-control" name="description">{!!$subLocation->description!!}</textarea>
                                                             </div>
                                                         </div>
+                                                        @error('description')
+                                                        <span class="validation-error">{{$message}}</span>
+                                                        @enderror
                                                     </div>
                                                     <div class="col-12">
                                                         <hr>
diff --git a/resources/views/dashboard/sub-locations/index.blade.php b/resources/views/dashboard/sub-locations/index.blade.php
index 5d8a30c..41e13c1 100644
--- a/resources/views/dashboard/sub-locations/index.blade.php
+++ b/resources/views/dashboard/sub-locations/index.blade.php
@@ -45,8 +45,8 @@
                                                     <thead>
                                                         <tr>
                                                             <th>No</th>
-                                                            <th>Lokus</th>
                                                             <th>Nama</th>
+                                                            <th>Lokus</th>
                                                             <th>Isu</th>
                                                             <th>Status</th>
                                                             <th></th>
diff --git a/resources/views/dashboard/sub-locations/show.blade.php b/resources/views/dashboard/sub-locations/show.blade.php
index b44fed1..625a6c1 100644
--- a/resources/views/dashboard/sub-locations/show.blade.php
+++ b/resources/views/dashboard/sub-locations/show.blade.php
@@ -6,13 +6,32 @@
                     <div class="container-fluid">
                         <div class="nk-content-inner">
                             <div class="nk-content-body">
+                                <div class="nk-block-head nk-block-head-sm">
+                                    <div class="nk-block-between g-3">
+                                        <div class="nk-block-head-content">
+                                            <h3 class="nk-block-title page-title">Detail Sub Lokus</h3>
+                                            <div class="nk-block-des text-soft">
+                                                <ul class="list-inline">
+                                                    <li>Detail sub lokus dapat dilihat di sini.</li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <div class="nk-block-head-content">
+                                            <a href="{{route('dashboard.sub.locations.index')}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                            <a href="{{route('dashboard.sub.locations.index')}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                        </div>
+                                    </div>
+                                </div><!-- .nk-block-head -->
                                 <div class="nk-block nk-block-lg">
                                     <div class="card">
                                         <div class="card-aside-wrap">
                                             <div class="card-content">
                                                 <ul class="nav nav-tabs nav-tabs-mb-icon nav-tabs-card">
                                                     <li class="nav-item">
-                                                        <a class="nav-link text-primary" href="#"><em class="icon ni ni-info"></em><span>Detail Sub Lokus</span></a>
+                                                        <a class="nav-link text-primary" href="javascript:void(0);"><em class="icon ni ni-info"></em><span>Detail Informasi</span></a>
+                                                    </li>
+                                                    <li class="nav-item nav-item-trigger d-xxl-none">
+                                                        <a href="{{route('dashboard.sub.locations.edit', ['id' => encrypt_id($subLocation->id), 'show' => true])}}" class="btn btn-icon btn-trigger"><em class="icon ni ni-edit"></em></a>
                                                     </li>
                                                 </ul><!-- .nav-tabs -->
                                                 <div class="card-inner">
@@ -24,14 +43,16 @@
                                                         <div class="profile-ud-list">
                                                             <div class="profile-ud-item">
                                                                 <div class="profile-ud wider">
-                                                                    <span class="profile-ud-label">Nama Sub Lokus</span>
+                                                                    <span class="profile-ud-label">Nama</span>
                                                                     <span class="profile-ud-value">{{$subLocation->name}}</span>
                                                                 </div>
                                                             </div>
                                                             <div class="profile-ud-item">
                                                                 <div class="profile-ud wider">
-                                                                    <span class="profile-ud-label">Nama Lokus</span>
-                                                                    <span class="profile-ud-value">{{$subLocation->location->name}}</span>
+                                                                    <span class="profile-ud-label">Lokus</span>
+                                                                    <span class="profile-ud-value">
+                                                                        <a href="{{route('dashboard.locations.show', ['id' => encrypt_id($subLocation->location->id), 'sub_location' => encrypt_id($subLocation->id)])}}">{{$subLocation->location->name}}</a>
+                                                                    </span>
                                                                 </div>
                                                             </div>
                                                             <div class="profile-ud-item">
@@ -52,7 +73,7 @@
                                                                     @if (filled($subLocation->deleted_at))
                                                                     <span class="profile-ud-value"><span class="badge bg-danger">Dihapus</span></span>
                                                                     @elseif ($subLocation->status == 0)
-                                                                        <span class="profile-ud-value"><span class="badge bg-warning">Nonaktif</span></span>
+                                                                        <span class="profile-ud-value"><span class="badge bg-danger">Nonaktif</span></span>
                                                                     @elseif ($subLocation->status == 1)
                                                                         <span class="profile-ud-value"><span class="badge bg-primary">Aktif</span></span>
                                                                     @else
@@ -66,6 +87,12 @@
                                                                     <span class="profile-ud-value">{{idn_date($subLocation->created_at, 'l, d F Y')}}</span>
                                                                 </div>
                                                             </div>
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Dibuat Oleh</span>
+                                                                    <span class="profile-ud-value">{{$subLocation->enhancer->name}}</span>
+                                                                </div>
+                                                            </div>
                                                         </div><!-- .profile-ud-list -->
                                                     </div><!-- .nk-block -->
                                                     {{-- <div class="nk-divider divider md"></div> --}}
@@ -81,11 +108,6 @@
                                                             </div><!-- .bq-note-item -->
                                                         </div><!-- .bq-note -->
                                                     </div><!-- .nk-block -->
-                                                    <hr>
-                                                    <div class="nk-block d-flex justify-content-end">
-                                                        <a href="{{route('dashboard.sub.locations.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                        <a href="{{route('dashboard.sub.locations.edit', ['id' => encrypt_id($subLocation->id), 'show' => true])}}" class="btn btn-warning"><span>Ubah</span></a>
-                                                    </div><!-- .nk-block -->
                                                 </div><!-- .card-inner -->
                                             </div><!-- .card-content -->
                                         </div><!-- .card-aside-wrap -->
diff --git a/resources/views/partials/app/datatable.blade.php b/resources/views/partials/app/datatable.blade.php
index 5bb02e0..c8a50d4 100644
--- a/resources/views/partials/app/datatable.blade.php
+++ b/resources/views/partials/app/datatable.blade.php
@@ -142,29 +142,37 @@
             processing: true,
             serverSide: true,
             ajax: '{{ route('dashboard.locations.data') }}',
+            ajax: {
+                url: '{{ route('dashboard.locations.data') }}',
+                type: 'GET',
+                data: function(d) {
+                    d.new_data = '{{ $new_data }}';
+                }
+            },
             columns: [
                 { data: 'DT_RowIndex', name: 'DT_RowIndex', orderable: false, searchable: false },
                 { data: 'name', name: 'name' },
-                { data: 'status', name: 'status' },
                 { data: 'sub_locations', name: 'sub_locations' },
                 { data: 'issues', name: 'issues' },
+                { data: 'status', name: 'status' },
                 { data: 'action', name: 'action', orderable: false, searchable: false },
                 { data: 'created_at', name: 'created_at', visible: false },
                 { data: 'id', name: 'id', orderable: true, searchable: false, visible: false },
             ],
             columnDefs: [
-                { targets: 0, width: 'auto' },
-                { targets: 2, width: '7%' },
-                { targets: 3, width: '10%' },
-                { targets: 4, width: '10%' },
-                { targets: 5, width: '5%' },
+                { targets: 0, width: '2%' }, // Index
+                { targets: 1, width: '20%' }, // Name
+                { targets: 2, width: '3%' }, // Sub Location
+                { targets: 3, width: '3%' }, // Issue
+                { targets: 4, width: '3%' }, // Status
+                { targets: 5, width: '2%', className: 'text-center' }, // Action button
+
                 {
-                    targets: [1],
-                    createdCell: function(td, cellData, rowData, row, col) {
+                    targets: [1, 2], // Title & Link
+                    createdCell: function(td) {
                         $(td).css({
-                            'word-wrap': 'break-word',
                             'white-space': 'normal',
-                            'overflow-wrap': 'break-word'
+                            'word-break': 'break-word',
                         });
                     }
                 }
@@ -188,11 +196,18 @@
         $('#subLocationsTable').DataTable({
             processing: true,
             serverSide: true,
-            ajax: '{{ route('dashboard.sub.locations.data', ["location" => $location]) }}',
+            ajax: {
+                url: '{{ route('dashboard.sub.locations.data') }}',
+                type: 'GET',
+                data: function(d) {
+                    d.location = '{{ $location }}';
+                    d.new_data = '{{ $new_data }}';
+                }
+            },
             columns: [
                 { data: 'DT_RowIndex', name: 'DT_RowIndex', orderable: false, searchable: false },
-                { data: 'location', name: 'location' },
                 { data: 'name', name: 'name' },
+                { data: 'location', name: 'location' },
                 { data: 'issues', name: 'issues' },
                 { data: 'status', name: 'status' },
                 { data: 'action', name: 'action', orderable: false, searchable: false },
@@ -200,18 +215,19 @@
                 { data: 'id', name: 'id', orderable: true, searchable: false, visible: false },
             ],
             columnDefs: [
-                { targets: 0, width: 'auto' },
-                { targets: 1, width: 'auto' },
-                { targets: 3, width: '12%' },
-                { targets: 4, width: '7%' },
-                { targets: 5, width: '5%' },
+                { targets: 0, width: '2%' }, // Index
+                { targets: 1, width: '20%' }, // Name
+                { targets: 2, width: '3%' }, // Sub Location
+                { targets: 3, width: '3%' }, // Issue
+                { targets: 4, width: '3%' }, // Status
+                { targets: 5, width: '2%', className: 'text-center' }, // Action button
+
                 {
-                    targets: [2],
-                    createdCell: function(td, cellData, rowData, row, col) {
+                    targets: [1, 2], // Title & Link
+                    createdCell: function(td) {
                         $(td).css({
-                            'word-wrap': 'break-word',
                             'white-space': 'normal',
-                            'overflow-wrap': 'break-word'
+                            'word-break': 'break-word',
                         });
                     }
                 }