diff --git a/app/Http/Controllers/Web/ProgramController.php b/app/Http/Controllers/Web/ProgramController.php
index e429e4e..a6239d6 100644
--- a/app/Http/Controllers/Web/ProgramController.php
+++ b/app/Http/Controllers/Web/ProgramController.php
@@ -94,6 +94,8 @@ class ProgramController extends Controller
         $validator = Validator::make($request->all(), [
             'nama' => ['required'],
             'sub_domain'  => ['required', Rule::unique(Program::class, 'sub_domain')->ignore($id)],
+            'tahun' => ['required', 'integer'],
+            'instansi' => ['nullable', 'string'],
         ]);
 
         if ($validator->fails()) {
@@ -106,9 +108,7 @@ class ProgramController extends Controller
             return redirect()->route('program.index')->with('error', 'Data program tidak ditemukan!');
         }
 
-        $program->update([
-            'nama'          => $request->nama,
-            'sub_domain'     => $request->sub_domain,
+        $program->update([...$validator->validated(),
             'updated_by'    => auth()->id(),
         ]);
 
diff --git a/resources/views/program/framework/view-aktivitas.blade.php b/resources/views/program/framework/view-aktivitas.blade.php
index a8afbef..b8a952d 100644
--- a/resources/views/program/framework/view-aktivitas.blade.php
+++ b/resources/views/program/framework/view-aktivitas.blade.php
@@ -35,7 +35,7 @@
                                                     <a class="dropdown-item edit-aktivitas" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Aktivitas</a>
                                                     <a class="dropdown-item delete-aktivitas" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $aktivitas->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Aktivitas</a>
                                                     <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
+                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
                                                     <a class="dropdown-item edit-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-aktivitas-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Target</a>
                                                     <a class="dropdown-item delete-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-aktivitas-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $targetAktivitas->variabel }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Target</a>
                                                 </div>
diff --git a/resources/views/program/framework/view.blade copy.php b/resources/views/program/framework/view.blade copy.php
deleted file mode 100644
index ee5ff29..0000000
--- a/resources/views/program/framework/view.blade copy.php	
+++ /dev/null
@@ -1,296 +0,0 @@
-@extends('layout.main')
-
-@section('content')
-<div class="container-xxl flex-grow-1 container-p-y">
-    <div class="card">
-        <div class="card-header border-bottom mb-4">
-            <h5 class="card-title mb-0">Lihat Kerangka Kerja</h5>
-        </div>
-        
-        <div class="card-body">
-            <form id="viewFrameworkForm">
-                @csrf
-                
-                <h6 class="mb-3">Informasi Kerangka Kerja</h6>
-                <div class="row">
-                    <div class="col-md-3 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-nama">Nama Kerangka Kerja<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="update" name="nama" placeholder="Cth: Tabel Pertanian" value="{{ old('nama', $framework->nama) }}"  readonly/>
-                    </div>
-                    <div class="col-md-3 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-tahun">Tahun Implementasi<span class="text-danger">*</span></label>
-                        <input type="number" step="1" min="2026" class="form-control" id="update-framework-tahun" name="tahun" placeholder="Cth: 2023" value="{{ old('tahun', $framework->tahun) ?? now()->year }}" readonly/>
-                    </div>
-                    <div class="col-md-6 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-program">Untuk Program<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="update-framework-tahun" name="tahun" placeholder="Cth: 2023" value="{{ old('program_id', $framework->program->nama) }}" readonly/>
-                    </div>
-                </div>
-
-                <h6 class="mb-3">Informasi Rencana Kerja</h6>
-
-                <hr class="my-4 mx-n4" />
-                <div class="row mb-4">
-                    <div class="col-md-auto d-flex gap-2">
-                        <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="offcanvas" data-bs-target="#offcanvasAddTransformasi" >
-                            <i class="ti tabler-plus me-1"></i> Tambah Transformasi
-                        </button>
-                    </div>
-                </div>
-
-                <div class="row mb-4">
-                    <div class="col-md-12 mb-4 form-control-validation">
-                        
-                        <div class="table-responsive text-nowrap mb-4">
-                            <table class="table table-hover">
-                                <thead class="border-top">
-                                    <tr>
-                                        <th>Transformasi</th>
-                                        <th>Tujuan Jangka Pendek/Aktivitas</th>
-                                        <th>Deskripsi</th>
-                                        <th>Indikator</th>
-                                        <th>Variabel</th>
-                                        <th>Target</th>
-                                        <th>Baseline</th>
-                                        <th>Aksi</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @forelse($framework->transformasi as $transformasi)
-                                    @forelse($transformasi->tujuan as $tujuan)
-                                    @forelse($tujuan->target as $target)
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td><span class="{{ $tujuan->jenis_aktivitas == 'tujuan' ? 'text-heading' : 'text-muted' }}">{{ $tujuan->nama }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->deskripsi }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->indikator }}</span></td>
-                                        <td><span class="text-muted">{{ $target->variabel }}</span></td>
-                                        <td>
-                                            @if($target->tipe === 'integer')
-                                                <span class="text-muted">{{ $target->target_integer }}</span>
-                                            @elseif($target->tipe === 'float')
-                                                <span class="text-muted">{{ $target->target_float }}</span>
-                                            @elseif($target->tipe === 'boolean')
-                                                <span class="text-muted">{{ $target->target_boolean ? 'Ya' : 'Tidak' }}</span>
-                                            @endif
-                                        </td>
-                                        <td>
-                                            @if($target->tipe === 'integer')
-                                                <span class="text-muted">{{ $target->baseline_integer }}</span>
-                                            @elseif($target->tipe === 'float')
-                                                <span class="text-muted">{{ $target->baseline_float }}</span>
-                                            @elseif($target->tipe === 'boolean')
-                                                <span class="text-muted">{{ $target->baseline_boolean ? 'Ya' : 'Tidak' }}</span>
-                                            @endif
-                                        </td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <!-- tujuan -->
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                    <a class="dropdown-item edit-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Tujuan</a>
-                                                    <a class="dropdown-item delete-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Tujuan</a>
-                                                    <hr/>
-                                                    <!-- aktivitas --> 
-                                                    <a class="dropdown-item add-aktivitas" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Aktivitas</a>
-                                                    <a class="dropdown-item edit-aktivitas" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Aktivitas</a>
-                                                    <a class="dropdown-item delete-aktivitas" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Aktivitas</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
-                                                    <a class="dropdown-item edit-target" href="javascript:void(0);" data-id="{{ $target->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Target</a>
-                                                    <a class="dropdown-item delete-target" href="javascript:void(0);" data-id="{{ $target->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $target->variabel }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Target</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @empty
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td><span class="{{ $tujuan->jenis_aktivitas == 'tujuan' ? 'text-heading' : 'text-muted' }}">{{ $tujuan->nama }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->deskripsi }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->indikator }}</span></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                    <a class="dropdown-item edit-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Tujuan</a>
-                                                    <a class="dropdown-item delete-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Tujuan</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @endforelse 
-                                    <!-- endforelse target -->
-                                    @empty 
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @endforelse
-                                    <!-- endforelse aktivitas -->
-                                    @empty
-                                    <tr>
-                                        <td colspan="4" class="text-center py-4">Tidak ada data ditemukan.</td>
-                                    </tr>
-                                    @endforelse
-                                    <!-- endforelse tranformasi -->
-                                </tbody>
-                            </table>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div class="mt-4 text-end">
-                    <a href="{{ route('framework.index') }}" class="btn btn-label-secondary me-2">Kembali</a>
-                </div>
-            </form>
-        </div>
-    </div>
-    @include('program.transformasi.add')
-    @include('program.transformasi.edit')
-    @include('program.aktivitas.add-tujuan')
-    @include('program.aktivitas.edit')
-    @include('program.target.add')
-</div>
-@endsection
-
-@push('scripts')
-<script>
-    'use strict';
-    $(document).ready(function () {
-
-        $(".delete-transformasi").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Transformasi ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.destroy', [$framework->id, ':id']) }}".replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-
-        $(".delete-aktivitas").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const transformasiId = $(this).data('transformasi-id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Tujuan/Aktivitas ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.aktivitas.destroy', [$framework->id, ':transformasiId', ':id']) }}"
-                            .replace(':transformasiId', transformasiId).replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-
-        $(".delete-target").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const aktivitasId = $(this).data('aktivitas-id');
-            const transformasiId = $(this).data('transformasi-id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Target ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.aktivitas.target.destroy', [$framework->id, ':transformasiId', ':aktivitasId', ':id']) }}"
-                            .replace(':transformasiId', transformasiId)
-                            .replace(':aktivitasId', aktivitasId)
-                            .replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-    });
-</script>
-@endpush
\ No newline at end of file
diff --git a/resources/views/program/realisasi/add.blade.php b/resources/views/program/realisasi/add.blade.php
index a1c2772..eb64800 100644
--- a/resources/views/program/realisasi/add.blade.php
+++ b/resources/views/program/realisasi/add.blade.php
@@ -25,33 +25,20 @@
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-target">Target<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-target-integer" name="target_integer" placeholder="Cth: 100" readonly />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-target-integer" name="target_integer" placeholder="Cth: 100" readonly />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-target-float" name="target_float" placeholder="Cth: 100.23" readonly />
-                <div class="form-check form-check-inline" id="add-target-target-boolean-true" style="display: none;">
-                    <input type="radio" name="target_boolean" value="1" readonly />
-                    <label class="form-check-label" for="add-target-target-boolean-true">Ya</label>
-                </div>
-                <div class="form-check form-check-inline" id="add-target-target-boolean-false" style="display: none;">
-                    <input type="radio" name="target_boolean" value="0" readonly />
-                    <label class="form-check-label" for="add-target-target-boolean-false">Tidak</label>
-                </div>
+                <input type="text" class="form-control" style="display: none;" id="add-target-target-boolean" name="target_text" placeholder="Cth: 100.23" readonly />
+
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-baseline">Baseline<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-baseline-integer" name="baseline_integer" placeholder="Cth: 100" readonly />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-baseline-integer" name="baseline_integer" placeholder="Cth: 100" readonly />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-baseline-float" name="baseline_float" placeholder="Cth: 100.23" readonly />
-                <div class="form-check form-check-inline" id="add-target-baseline-boolean-true" style="display: none;">
-                    <input type="radio" name="baseline_boolean" value="1" readonly />
-                    <label class="form-check-label" for="add-target-baseline-boolean-true">Ya</label>
-                </div>
-                <div class="form-check form-check-inline" id="add-target-baseline-boolean-false" style="display: none;">
-                    <input type="radio" name="baseline_boolean" value="0" readonly />
-                    <label class="form-check-label" for="add-target-baseline-boolean-false">Tidak</label>
-                </div>
+                <input type="text" class="form-control" style="display: none;" id="add-target-baseline-boolean" name="baseline_text" placeholder="Cth: 100.23" readonly />                
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-realisasi">Capaian Realisasi<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-realisasi-integer" name="realisasi_integer" placeholder="Cth: 100" />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-realisasi-integer" name="realisasi_integer" placeholder="Cth: 100" />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-realisasi-float" name="realisasi_float" placeholder="Cth: 100.23" />
                 <div class="form-check form-check-inline" id="add-target-realisasi-boolean-true" style="display: none;">
                     <input type="radio" name="realisasi_boolean" value="1" />
