diff --git a/alerts/templates/alerts/new_issue.html b/alerts/templates/alerts/new_issue.html
index 46a32d7..fd5b920 100644
--- a/alerts/templates/alerts/new_issue.html
+++ b/alerts/templates/alerts/new_issue.html
@@ -466,11 +466,11 @@
               </a>
               </td>
             </tr>
-            <!-- Email Body -->
+            {# Email Body #}
             <tr>
               <td class="email-body" width="570" cellpadding="0" cellspacing="0" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px; width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; margin: 0; padding: 0;">
                 <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation" style="width: 570px; -premailer-width: 570px; -premailer-cellpadding: 0; -premailer-cellspacing: 0; background-color: #FFFFFF; margin: 0 auto; padding: 0;" bgcolor="#FFFFFF">
-                  <!-- Body content -->
+                  {% Body content #}
                   <tr>
                     <td class="content-cell" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px; padding: 45px;">
                       <div class="f-fallback">
@@ -480,12 +480,11 @@
                             This is a <strong>NEW</strong> issue on project <strong>"{{ project_name }}"</strong>.
                         </p>
 
-                        <!-- Action -->
+                        {# Action #}
                         <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0" role="presentation" style="width: 100%; -premailer-width: 100%; -premailer-cellpadding: 0; -premailer-cellspacing: 0; text-align: center; margin: 30px auto; padding: 0;">
                           <tr>
                             <td align="center" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
-                              <!-- Border based button
-           https://litmus.com/blog/a-guide-to-bulletproof-buttons-in-email-design -->
+                              {# Border based button https://litmus.com/blog/a-guide-to-bulletproof-buttons-in-email-design #}
                               <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
                                 <tr>
                                   <td align="center" style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">
@@ -496,7 +495,7 @@
                             </td>
                           </tr>
                         </table>
-                        <!-- Sub copy -->
+                        {# Sub copy #}
                         <table class="body-sub" role="presentation" style="margin-top: 25px; padding-top: 25px; border-top-width: 1px; border-top-color: #EAEAEC; border-top-style: solid;">
                           <tr>
                             <td style="word-break: break-word; font-family: &quot;Nunito Sans&quot;, Helvetica, Arial, sans-serif; font-size: 16px;">