diff --git a/app/Helpers/AuditTrailHelper.php b/app/Helpers/AuditTrailHelper.php
index e063589..4b0ca90 100644
--- a/app/Helpers/AuditTrailHelper.php
+++ b/app/Helpers/AuditTrailHelper.php
@@ -7,7 +7,7 @@ use App\Models\AuditTrail;
 
 class AuditTrailHelper
 {
-	public static function AddAuditTrail($activity, $action)
+	public static function AddAuditTrail($action, $activity)
 	{
 		$audit = new AuditTrail();
 		$audit->user_id = Auth::user()->id;
@@ -19,7 +19,7 @@ class AuditTrailHelper
 		$audit->save();
 	}
 
-	public static function AuthAttempt($activity, $action)
+	public static function AuthAttempt($action, $activity)
 	{
 		$audit = new AuditTrail();
 		$audit->ip_address = request()->ip();
diff --git a/app/Http/Controllers/Backend/Auth/LoginController.php b/app/Http/Controllers/Backend/Auth/LoginController.php
index 975ead6..31a3fe8 100644
--- a/app/Http/Controllers/Backend/Auth/LoginController.php
+++ b/app/Http/Controllers/Backend/Auth/LoginController.php
@@ -124,7 +124,7 @@ class LoginController extends Controller
         }
 
         // Log activity
-        AuditTrailHelper::AuthAttempt('Logout', 'User (' . $user->email . ') Logged out from the System');
+        AuditTrailHelper::AuthAttempt('Logout', 'User (' . $user->username . ') Logged out from the System');
 
         try {
             // Logout from admin guard
diff --git a/resources/views/backend/pages/audit_trail/index.blade.php b/resources/views/backend/pages/audit_trail/index.blade.php
index 57dcc1f..892f8bb 100644
--- a/resources/views/backend/pages/audit_trail/index.blade.php
+++ b/resources/views/backend/pages/audit_trail/index.blade.php
@@ -38,8 +38,8 @@
                                         <tr>
                                             <th width="5%">{{ __('User') }}</th>
                                             <th width="5%">{{ __('Ip Address') }}</th>
-                                            <th width="15%">{{ __('Action') }}</th>
-                                            <th width="5%">{{ __('Activity') }}</th>
+                                            <th width="5%">{{ __('Action') }}</th>
+                                            <th width="15%">{{ __('Activity') }}</th>
                                             <th width="5%">Browser</th>
                                             <th width="15%">User Agent</th>
                                         </tr>
@@ -48,10 +48,24 @@
                                         @foreach ($data as $item)
                                             <tr>
 												<td>
-													{{ $item->user ? $item->user->name : preg_replace('/\).*$/', '', explode('(', $item->action)[1]) }}
+													{{ $item->user ? $item->user->name : preg_replace('/\).*$/', '', explode('(', $item->activity)[1]) }}
 												</td>
 												<td>{{ $item->ip_address }}</td>
-												<td>{{ $item->action }}</td>
+												<td>
+													@php
+														$color = 'info';
+														if ($item->action == 'Create') {
+															$color = 'success';
+														} elseif ($item->action == 'Update') {
+															$color = 'warning';
+														} elseif ($item->action == 'Delete') {
+															$color = 'danger';
+														}
+													@endphp
+													<div class="badge badge-{{ $color }} text-white">
+														{{ $item->action }}
+													</div>
+												</td>
 												<td>{{ $item->activity }}</td>
 												<td>{{ $item->browser }}</td>
 												<td>{{ $item->user_agent }}</td>