diff --git a/app/Http/Controllers/Api/TanamanController.php b/app/Http/Controllers/Api/TanamanController.php
index 1064317..a92db61 100644
--- a/app/Http/Controllers/Api/TanamanController.php
+++ b/app/Http/Controllers/Api/TanamanController.php
@@ -25,16 +25,17 @@ class TanamanController extends Controller
         if (!Gate::any(['petani', 'fasilitator'])) {
             abort(403);
         }
-
-        $profile = Auth::user()->profile;
+        $user = Auth::user();
+        $profile = $user->profile;
+        $profileId = $user->role === 'petani' ? $profile->id : $request->profile_id;
 
         $size = $request->integer('size') ?: 10;
 
-        $tanamanList = Tanaman::where('profile_id', $profile->id)
-            ->when($request->search, function ($q, $search) {
+        $tanamanList = Tanaman::when($request->search, function ($q, $search) {
                 $search = strtolower($search);
                 $q->whereRaw('lower(nama) like ?', ["%{$search}%"]);
             })
+            ->when($profileId, fn($q,$v) => $q->where('profile_id',$v))
             ->when($request->status_kepemilikan, fn($q,$v) => $q->where('status_kepemilikan',$v))
             ->when($request->lahan_id, fn($q,$v) => $q->where('lahan_id',$v))
             ->when($request->komoditas_id, fn($q,$v) => $q->where('komoditas_id',$v))
diff --git a/app/Http/Controllers/Web/Ekosistem/KeluargaController.php b/app/Http/Controllers/Web/Master/KeluargaController.php
similarity index 99%
rename from app/Http/Controllers/Web/Ekosistem/KeluargaController.php
rename to app/Http/Controllers/Web/Master/KeluargaController.php
index 5ac1834..907fb53 100644
--- a/app/Http/Controllers/Web/Ekosistem/KeluargaController.php
+++ b/app/Http/Controllers/Web/Master/KeluargaController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Master;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Web/Ekosistem/KomoditasController.php b/app/Http/Controllers/Web/Master/KomoditasController.php
similarity index 98%
rename from app/Http/Controllers/Web/Ekosistem/KomoditasController.php
rename to app/Http/Controllers/Web/Master/KomoditasController.php
index 694ed98..db955ee 100644
--- a/app/Http/Controllers/Web/Ekosistem/KomoditasController.php
+++ b/app/Http/Controllers/Web/Master/KomoditasController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Master;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Web/Ekosistem/LahanController.php b/app/Http/Controllers/Web/Produktivitas/LahanController.php
similarity index 98%
rename from app/Http/Controllers/Web/Ekosistem/LahanController.php
rename to app/Http/Controllers/Web/Produktivitas/LahanController.php
index a376b8b..b8afbc2 100644
--- a/app/Http/Controllers/Web/Ekosistem/LahanController.php
+++ b/app/Http/Controllers/Web/Produktivitas/LahanController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Web/Ekosistem/ProfileController.php b/app/Http/Controllers/Web/Produktivitas/ProfileController.php
similarity index 99%
rename from app/Http/Controllers/Web/Ekosistem/ProfileController.php
rename to app/Http/Controllers/Web/Produktivitas/ProfileController.php
index 4448def..7424625 100644
--- a/app/Http/Controllers/Web/Ekosistem/ProfileController.php
+++ b/app/Http/Controllers/Web/Produktivitas/ProfileController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Web/Ekosistem/TanamanController.php b/app/Http/Controllers/Web/Produktivitas/TanamanController.php
similarity index 98%
rename from app/Http/Controllers/Web/Ekosistem/TanamanController.php
rename to app/Http/Controllers/Web/Produktivitas/TanamanController.php
index a8694b9..6de1a1d 100644
--- a/app/Http/Controllers/Web/Ekosistem/TanamanController.php
+++ b/app/Http/Controllers/Web/Produktivitas/TanamanController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Web\Ekosistem;
+namespace App\Http\Controllers\Web\Produktivitas;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Web/Program/PelatihanController.php b/app/Http/Controllers/Web/Program/PelatihanController.php
new file mode 100644
index 0000000..563ea6d
--- /dev/null
+++ b/app/Http/Controllers/Web/Program/PelatihanController.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers\Web\Program;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class PelatihanController extends Controller
+{
+    //
+}
diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/layout/sidebar.blade.php
index c1e9c23..6c1c9cd 100644
--- a/resources/views/layout/sidebar.blade.php
+++ b/resources/views/layout/sidebar.blade.php
@@ -93,14 +93,6 @@
             <i class="menu-icon icon-base ti tabler-file-description"></i>
             <div data-i18n="Data Pertanian">Data Pertanian</div>
         </a>
-        <ul class="menu-sub">
-            <li class="menu-item">
-                <a href="{{ route('keluarga.index') }}" class="menu-link">
-                <i class="menu-icon icon-base ti tabler-sitemap"></i>
-                <div data-i18n="Keluarga">Keluarga</div>
-                </a>
-            </li>
-        </ul>
         <ul class="menu-sub">
             <li class="menu-item">
                 <a href="{{ route('profile.index') }}" class="menu-link">
@@ -122,13 +114,6 @@
                 </a>
             </li>
         </ul>
-        <ul class="menu-sub">
-            <li class="menu-item">
-                <a href="{{ route('komoditas.index') }}" class="menu-link">
-                <div data-i18n="Pemantauan Komoditas">Pemantauan Komoditas</div>
-                </a>
-            </li>
-        </ul>
         <ul class="menu-sub">
             <li class="menu-item">
                 <a href="{{ route('tanaman.index') }}" class="menu-link">
@@ -257,6 +242,18 @@
         <div data-i18n="Adat">Adat</div>
         </a>
     </li>
+    <li class="menu-item">
+        <a href="{{ route('keluarga.index') }}" class="menu-link">
+        <i class="menu-icon icon-base ti tabler-sitemap"></i>
+        <div data-i18n="Keluarga">Keluarga</div>
+        </a>
+    </li>
+    <li class="menu-item">
+        <a href="{{ route('komoditas.index') }}" class="menu-link">
+        <i class="menu-icon icon-base ti tabler-plant"></i>
+        <div data-i18n="Komoditas">Komoditas</div>
+        </a>
+    </li>
 
     <!-- Konfigurasi -->
     <li class="menu-header small">
diff --git a/resources/views/master/lahan/view.blade.php b/resources/views/master/lahan/view.blade.php
index 435ae6c..2bcf37b 100644
--- a/resources/views/master/lahan/view.blade.php
+++ b/resources/views/master/lahan/view.blade.php
@@ -109,7 +109,9 @@
                         
                         <div class="mt-3">
                             <label class="form-label">Raw Data Koordinat (JSON)</label>
-                            <textarea class="form-control bg-lighter font-monospace" rows="3" readonly>{{ $lahan->path ?? 'Tidak ada data koordinat' }}</textarea>
+                            <textarea class="form-control bg-lighter font-monospace" rows="3" readonly>
+                                {{ is_array($lahan->path) || is_object($lahan->path) ? json_encode($lahan->path, JSON_PRETTY_PRINT) : ($lahan->path ?? 'Tidak ada data koordinat') }}
+                            </textarea>
                         </div>
                     </div>
                 </div>
@@ -126,7 +128,7 @@
 <script>
     document.addEventListener("DOMContentLoaded", function() {
 
-        let rawData = {!! $lahan->path ? $lahan->path : '[]' !!};
+        let rawData = {!! json_encode($lahan->path ?? []) !!};
         let dataTanaman = {!! json_encode($lahan->tanaman ?? []) !!}; 
         
         let mapContainer = document.getElementById('map');
diff --git a/routes/web.php b/routes/web.php
index 0c0df78..88656f3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -72,42 +72,42 @@ Route::middleware('auth')
     Route::delete('/users/{id}', [App\Http\Controllers\Web\Konfigurasi\UserController::class, 'destroy'])->name('users.destroy');
     
     // Profil
-    Route::get('/profile', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'index'])->name('profile.index');
-    Route::get('/profile/add', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'create'])->name('profile.create');
-    Route::post('/profile', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'store'])->name('profile.store');
-    Route::get('/profile/{id}', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'show'])->name('profile.show');
-    Route::get('/profile/edit/{id}', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'edit'])->name('profile.edit');
-    Route::put('/profile/{id}', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'update'])->name('profile.update');
-    Route::delete('/profile/{id}', [App\Http\Controllers\Web\Ekosistem\ProfileController::class, 'destroy'])->name('profile.destroy');
+    Route::get('/profile', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'index'])->name('profile.index');
+    Route::get('/profile/add', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'create'])->name('profile.create');
+    Route::post('/profile', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'store'])->name('profile.store');
+    Route::get('/profile/{id}', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'show'])->name('profile.show');
+    Route::get('/profile/edit/{id}', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'edit'])->name('profile.edit');
+    Route::put('/profile/{id}', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'update'])->name('profile.update');
+    Route::delete('/profile/{id}', [App\Http\Controllers\Web\Produktivitas\ProfileController::class, 'destroy'])->name('profile.destroy');
 
