diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 05da70b..34f56c3 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -30,88 +30,137 @@
 
 <div class="body-overlay"></div>
 
+@php
+    $memberManagement = ['card-member', 'locked-accounts'];
+    $homePage = ['photo-slider'];
+    $aboutUs = ['card-types', 'terms-and-privacy'];
+    $reports = ['registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report'];
+    $stationLocator = ['branches', 'stations', 'fuels'];
+@endphp
 
-        <!-- Sidebar  -->
-        <nav id="sidebar">
-            <div class="sidebar-header">
-                <h3><img src="img/logo.png" class="img-fluid"/><span></span></h3>
-            </div>
+<!-- Sidebar -->
+<nav id="sidebar">
+    <div class="sidebar-header">
+        <h3><img src="img/logo.png" class="img-fluid"/><span></span></h3>
+    </div>
 
+    <ul class="list-unstyled components">
 
-            <ul class="list-unstyled components">
-  <li class="{{ Request::is('user-management') ? 'active' : '' }}">
-    <a href="{{ route('user.management') }}" class="dashboard " style="display:flex"><i class="fa-solid fa-users" style="padding-top:3px"></i><span>User Management</span></a>
-  </li>
-  <li class="{{ Request::is('notification') ? 'active' : '' }}">
-    <a href="{{ route('notification') }}" class="dashboard" style="display:flex"><i class="fa-solid fa-bell" style="padding-top:3px"></i><span>Notifications</span></a>
-  </li>
+        <!-- Static Items -->
+        <li class="{{ Request::is('user-management') ? 'active' : '' }}">
+            <a href="{{ route('user.management') }}" class="dashboard" style="display:flex">
+                <i class="fa-solid fa-users" style="padding-top:3px"></i><span>User Management</span>
+            </a>
+        </li>
+        <li class="{{ Request::is('notification') ? 'active' : '' }}">
+            <a href="{{ route('notification') }}" class="dashboard" style="display:flex">
+                <i class="fa-solid fa-bell" style="padding-top:3px"></i><span>Notifications</span>
+            </a>
+        </li>
 
