diff --git a/app/Console/Commands/Services/Tasks/NotifyAlarms.php b/app/Console/Commands/Services/Tasks/NotifyAlarms.php
index 540686b6..207531c0 100644
--- a/app/Console/Commands/Services/Tasks/NotifyAlarms.php
+++ b/app/Console/Commands/Services/Tasks/NotifyAlarms.php
@@ -61,13 +61,13 @@ class NotifyAlarms
 
                                         switch ($alarm_level_id) {
                                             case 1:
-                                                $message = '<div style="color:rgb(0, 166, 62);">ALARM LEVEL '.$alarm_level_id.'</div>';
+                                                $message = 'ALARM LEVEL '.$alarm_level_id;
                                                 break;
                                             case 2:
-                                                $message = '<div style="color:rgb(21, 93, 252);">ALARM LEVEL '.$alarm_level_id.'</div>';
+                                                $message = 'ALARM LEVEL '.$alarm_level_id;
                                                 break;
                                             default:
-                                                $message = '<div style="color:rgb(231, 0, 11)">ALARM LEVEL '.$alarm_level_id.'</div>';
+                                                $message = 'ALARM LEVEL '.$alarm_level_id;
                                                 break;
                                         }
                                         $tablecontent = [
@@ -81,7 +81,7 @@ class NotifyAlarms
                                         ];
 
                                         Mail::to($user)
-                                            ->send(new AlarmNotification($message, $tablecontent));
+                                            ->send(new AlarmNotification($message, $tablecontent, $alarm_level_id));
 
                                     }
                                     $stored_alarms[] = $send;
diff --git a/app/Mail/AlarmNotification.php b/app/Mail/AlarmNotification.php
index 4b5a59cd..d378485b 100644
--- a/app/Mail/AlarmNotification.php
+++ b/app/Mail/AlarmNotification.php
@@ -16,14 +16,16 @@ class AlarmNotification extends Mailable
 
     protected array $tablecontent;
 
+    protected int $alarm_level_id;
+
     /**
      * Create a new message instance.
      */
-    public function __construct($message, $tablecontent)
+    public function __construct($message, $tablecontent, $alarm_level_id)
     {
         $this->message = $message;
-
         $this->tablecontent = $tablecontent;
+        $this->alarm_level_id = $alarm_level_id;
     }
 
     /**
@@ -46,6 +48,7 @@ class AlarmNotification extends Mailable
             with: [
                 'tablecontent' => $this->tablecontent,
                 'message' => $this->message,
+                'alarm_level_id' => $this->alarm_level_id,
             ],
         );
     }
diff --git a/resources/views/mail/user/alarm.blade.php b/resources/views/mail/user/alarm.blade.php
index 347c548b..12c54470 100644
--- a/resources/views/mail/user/alarm.blade.php
+++ b/resources/views/mail/user/alarm.blade.php
@@ -1,86 +1,81 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8" />
-  <title>NUH-Odds</title>
-</head>
-<body style="margin:0; padding:0; background:#f5f5f5;">
+<x-mail::message>
 
-<table width="100%" cellpadding="0" cellspacing="0" bgcolor="#f5f5f5">
-  <tr>
-    <td align="center">
-      <table width="600" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="padding:20px;">
-        <tr>
-          <td align="center">NUH-Odds Alarm Monitoring
-          </td>
-        </tr>
-        <tr>
-          <td style="font-size:16px;color:#333;">
-            {{ $message }}
-          </td>
-        </tr>
-      </table>
-      <table width="600" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="padding:20px;">
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[0]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[0]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[1]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[1]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[2]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[2]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[3]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[3]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[4]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[4]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[5]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[5]['value'] }}
-          </td>
-        </tr>
-        <tr>
-          <td style="padding:10px;">
-            {{ $tablecontent[6]['key'] }}
-          </td>
-          <td style="padding:10px;">
-            {{ $tablecontent[6]['value'] }}
-          </td>
-        </tr>
-      </table>
+<table width="600" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="padding:20px;">
+<tr>
+    <td align="center">NUH-Odds Alarm Monitoring
     </td>
-  </tr>
+</tr>
+<tr>
+    @switch($alarm_level_id)
+        @case(1)
+            <td style="font-size:16px; color:rgb(0, 166, 62);">{{ $message }}</td>
+            @break
+            @case(2)
+            <td style="font-size:16px; color:rgb(21, 93, 252);">{{ $message }}</td>
+            @break
+            @case(3)
+            <td style="font-size:16px; color:rgb(231, 0, 11);">{{ $message }}</td>
+            @break
+    @endswitch
+    </td>
+</tr>
 </table>
-
-</body>
-</html>
\ No newline at end of file
+<table width="600" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="padding:20px;">
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[0]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[0]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[1]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[1]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[2]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[2]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[3]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[3]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[4]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[4]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[5]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[5]['value'] }}
+    </td>
+</tr>
+<tr>
+    <td style="padding:10px;">
+    {{ $tablecontent[6]['key'] }}
+    </td>
+    <td style="padding:10px;">
+    {{ $tablecontent[6]['value'] }}
+    </td>
+</tr>
+</table>
+</x-mail::message>
\ No newline at end of file