-    Route::get('/lahan', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'index'])->name('lahan.index');
-    Route::get('/lahan/add', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'create'])->name('lahan.create');
-    Route::post('/lahan', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'store'])->name('lahan.store');
-    Route::get('/lahan/edit/{id}', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'edit'])->name('lahan.edit');
-    Route::put('/lahan/{id}', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'update'])->name('lahan.update');
-    Route::delete('/lahan/{id}', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'destroy'])->name('lahan.destroy');
-    Route::get('/lahan/{id}', [App\Http\Controllers\Web\Ekosistem\LahanController::class, 'show'])->name('lahan.show');
+    Route::get('/lahan', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'index'])->name('lahan.index');
+    Route::get('/lahan/add', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'create'])->name('lahan.create');
+    Route::post('/lahan', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'store'])->name('lahan.store');
+    Route::get('/lahan/edit/{id}', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'edit'])->name('lahan.edit');
+    Route::put('/lahan/{id}', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'update'])->name('lahan.update');
+    Route::delete('/lahan/{id}', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'destroy'])->name('lahan.destroy');
+    Route::get('/lahan/{id}', [App\Http\Controllers\Web\Produktivitas\LahanController::class, 'show'])->name('lahan.show');
 
-    Route::get('/komoditas', [App\Http\Controllers\Web\Ekosistem\KomoditasController::class, 'index'])->name('komoditas.index');
-    Route::post('/komoditas', [App\Http\Controllers\Web\Ekosistem\KomoditasController::class, 'store'])->name('komoditas.store');
-    Route::get('/komoditas/{id}', [App\Http\Controllers\Web\Ekosistem\KomoditasController::class, 'show'])->name('komoditas.show');
-    Route::put('/komoditas/{id}', [App\Http\Controllers\Web\Ekosistem\KomoditasController::class, 'update'])->name('komoditas.update');
-    Route::delete('/komoditas/{id}', [App\Http\Controllers\Web\Ekosistem\KomoditasController::class, 'destroy'])->name('komoditas.destroy');
+    Route::get('/komoditas', [App\Http\Controllers\Web\Master\KomoditasController::class, 'index'])->name('komoditas.index');
+    Route::post('/komoditas', [App\Http\Controllers\Web\Master\KomoditasController::class, 'store'])->name('komoditas.store');
+    Route::get('/komoditas/{id}', [App\Http\Controllers\Web\Master\KomoditasController::class, 'show'])->name('komoditas.show');
+    Route::put('/komoditas/{id}', [App\Http\Controllers\Web\Master\KomoditasController::class, 'update'])->name('komoditas.update');
+    Route::delete('/komoditas/{id}', [App\Http\Controllers\Web\Master\KomoditasController::class, 'destroy'])->name('komoditas.destroy');
 