-  <li class="dropdown">
-    <a href="#homeSubmenu1" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle" style="display:flex">
-      <i class="fa-solid fa-users-gear" style="padding-top:3px"></i><span>Member Management</span></a>
-    <ul class="collapse list-unstyled menu" id="homeSubmenu1">
-      <li class="{{ Request::is('card-member') ? 'active' : '' }}"><a href="{{ route('card-member') }}">Card Member</a></li>
-      <li class="{{ Request::is('locked-accounts') ? 'active' : '' }}"><a href="{{ route('locked-accounts') }}">Locked Accounts</a></li>
+        <!-- Member Management -->
+        <li class="dropdown {{ in_array(Request::path(), $memberManagement)  }}">
+            <a href="#homeSubmenu1" data-toggle="collapse" aria-expanded="{{ in_array(Request::path(), $memberManagement) ? 'true' : 'false' }}" class="dropdown-toggle" style="display:flex">
+                <i class="fa-solid fa-users-gear" style="padding-top:3px"></i><span>Member Management</span>
+            </a>
+            <ul class="collapse list-unstyled menu {{ in_array(Request::path(), $memberManagement) ? 'show' : '' }}" id="homeSubmenu1">
+                <li class="{{ Request::is('card-member') ? 'active' : '' }}">
+                    <a href="{{ route('card-member') }}">Card Member</a>
+                </li>
+                <li class="{{ Request::is('locked-accounts') ? 'active' : '' }}">
+                    <a href="{{ route('locked-accounts') }}">Locked Accounts</a>
+                </li>
+            </ul>
+        </li>
+
+        <!-- Home Page -->
+        <li class="dropdown {{ in_array(Request::path(), $homePage)  }}">
+            <a href="#pageSubmenu2" data-toggle="collapse" aria-expanded="{{ in_array(Request::path(), $homePage) ? 'true' : 'false' }}" class="dropdown-toggle" style="display:flex">
+                <i class="fa-solid fa-mobile-screen" style="padding-top:3px"></i><span>Home Page (Mobile)</span>
+            </a>
+            <ul class="collapse list-unstyled menu {{ in_array(Request::path(), $homePage) ? 'show' : '' }}" id="pageSubmenu2">
+                <li class="{{ Request::is('photo-slider') ? 'active' : '' }}">
+                    <a href="{{ route('photo-slider') }}">Photo Slider</a>
+                </li>
+            </ul>
+        </li>
+
+        <!-- Static -->
+        <li class="{{ Request::is('promotions') ? 'active' : '' }}">
+            <a href="{{ route('promotions') }}" class="dashboard" style="display:flex">
+                <i class="fa-solid fa-tag" style="padding-top:3px"></i><span>Promotions</span>
+            </a>
+        </li>
+
+        <li class="{{ Request::is('top-up') ? 'active' : '' }}">
+            <a href="{{ route('top-up') }}" class="dashboard" style="display:flex">
+                <i class="fa-solid fa-wallet" style="padding-top:3px"></i><span>Top-Up</span>
+            </a>
+        </li>
+
+        <!-- About Us -->
+        <li class="dropdown {{ in_array(Request::path(), $aboutUs)  }}">
+            <a href="#pageSubmenu3" data-toggle="collapse" aria-expanded="{{ in_array(Request::path(), $aboutUs) ? 'true' : 'false' }}" class="dropdown-toggle" style="display:flex">
+                <i class="fa-solid fa-circle-info" style="padding-top:3px"></i><span>About Us</span>
+            </a>
+            <ul class="collapse list-unstyled menu {{ in_array(Request::path(), $aboutUs) ? 'show' : '' }}" id="pageSubmenu3">
+                <li class="{{ Request::is('card-types') ? 'active' : '' }}">
+                    <a href="{{ route('card-types') }}">Card Types</a>
+                </li>
+                <li class="{{ Request::is('terms-and-privacy') ? 'active' : '' }}">
+                    <a href="{{ route('terms-and-privacy') }}">Terms & Privacy</a>
+                </li>
+            </ul>
+        </li>
+
+        <!-- Reports -->
+        <li class="dropdown {{ in_array(Request::path(), $reports)  }}">
+            <a href="#pageSubmenu4" data-toggle="collapse" aria-expanded="{{ in_array(Request::path(), $reports) ? 'true' : 'false' }}" class="dropdown-toggle" style="display:flex">
+                <i class="fa-solid fa-chart-column" style="padding-top:3px"></i><span>Reports</span>
+            </a>
+            <ul class="collapse list-unstyled menu {{ in_array(Request::path(), $reports) ? 'show' : '' }}" id="pageSubmenu4">
+                <li class="{{ Request::is('registration-report') ? 'active' : '' }}">
+                    <a href="{{ route('registration-report') }}">Registration Report</a>
+                </li>
+                <li class="{{ Request::is('top-up-usage-report') ? 'active' : '' }}">
+                    <a href="{{ route('top-up-usage-report') }}">Top-Up Usage Report</a>
+                </li>
+                <li class="{{ Request::is('mobile-usage-report') ? 'active' : '' }}">
+                    <a href="{{ route('mobile-usage-report') }}">Mobile Usage Report</a>
+                </li>
+                <li class="{{ Request::is('station-rating-report') ? 'active' : '' }}">
+                    <a href="{{ route('station-rating-report') }}">Station Rating Report</a>
+                </li>
+            </ul>
+        </li>
+
+        <!-- Static -->
+        <li class="{{ Request::is('system-parameters') ? 'active' : '' }}">
+            <a href="{{ route('system-parameters') }}" style="display:flex">
+                <i class="fa-solid fa-sliders" style="padding-top:3px"></i><span>System Parameters</span>
+            </a>
+        </li>
+
+        <!-- Station Locator -->
+        <li class="dropdown {{ in_array(Request::path(), $stationLocator)  }}">
+            <a href="#pageSubmenu5" data-toggle="collapse" aria-expanded="{{ in_array(Request::path(), $stationLocator) ? 'true' : 'false' }}" class="dropdown-toggle" style="display:flex">
+                <i class="fa-solid fa-location-dot" style="padding-top:3px"></i><span>Station Locator</span>
+            </a>
+            <ul class="collapse list-unstyled menu {{ in_array(Request::path(), $stationLocator) ? 'show' : '' }}" id="pageSubmenu5">
+                <li class="{{ Request::is('branches') ? 'active' : '' }}">
+                    <a href="{{ route('branches') }}">Branches</a>
+                </li>
+                <li class="{{ Request::is('stations') ? 'active' : '' }}">
+                    <a href="{{ route('stations') }}">Stations</a>
+                </li>
+                <li class="{{ Request::is('fuels') ? 'active' : '' }}">
+                    <a href="{{ route('fuels') }}">Fuels</a>
+                </li>
+            </ul>
+        </li>
     </ul>
