diff --git a/resources/views/modules/form/action.blade.php b/resources/views/modules/form/action.blade.php
index a415d27..9b3dd5e 100644
--- a/resources/views/modules/form/action.blade.php
+++ b/resources/views/modules/form/action.blade.php
@@ -38,12 +38,12 @@
                     <div class="form-group mb-0 mr-2 d-none">
                         @include('modules.form.approve')
                     </div>
-                    {{-- <div class="form-group mb-0 mr-2">
+                    <div class="form-group mb-0 mr-2">
                         <a title="Tambah Data" class="btn btn-primary mb-2 mb-md-0" onclick="return showCreateModal()"
                             {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
                             <i class="bx bx-plus"></i>
                         </a>
-                    </div> --}}
+                    </div>
                     <div class="form-group mb-0 mr-2">
                         <a class="btn btn-secondary mb-2 mb-md-0" onclick="showMetadataModal()"
                             {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php
index f7a01f7..25ad480 100644
--- a/resources/views/modules/form/index.blade.php
+++ b/resources/views/modules/form/index.blade.php
@@ -36,80 +36,7 @@
         </div>
         <div class="card-body">
 
-            {{-- @include('modules.form.action') --}}
-
-            <div class="row">
-                <div class="col-md-12">
-                    <form method="GET" action="{{ route('modules.form.show', ['sector' => $form->sector, 'code' => $form->code]) }}"
-                        id="filterForm">
-                        {{-- <div class="row">
-                            <div class="col-md-4">
-                                <x-inventory-year-select :selected-year="$inventoryYear" />
-                            </div>
-                        </div> --}}
-                        <div class="row">
-                            <div class="col-md-4">
-                                <div class="form-group d-flex justify-content-center align-items-center gap-1">
-                                    <div class="">
-                                        <label for="instansi">Instansi:</label>
-                                    </div>
-                                    <div class="input-group">
-                                        <select name="instansi" id="instansi" class="form-control">
-                                            <option value="" selected>-- Pilih Instansi --</option>
-                                            @if ($scope === \App\Enums\LingkupAksesData::ALL->value)
-                                                <option value="none" @if ($instansi === null || $instansi == 'none') selected @endif>DATA
-                                                    KONSOLIDASI</option>
-                                                @if ($agencies->isNotEmpty())
-                                                    <option value="all" @if ($instansi === 'all') selected @endif>SELURUH DATA DARI PRODUSEN</option>
-                                                @endif
-                                            @endif
-                                            
-                                            @foreach ($agencies as $agency)
-                                                <option value="{{ $agency->name }}"
-                                                    @if ($instansi == $agency->name) selected @endif>
-                                                    {{ $agency->name }}
-                                                </option>
-                                            @endforeach
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-8 order-md-2 d-flex gap-1 justify-content-end align-items-center flex-wrap">
-                                <div class="form-group mb-0 mr-2 d-none">
-                                    @include('modules.form.approve')
-                                </div>
-                                {{-- <div class="form-group mb-0 mr-2">
-                                    <a title="Tambah Data" class="btn btn-primary mb-2 mb-md-0" onclick="return showCreateModal()"
-                                        {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
-                                        <i class="bx bx-plus"></i>
-                                    </a>
-                                </div> --}}
-                                <div class="form-group mb-0 mr-2">
-                                    <a class="btn btn-secondary mb-2 mb-md-0" onclick="showMetadataModal()"
-                                        {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
-                                        <i class="bx bx-menu"></i>
-                                    </a>
-                                </div>
-                                <div class="form-group mb-0 mr-2">
-                                    <a class="btn btn-info mb-2 mb-md-0" onclick="showActivityUserModal()"
-                                        {{ !$activityForm || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>
-                                        Aktivitas User
-                                    </a>
-                                </div>
-                                <div class="form-group mb-0 mr-2">
-                                    <a href="{{ $routeExport }}" class="btn btn-success mb-2 mb-md-0">Ekspor Excel</a>
-                                </div>
-                                <div class="form-group mb-0 mr-2">
-                                    <a class="btn btn-warning mb-2 mb-md-0" data-bs-toggle="modal" data-bs-target="#importModal">
-                                        Impor Data Aktivitas
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-
+            @include('modules.form.action')
 
             <form action="{{ route('modules.form.save', ['sector' => $form->sector, 'code' => $form->code]) }}" method="POST">
                 <input type="hidden" name="inventoryYear" value="{{ $inventoryYear }}">
@@ -128,7 +55,9 @@
                                 <th style="min-width: 150px; text-decoration:normal">
                                     {{ $detail->activity ? $detail->activity->name : 'N/A' }} - ({{ $detail->unit_code }})
                                     
-                                    @if (!@$unitCategory)
+                                    @if ($unitCategory)
+                                    
+                                    @else
                                         {{ $unitCode }}
                                     @endif
                                 </th>
@@ -152,12 +81,7 @@
                                     @endphp
                                     <td>
                                         <div class="input-group">
-                                                    <input type="text"
-    name="data['{{ $year }}']['{{ $detail->activity_code }}-{{ $detail->unit_code }}']"
-    value="{{ isset($activity_value) ? getFormattedValue($activity_value) : '' }}"
-    class="form-control text-right"
-    oninput="numberFormat(this)"
-    @readonly($isLocked || $instansi === 'all' || $limitInternal)>
+                                            {{ @$activity_value == "" ? "" : getFormattedValue($activity_value)}}
                                         </div>
                                     </td>
                                 @endforeach
@@ -169,37 +93,7 @@
             {{-- @include('modules.form.copy') --}}
         </div>
     </div>
-    {{-- @include('modules.form.import') --}}
-
-    <div class="modal fade" id="importModal" tabindex="-1" role="dialog" aria-labelledby="importModalLabel" aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="importModalLabel">Impor Data Aktivitas</h5>
-                    
-                </div>
-                <form
-                    action="{{ $routeImport }}"
-                    method="POST" enctype="multipart/form-data">
-                    @csrf
-                    <div class="modal-body">
-                        <div class="form-group">
-                            <label for="import_file">Pilih File</label>
-                            <input type="file" name="import_file" id="import_file" class="form-control">
-                        </div>
-
-                        <a href="{{ $routeExportTemplate }}"
-                            class="card-link">Unduh Template File Impor</a>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
-                        <button type="submit" class="btn btn-primary" {{ $isLocked || $instansi === 'all' || $limitInternal ? 'disabled' : '' }}>Impor Sekarang</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-
+    @include('modules.form.import')
     
     @if ($instansi !== 'all')
         @include('modules.form.aktivitas-user')