-    Route::get('/keluarga', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'index'])->name('keluarga.index');
-    Route::get('/keluarga/add', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'create'])->name('keluarga.create');
-    Route::post('/keluarga', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'store'])->name('keluarga.store');
-    Route::get('/keluarga/edit/{id}', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'edit'])->name('keluarga.edit');
-    Route::put('/keluarga/{id}', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'update'])->name('keluarga.update');
-    Route::delete('/keluarga/{id}', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'destroy'])->name('keluarga.destroy');
-    Route::get('/keluarga/{id}', [App\Http\Controllers\Web\Ekosistem\KeluargaController::class, 'show'])->name('keluarga.show');
+    Route::get('/keluarga', [App\Http\Controllers\Web\Master\KeluargaController::class, 'index'])->name('keluarga.index');
+    Route::get('/keluarga/add', [App\Http\Controllers\Web\Master\KeluargaController::class, 'create'])->name('keluarga.create');
+    Route::post('/keluarga', [App\Http\Controllers\Web\Master\KeluargaController::class, 'store'])->name('keluarga.store');
+    Route::get('/keluarga/edit/{id}', [App\Http\Controllers\Web\Master\KeluargaController::class, 'edit'])->name('keluarga.edit');
+    Route::put('/keluarga/{id}', [App\Http\Controllers\Web\Master\KeluargaController::class, 'update'])->name('keluarga.update');
+    Route::delete('/keluarga/{id}', [App\Http\Controllers\Web\Master\KeluargaController::class, 'destroy'])->name('keluarga.destroy');
+    Route::get('/keluarga/{id}', [App\Http\Controllers\Web\Master\KeluargaController::class, 'show'])->name('keluarga.show');
 
-    Route::get('/tanaman', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'index'])->name('tanaman.index');
-    Route::get('/tanaman/add', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'create'])->name('tanaman.create');
-    Route::post('/tanaman', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'store'])->name('tanaman.store');
-    Route::get('/tanaman/get-lahan/{id}', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'getLahan'])->name('tanaman.get-lahan');
-    Route::get('/tanaman/edit/{id}', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'edit'])->name('tanaman.edit');
-    Route::put('/tanaman/{id}', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'update'])->name('tanaman.update');
-    Route::delete('/tanaman/{id}', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'destroy'])->name('tanaman.destroy');
-    Route::get('/tanaman/{id}', [App\Http\Controllers\Web\Ekosistem\TanamanController::class, 'show'])->name('tanaman.show');
+    Route::get('/tanaman', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'index'])->name('tanaman.index');
+    Route::get('/tanaman/add', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'create'])->name('tanaman.create');
+    Route::post('/tanaman', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'store'])->name('tanaman.store');
+    Route::get('/tanaman/get-lahan/{id}', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'getLahan'])->name('tanaman.get-lahan');
+    Route::get('/tanaman/edit/{id}', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'edit'])->name('tanaman.edit');
+    Route::put('/tanaman/{id}', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'update'])->name('tanaman.update');
+    Route::delete('/tanaman/{id}', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'destroy'])->name('tanaman.destroy');
+    Route::get('/tanaman/{id}', [App\Http\Controllers\Web\Produktivitas\TanamanController::class, 'show'])->name('tanaman.show');
 });
\ No newline at end of file