-  </li>
+</nav>
 
-  <li class="dropdown">
-    <a href="#pageSubmenu2" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle" style="display:flex">
-      <i class="fa-solid fa-mobile-screen" style="padding-top:3px"></i><span>Home Page (Mobile)</span></a>
-    <ul class="collapse list-unstyled menu" id="pageSubmenu2">
-      <li class="{{ Request::is('photo-slider') ? 'active' : '' }}"><a href="{{ route('photo-slider') }}">Photo Slider</a></li>
-    </ul>
-  </li>
-
-  <li class="{{ Request::is('promotions') ? 'active' : '' }}">
-    <a href="{{ route('promotions') }}" class="dashboard" style="display:flex"><i class="fa-solid fa-tag" style="padding-top:3px"></i><span>Promotions</span></a>
-  </li>
-
-  <li class="{{ Request::is('top-up') ? 'active' : '' }}">
-    <a href="{{ route('top-up') }}" class="dashboard" style="display:flex"><i class="fa-solid fa-wallet" style="padding-top:3px"></i><span>Top-Up</span></a>
-  </li>
-
-  <li class="dropdown">
-    <a href="#pageSubmenu3" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle" style="display:flex">
-      <i class="fa-solid fa-circle-info" style="padding-top:3px"></i><span>About Us</span></a>
-    <ul class="collapse list-unstyled menu" id="pageSubmenu3">
-      <li class="{{ Request::is('card-types') ? 'active' : '' }}"><a href="{{ route('card-types') }}">Card Types</a></li>
-      <li class="{{ Request::is('terms-and-privacy') ? 'active' : '' }}"><a href="{{ route('terms-and-privacy') }}">Terms & Privacy</a></li>
-    </ul>
-  </li>
-
-  <li class="dropdown">
-    <a href="#pageSubmenu4" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle" style="display:flex">
-      <i class="fa-solid fa-chart-column" style="padding-top:3px"></i><span>Reports</span></a>
-    <ul class="collapse list-unstyled menu" id="pageSubmenu4">
-      <li class="{{ Request::is('registration-report') ? 'active' : '' }}"><a href="{{ route('registration-report') }}">Registration Report</a></li>
-      <li class="{{ Request::is('top-up-usage-report') ? 'active' : '' }}"><a href="{{ route('top-up-usage-report') }}">Top-Up Usage Report</a></li>
-      <li class="{{ Request::is('mobile-usage-report') ? 'active' : '' }}"><a href="{{ route('mobile-usage-report') }}">Mobile Usage Report</a></li>
-      <li class="{{ Request::is('station-rating-report') ? 'active' : '' }}"><a href="{{ route('station-rating-report') }}">Station Rating Report</a></li>
-    </ul>
-  </li>
-
-  <li class="{{ Request::is('system-parameters') ? 'active' : '' }}">
-    <a href="{{ route('system-parameters') }}" style="display:flex"><i class="fa-solid fa-sliders"  style="padding-top:3px"></i><span>System Parameters</span></a>
-  </li>
-
-  <li class="dropdown">
-    <a href="#pageSubmenu5" data-toggle="collapse" aria-expanded="false" class="dropdown-toggle" style="display:flex">
-      <i class="fa-solid fa-location-dot" style="padding-top:3px"></i><span>Station Locator</span></a>
-    <ul class="collapse list-unstyled menu" id="pageSubmenu5">
-      <li class="{{ Request::is('branches') ? 'active' : '' }}"><a href="{{ route('branches') }}">Branches</a></li>
-      <li class="{{ Request::is('stations') ? 'active' : '' }}"><a href="{{ route('stations') }}">Stations</a></li>
-      <li class="{{ Request::is('fuels') ? 'active' : '' }}"><a href="{{ route('fuels') }}">Fuels</a></li>
-    </ul>
-  </li>
-</ul>
-
-
-
-
-
-           
-        </nav>