diff --git a/resources/views/modules/form/form.blade.php b/resources/views/modules/form/form.blade.php
index c7ac32b..44eb2b0 100644
--- a/resources/views/modules/form/form.blade.php
+++ b/resources/views/modules/form/form.blade.php
@@ -55,7 +55,36 @@
                                         </div>
                                     </div>
                                 </div>
-                                
+                                @foreach ($formDetails as $detail)
+                                    @php
+                                        $unitCode = $detail->unit_code;
+                                        $unitCategory = $unitsMap[$unitCode]->category ?? null;
+                                    @endphp
+                                    <div class="col-md-12 mb-3">
+                                        <b>{{ $detail->activity ? $detail->activity->name : 'N/A' }}</b>
+                                        @if ($unitCategory)
+                                            <div class="input-group">
+                                                <input type="text" class="form-control w-50 text-right" name="value[{{ $detail->activity_code }}]" oninput="numberFormat(this)">
+                                                <div class="input-group-text p-0" style="width: 200px!important;">
+                                                    <select name="unit_code[{{ $detail->activity_code }}]" class="form-control unit-code"
+                                                        data-activity-code="{{ $detail->activity_code }}"
+                                                        data-current-unit="{{ $unitCode }}">
+                                                        @foreach ($unitsByCategory[$unitCategory] as $unit)
+                                                            @if($unit->code == $unitCode)
+                                                            <option value="{{ $unit->code }}"
+                                                                {{ $unit->code == $unitCode ? 'selected' : '' }}>
+                                                                {{ $unit->code }}
+                                                            </option>
+                                                            @endif
+                                                        @endforeach
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        @else
+                                            {{ $unitCode }}
+                                        @endif
+                                    </div>
+                                @endforeach
                                 
                             </div>
                             
diff --git a/resources/views/modules/form/index.blade.php b/resources/views/modules/form/index.blade.php
index 7c8b0c8..f4cca8b 100644
--- a/resources/views/modules/form/index.blade.php
+++ b/resources/views/modules/form/index.blade.php
@@ -42,11 +42,13 @@
         </div>
     </div>
     @include('modules.form.import')
-    @include('modules.form.form')
+    
     @if ($instansi !== 'all')
         @include('modules.form.aktivitas-user')
         @include('modules.form.metadata.index')
     @endif
+
+    @include('modules.form.form')
 @endsection
 
 @include('modules.form.scripts')