@@ -92,12 +79,10 @@
 
                     $('#add-target-target-integer').val(res.data.target_integer);
                     $('#add-target-target-float').val(res.data.target_float);
-                    $('#add-target-target-boolean-true').prop('checked', res.data.target_boolean);
-                    $('#add-target-target-boolean-false').prop('checked', !res.data.target_boolean);
+                    $('#add-target-target-boolean').val(res.data.target_boolean ? 'Ya' : 'Tidak');
                     $('#add-target-baseline-integer').val(res.data.baseline_integer);
                     $('#add-target-baseline-float').val(res.data.baseline_float);
-                    $('#add-target-baseline-boolean-true').prop('checked', res.data.baseline_boolean);
-                    $('#add-target-baseline-boolean-false').prop('checked', !res.data.baseline_boolean);
+                    $('#add-target-baseline-boolean').val(res.data.baseline_boolean ? 'Ya' : 'Tidak');
 
                     if (res.data.latest_realisasi != null) {
                         $('#add-target-realisasi-integer').val(res.data.latest_realisasi.realisasi_integer);
@@ -111,7 +96,13 @@
                         $('#add-target-realisasi-boolean-false').prop('checked', !res.data.baseline_boolean);
                     }
                     
-
+                    $('#add-target-target-integer, #add-target-target-float, #add-target-target-boolean')
+                        .hide().prop('disabled', true);
+                    $('#add-target-baseline-integer, #add-target-baseline-float, #add-target-baseline-boolean')
+                        .hide().prop('disabled', true);
+                    $('#add-target-realisasi-integer, #add-target-realisasi-float, #add-target-realisasi-boolean-true, #add-target-realisasi-boolean-false')
+                        .hide().prop('disabled', true);
+                        
                     if (res.data.tipe === 'integer') {
                         $('#add-target-target-integer').show().prop('disabled', false);
                         $('#add-target-baseline-integer').show().prop('disabled', false);
@@ -121,8 +112,8 @@
                         $('#add-target-baseline-float').show().prop('disabled', false);
                         $('#add-target-realisasi-float').show().prop('disabled', false);
                     } else if (res.data.tipe === 'boolean') {
-                        $('#add-target-target-boolean-true, #add-target-target-boolean-false').show().prop('disabled', false);
-                        $('#add-target-baseline-boolean-true, #add-target-baseline-boolean-false').show().prop('disabled', false);
+                        $('#add-target-target-boolean').show().prop('disabled', false);
+                        $('#add-target-baseline-boolean').show().prop('disabled', false);
                         $('#add-target-realisasi-boolean-true, #add-target-realisasi-boolean-false').show().prop('disabled', false);
                     }