diff --git a/app/Helpers/FormHelper.php b/app/Helpers/FormHelper.php
index 8a6a6ec..4beb976 100644
--- a/app/Helpers/FormHelper.php
+++ b/app/Helpers/FormHelper.php
@@ -14,8 +14,11 @@ use App\Models\UserHasCabang;
 class FormHelper
 {
     public static function getFormsByUserIds($userIds, $month, $year) {
-		$startDate = date('Y-m-' . env('STARTING_DATE'));
-		$closingDateNextMonth = date('Y-m-', strtotime('+1 month')) . env('CLOSING_DATE');
+		$monthNumber = date('m', strtotime($month . ' 1'));
+		$startDate = "$year-$monthNumber-" . env('STARTING_DATE');
+
+		$nextMonthTimestamp = strtotime("first day of next month", strtotime("$year-$monthNumber-01"));
+		$closingDateNextMonth = date('Y-m-', $nextMonthTimestamp) . env('CLOSING_DATE');
 
 		$users = Admin::with(['region', 'cabang'])
 			->whereIn('id', $userIds)
@@ -98,8 +101,11 @@ class FormHelper
 	}
 
 	public static function getAllForms($month, $year) {
-		$startDate = date('Y-m-' . env('STARTING_DATE'));
-		$closingDateNextMonth = date('Y-m-', strtotime('+1 month')) . env('CLOSING_DATE');
+		$monthNumber = date('m', strtotime($month . ' 1'));
+		$startDate = "$year-$monthNumber-" . env('STARTING_DATE');
+
+		$nextMonthTimestamp = strtotime("first day of next month", strtotime("$year-$monthNumber-01"));
+		$closingDateNextMonth = date('Y-m-', $nextMonthTimestamp) . env('CLOSING_DATE');
 
 		$users = Admin::with(['region', 'cabang'])
 			->get();
diff --git a/app/Http/Controllers/Forms/FormOtherController.php b/app/Http/Controllers/Forms/FormOtherController.php
index 1fe7f4a..53b8155 100644
--- a/app/Http/Controllers/Forms/FormOtherController.php
+++ b/app/Http/Controllers/Forms/FormOtherController.php
@@ -98,7 +98,7 @@ class FormOtherController extends Controller
 
     return view('backend.pages.forms.other.view', [
       'form' => $form,
-      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment & Presentation', 'Meeting & Seminar'])->get()
+      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar'])->get()
     ]);
   }
 
@@ -107,7 +107,7 @@ class FormOtherController extends Controller
     $this->checkAuthorization(auth()->user(), ['forms.other.create']);
 
 		return view('backend.pages.forms.other.create', [
-      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment & Presentation', 'Meeting & Seminar'])->get()
+      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar'])->get()
     ]);
 	}
 
@@ -243,7 +243,7 @@ class FormOtherController extends Controller
     
 		return view('backend.pages.forms.other.edit', [
       'form' => $form,
-      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment & Presentation', 'Meeting & Seminar'])->get()
+      'kategori' => Kategori::whereNotIn('name', ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar'])->get()
 		]);
 	}
 
diff --git a/resources/views/backend/pages/master/category/index.blade.php b/resources/views/backend/pages/master/category/index.blade.php
index 81fc27f..97edcfd 100644
--- a/resources/views/backend/pages/master/category/index.blade.php
+++ b/resources/views/backend/pages/master/category/index.blade.php
@@ -49,7 +49,7 @@
                                 </thead>
                                 <tbody>
                                     @foreach ($categories as $category)
-                                        <tr>
+                                        <tr class="{{ in_array($category->name, ['Up Country', 'Vehicle Running Cost', 'Entertainment', 'Meeting / Seminar']) ? 'bg-secondary' : '' }}">
                                             <td>{{ $loop->index + 1 }}</td>
                                             <td>{{ $category->name }}</td>
                                             <td>{{ $category->account_number }}</td>