diff --git a/apiserver/templates/emails/auth/forgot_password.html b/apiserver/templates/emails/auth/forgot_password.html
index a58a8cef75..9df90724f6 100644
--- a/apiserver/templates/emails/auth/forgot_password.html
+++ b/apiserver/templates/emails/auth/forgot_password.html
@@ -1,492 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="format-detection" content="telephone=no" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Set a new password to your Plane account</title>
-    <style type="text/css" emogrify="no">
-      #outlook a {
-        padding: 0;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%;
-      }
-      table td {
-        border-collapse: collapse;
-        mso-line-height-rule: exactly;
-      }
-      .editable.image {
-        font-size: 0 !important;
-        line-height: 0 !important;
-      }
-      .nl2go_preheader {
-        display: none !important;
-        mso-hide: all !important;
-        mso-line-height-rule: exactly;
-        visibility: hidden !important;
-        line-height: 0px !important;
-        font-size: 0px !important;
-      }
-      body {
-        width: 100% !important;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      img {
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
-      }
-      a img {
-        border: none;
-      }
-      table {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-      }
-      th {
-        font-weight: normal;
-        text-align: left;
-      }
-      *[class="gmail-fix"] {
-        display: none !important;
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-        .r0-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 320px !important;
-        }
-        .r1-i {
-          background-color: #ffffff !important;
-        }
-        .r2-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r3-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 100% !important;
-        }
-        .r4-i {
-          padding-bottom: 20px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 20px !important;
-        }
-        .r5-c {
-          box-sizing: border-box !important;
-          display: block !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r6-o {
-          border-style: solid !important;
-          width: 100% !important;
-        }
-        .r7-i {
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-        }
-        .r8-c {
-          box-sizing: border-box !important;
-          text-align: left !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r9-o {
-          border-style: solid !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r10-i {
-          padding-bottom: 10px !important;
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-          padding-top: 10px !important;
-        }
-        .r11-i {
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-          text-align: left !important;
-        }
-        .r12-i {
-          background-color: #ffffff !important;
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-          text-align: left !important;
-        }
-        .r13-c {
-          box-sizing: border-box !important;
-          padding: 0 !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r14-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          margin-bottom: 15px !important;
-          margin-top: 15px !important;
-          width: 100% !important;
-        }
-        .r15-i {
-          padding: 0 !important;
-          text-align: center !important;
-        }
-        .r16-r {
-          background-color: #3f76ff !important;
-          border-radius: 4px !important;
-          border-width: 0px !important;
-          box-sizing: border-box;
-          height: initial !important;
-          padding: 0 !important;
-          padding-bottom: 12px !important;
-          padding-top: 12px !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r17-i {
-          padding-bottom: 0px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 0px !important;
-        }
-        .r18-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r19-i {
-          padding-bottom: 5px !important;
-          padding-top: 5px !important;
-        }
-        .r20-i {
-          padding-bottom: 15px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 15px !important;
-        }
-        .r21-o {
-          border-bottom-color: #efefef !important;
-          border-bottom-width: 2px !important;
-          border-left-color: #efefef !important;
-          border-left-width: 2px !important;
-          border-right-color: #efefef !important;
-          border-right-width: 2px !important;
-          border-style: solid !important;
-          border-top-color: #efefef !important;
-          border-top-width: 2px !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r22-i {
-          padding-bottom: 5px !important;
-          padding-left: 5px !important;
-          padding-right: 5px !important;
-          padding-top: 5px !important;
-          text-align: left !important;
-        }
-        .r23-i {
-          padding-bottom: 5px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 5px !important;
-        }
-        .r24-c {
-          box-sizing: border-box !important;
-          width: 100% !important;
-        }
-        .r25-i {
-          font-size: 0px !important;
-          padding-bottom: 10px !important;
-          padding-left: 65px !important;
-          padding-right: 65px !important;
-          padding-top: 10px !important;
-        }
-        .r26-c {
-          box-sizing: border-box !important;
-          width: 32px !important;
-        }
-        .r27-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r28-o {
-          border-style: solid !important;
-          margin-right: 0px !important;
-          width: 32px !important;
-        }
-        .r29-i {
-          padding-bottom: 0px !important;
-          padding-top: 5px !important;
-          text-align: center !important;
-        }
-        body {
-          -webkit-text-size-adjust: none;
-        }
-        .nl2go-responsive-hide {
-          display: none;
-        }
-        .nl2go-body-table {
-          min-width: unset !important;
-        }
-        .mobshow {
-          height: auto !important;
-          overflow: visible !important;
-          max-height: unset !important;
-          visibility: visible !important;
-          border: none !important;
-        }
-        .resp-table {
-          display: inline-table !important;
-        }
-        .magic-resp {
-          display: table-cell !important;
-        }
-      }
-    </style>
-    <style type="text/css">
-      p,
-      h1,
-      h2,
-      h3,
-      h4,
-      ol,
-      ul {
-        margin: 0;
-      }
-      a,
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-      .nl2go-default-textstyle {
-        color: #3b3f44;
-        font-family: georgia, serif;
-        font-size: 16px;
-        line-height: 1.5;
-        word-break: break-word;
-      }
-      .default-button {
-        color: #ffffff;
-        font-family: georgia, serif;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: normal;
-        line-height: 1.15;
-        text-decoration: none;
-        word-break: break-word;
-      }
-      .default-heading1 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 36px;
-        word-break: break-word;
-      }
-      .default-heading2 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 32px;
-        word-break: break-word;
-      }
-      .default-heading3 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 24px;
-        word-break: break-word;
-      }
-      .default-heading4 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 18px;
-        word-break: break-word;
-      }
-      a[x-apple-data-detectors] {
-        color: inherit !important;
-        text-decoration: inherit !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-      .no-show-for-you {
-        border: none;
-        display: none;
-        float: none;
-        font-size: 0;
-        height: 0;
-        line-height: 0;
-        max-height: 0;
-        mso-hide: all;
-        overflow: hidden;
-        table-layout: fixed;
-        visibility: hidden;
-        width: 0;
-      }
-    </style>
-    <!--[if mso
-      ]><xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG /> <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-      </xml><!
-    [endif]-->
-    <style type="text/css">
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-    </style>
+    <style type="text/css" emogrify="no"> #outlook a { padding: 0; } .ExternalClass { width: 100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide: all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width: 100% !important; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; } a img { border: none; } table { border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } .r0-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important; } .r1-i { background-color: #ffffff !important; } .r2-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important; } .r3-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important; } .r4-i { padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important; } .r5-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important; } .r6-o { border-style: solid !important; width: 100% !important; } .r7-i { padding-left: 0px !important; padding-right: 0px !important; } .r8-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important; } .r9-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r10-i { padding-bottom: 10px !important; padding-left: 0px !important; padding-right: 0px !important; padding-top: 10px !important; } .r11-i { padding-bottom: 15px !important; padding-top: 15px !important; text-align: left !important; } .r12-i { background-color: #ffffff !important; padding-bottom: 15px !important; padding-top: 15px !important; text-align: left !important; } .r13-c { box-sizing: border-box !important; padding: 0 !important; text-align: center !important; valign: top !important; width: 100% !important; } .r14-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-bottom: 15px !important; margin-top: 15px !important; width: 100% !important; } .r15-i { padding: 0 !important; text-align: center !important; } .r16-r { background-color: #3f76ff !important; border-radius: 4px !important; border-width: 0px !important; box-sizing: border-box; height: initial !important; padding: 0 !important; padding-bottom: 12px !important; padding-top: 12px !important; text-align: center !important; width: 100% !important; } .r17-i { padding-bottom: 0px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 0px !important; } .r18-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important; } .r19-i { padding-bottom: 5px !important; padding-top: 5px !important; } .r20-i { padding-bottom: 15px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 15px !important; } .r21-o { border-bottom-color: #efefef !important; border-bottom-width: 2px !important; border-left-color: #efefef !important; border-left-width: 2px !important; border-right-color: #efefef !important; border-right-width: 2px !important; border-style: solid !important; border-top-color: #efefef !important; border-top-width: 2px !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r22-i { padding-bottom: 5px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 5px !important; text-align: left !important; } .r23-i { padding-bottom: 5px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 5px !important; } .r24-c { box-sizing: border-box !important; width: 100% !important; } .r25-i { font-size: 0px !important; padding-bottom: 10px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 10px !important; } .r26-c { box-sizing: border-box !important; width: 32px !important; } .r27-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important; } .r28-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important; } .r29-i { padding-bottom: 0px !important; padding-top: 5px !important; text-align: center !important; } body { -webkit-text-size-adjust: none; } .nl2go-responsive-hide { display: none; } .nl2go-body-table { min-width: unset !important; } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important; } .resp-table { display: inline-table !important; } .magic-resp { display: table-cell !important; } } </style>
+    <style type="text/css"> p, h1, h2, h3, h4, ol, ul { margin: 0; } a, a:link { color: #3f76ff; text-decoration: underline; } .nl2go-default-textstyle { color: #3b3f44; font-family: georgia, serif; font-size: 16px; line-height: 1.5; word-break: break-word; } .default-button { color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; font-weight: normal; line-height: 1.15; text-decoration: none; word-break: break-word; } .default-heading1 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 36px; word-break: break-word; } .default-heading2 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 32px; word-break: break-word; } .default-heading3 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 24px; word-break: break-word; } .default-heading4 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 18px; word-break: break-word; } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+    <!--[if mso ]>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG />
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+    <! [endif]--> 
+    <style type="text/css"> a:link { color: #3f76ff; text-decoration: underline; } </style>
   </head>
-  <body
-    bgcolor="#ffffff"
-    text="#3b3f44"
-    link="#3f76ff"
-    yahoo="fix"
-    style="background-color: #ffffff"
-  >
-    <table
-      cellspacing="0"
-      cellpadding="0"
-      border="0"
-      role="presentation"
-      class="nl2go-body-table"
-      width="100%"
-      style="background-color: #ffffff; width: 100%"
-    >
+  <body bgcolor="#ffffff" text="#3b3f44" link="#3f76ff" yahoo="fix" style="background-color: #ffffff" >
+    <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%" >
       <tr>
         <td>
-          <table
-            cellspacing="0"
-            cellpadding="0"
-            border="0"
-            role="presentation"
-            width="600"
-            align="center"
-            class="r0-o"
-            style="table-layout: fixed; width: 600px"
-          >
+          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" align="center" class="r0-o" style="table-layout: fixed; width: 600px" >
             <tr>
               <td valign="top" class="r1-i" style="background-color: #ffffff">
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r4-i"
-                      style="padding-bottom: 20px; padding-top: 20px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 10px;
-                                    padding-right: 10px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 10px; padding-right: 10px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="150"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 150px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="150" class="r9-o" style=" table-layout: fixed; width: 150px; " >
                                           <tr>
-                                            <td
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 0px;
-                                              "
-                                            >
-                                              <img
-                                                src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png"
-                                                width="150"
-                                                border="0"
-                                                style="
-                                                  display: block;
-                                                  width: 100%;
-                                                "
-                                              />
-                                            </td>
+                                            <td style=" font-size: 0px; line-height: 0px; " > <img src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png" width="150" border="0" style=" display: block; width: 100%; " /> </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -501,104 +56,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r10-i"
-                      style="padding-bottom: 10px; padding-top: 10px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r10-i" style="padding-bottom: 10px; padding-top: 10px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r11-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; word-break: break-word; line-height: 1.5; padding-bottom: 15px; padding-top: 15px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span
-                                                    style="
-                                                      font-family: Arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 32px;
-                                                    "
-                                                    ><strong
-                                                      >Reset your Plane
-                                                      account's password</strong
-                                                    ></span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style=" font-family: Arial, helvetica, sans-serif; font-size: 32px; " ><strong >Reset your Plane account's password</strong ></span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -607,47 +81,11 @@
                                     </tr>
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r12-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: arial,
-                                                      helvetica, sans-serif;
-                                                font-size: 16px;
-                                                line-height: 1.5;
-                                                word-break: break-word;
-                                                background-color: #ffffff;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r12-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; word-break: break-word; background-color: #ffffff; padding-bottom: 15px; padding-top: 15px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 17px"
-                                                    >Someone, hopefully you, has
-                                                    requested a new password be
-                                                    set to your Plane account.
-                                                    If it was you, please click
-                                                    the button below to reset
-                                                    your password.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style="font-size: 17px" >Someone, hopefully you, has requested a new password be set to your Plane account. If it was you, please click the button below to reset your password.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -655,119 +93,21 @@
                                       </td>
                                     </tr>
                                     <tr>
-                                      <td
-                                        class="r13-c"
-                                        align="center"
-                                        style="
-                                          align: center;
-                                          padding-bottom: 15px;
-                                          padding-top: 15px;
-                                          valign: top;
-                                        "
-                                      >
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="285"
-                                          class="r14-o"
-                                          style="
-                                            background-color: #3f76ff;
-                                            border-collapse: separate;
-                                            border-color: #3f76ff;
-                                            border-radius: 4px;
-                                            border-style: solid;
-                                            border-width: 0px;
-                                            table-layout: fixed;
-                                            width: 285px;
-                                          "
-                                        >
+                                      <td class="r13-c" align="center" style=" align: center; padding-bottom: 15px; padding-top: 15px; valign: top; " >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="285" class="r14-o" style=" background-color: #3f76ff; border-collapse: separate; border-color: #3f76ff; border-radius: 4px; border-style: solid; border-width: 0px; table-layout: fixed; width: 285px; " >
                                           <tr>
-                                            <td
-                                              height="18"
-                                              align="center"
-                                              valign="top"
-                                              class="r15-i nl2go-default-textstyle"
-                                              style="
-                                                word-break: break-word;
-                                                background-color: #3f76ff;
-                                                border-radius: 4px;
-                                                color: #ffffff;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                font-style: normal;
-                                                line-height: 1.15;
-                                                padding-bottom: 12px;
-                                                padding-top: 12px;
-                                                text-align: center;
-                                              "
-                                            >
-                                              <a
-                                                href="{{forgot_password_url}}"
-                                                class="r16-r default-button"
-                                                target="_blank"
-                                                data-btn="1"
-                                                style="
-                                                  font-style: normal;
-                                                  font-weight: normal;
-                                                  line-height: 1.15;
-                                                  text-decoration: none;
-                                                  word-break: break-word;
-                                                  word-wrap: break-word;
-                                                  display: block;
-                                                  -webkit-text-size-adjust: none;
-                                                  color: #ffffff;
-                                                  font-family: arial,
-                                                      helvetica, sans-serif;
-                                                  font-size: 16px;
-                                                "
-                                              >
-                                                <span>Reset password</span></a
-                                              >
-                                            </td>
+                                            <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style=" word-break: break-word; background-color: #3f76ff; border-radius: 4px; color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; line-height: 1.15; padding-bottom: 12px; padding-top: 12px; text-align: center; " > <a href="{{forgot_password_url}}" class="r16-r default-button" target="_blank" data-btn="1" style=" font-style: normal; font-weight: normal; line-height: 1.15; text-decoration: none; word-break: break-word; word-wrap: break-word; display: block; -webkit-text-size-adjust: none; color: #ffffff; font-family: arial, helvetica, sans-serif; font-size: 16px; " > <span>Reset password</span></a > </td>
                                           </tr>
                                         </table>
                                       </td>
                                     </tr>
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: arial,
-                                                      helvetica, sans-serif;
-                                                font-size: 16px;
-                                                line-height: 1.5;
-                                                word-break: break-word;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r11-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; word-break: break-word; padding-bottom: 15px; padding-top: 15px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 17px"
-                                                    >Ignore this if you didn't
-                                                    ask for a new link.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style="font-size: 17px" >Ignore this if you didn't ask for a new link.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -784,114 +124,27 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
                     <td class="r17-i">
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r18-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          class="r3-o"
-                                          style="table-layout: fixed"
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r3-o" style="table-layout: fixed" >
                                           <tr>
-                                            <td
-                                              class="r19-i"
-                                              style="
-                                                padding-bottom: 5px;
-                                                padding-top: 5px;
-                                                height: 1px;
-                                              "
-                                            >
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                            <td class="r19-i" style=" padding-bottom: 5px; padding-top: 5px; height: 1px; " >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                 <tr>
                                                   <td>
-                                                    <table
-                                                      width="100%"
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      valign=""
-                                                      class="r19-i"
-                                                      height="1"
-                                                      style="
-                                                        border-top-style: solid;
-                                                        background-clip: border-box;
-                                                        border-top-color: #efefef;
-                                                        border-top-width: 1px;
-                                                        font-size: 1px;
-                                                        line-height: 1px;
-                                                      "
-                                                    >
+                                                    <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" valign="" class="r19-i" height="1" style=" border-top-style: solid; background-clip: border-box; border-top-color: #efefef; border-top-width: 1px; font-size: 1px; line-height: 1px; " >
                                                       <tr>
-                                                        <td
-                                                          height="0"
-                                                          style="
-                                                            font-size: 0px;
-                                                            line-height: 0px;
-                                                          "
-                                                        >
-                                                          ­
-                                                        </td>
+                                                        <td height="0" style=" font-size: 0px; line-height: 0px; " > ­ </td>
                                                       </tr>
                                                     </table>
                                                   </td>
@@ -912,254 +165,37 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r20-i"
-                      style="padding-bottom: 15px; padding-top: 15px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r20-i" style="padding-bottom: 15px; padding-top: 15px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r21-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r21-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r22-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 5px;
-                                                padding-left: 5px;
-                                                padding-right: 5px;
-                                                padding-top: 5px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
+                                            <td align="left" valign="top" class="r22-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; word-break: break-word; line-height: 1.5; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; padding-top: 5px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 13px"
-                                                    >Despite our popularity, we
-                                                    are humbly early-stage. We
-                                                    are shipping fast, so please
-                                                    reach out to us with feature
-                                                    requests, major and minor
-                                                    nits, and anything else you
-                                                    find missing. We read every </span
-                                                  ><a
-                                                    href="https://discord.com/channels/1031547764020084846/1094927053867995176"
-                                                    title="Plane Support on Discod"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >message</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, </span
-                                                  ><a
-                                                    href="http://twitter.com/planepowers"
-                                                    title="@planepowers"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >tweet</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, and </span
-                                                  ><a
-                                                    href="https://github.com/makeplane/plane/issues"
-                                                    title="Plane's GitHub conversations"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >conversation</span
-                                                    ></a
-                                                  ><span
-                                                    style="font-size: 13px"
-                                                  >
-                                                    and update </span
-                                                  ><a
-                                                    href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban"
-                                                    title="Plane's roadmap"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >our public roadmap</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style="font-size: 13px" >Despite our popularity, we are humbly early-stage. We are shipping fast, so please reach out to us with feature requests, major and minor nits, and anything else you find missing. We read every </span ><a href="https://discord.com/channels/1031547764020084846/1094927053867995176" title="Plane Support on Discod" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >message</span ></a ><span style="font-size: 13px" >, </span ><a href="http://twitter.com/planepowers" title="@planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >tweet</span ></a ><span style="font-size: 13px" >, and </span ><a href="https://github.com/makeplane/plane/issues" title="Plane's GitHub conversations" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >conversation</span ></a ><span style="font-size: 13px" > and update </span ><a href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban" title="Plane's roadmap" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >our public roadmap</span ></a ><span style="font-size: 13px" >.</span > </p>
                                               </div>
                                             </td>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -1174,348 +210,57 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r23-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r23-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r18-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          align="center"
-                                          class="r3-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 570px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" align="center" class="r3-o" style=" table-layout: fixed; width: 570px; " >
                                           <tr>
                                             <td valign="top">
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                 <tr>
-                                                  <td
-                                                    class="r24-c"
-                                                    style="
-                                                      display: inline-block;
-                                                    "
-                                                  >
-                                                    <table
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      width="570"
-                                                      class="r6-o"
-                                                      style="
-                                                        table-layout: fixed;
-                                                        width: 570px;
-                                                      "
-                                                    >
+                                                  <td class="r24-c" style=" display: inline-block; " >
+                                                    <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r6-o" style=" table-layout: fixed; width: 570px; " >
                                                       <tr>
-                                                        <td
-                                                          class="r25-i"
-                                                          style="
-                                                            padding-bottom: 10px;
-                                                            padding-left: 209px;
-                                                            padding-right: 209px;
-                                                            padding-top: 10px;
-                                                          "
-                                                        >
-                                                          <table
-                                                            width="100%"
-                                                            cellspacing="0"
-                                                            cellpadding="0"
-                                                            border="0"
-                                                            role="presentation"
-                                                          >
+                                                        <td class="r25-i" style=" padding-bottom: 10px; padding-left: 209px; padding-right: 209px; padding-top: 10px; " >
+                                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                             <tr>
-                                                              <th
-                                                                width="40"
-                                                                class="r26-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r27-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r26-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r27-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r19-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://github.com/makeplane"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r19-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://github.com/makeplane" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r26-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r27-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r26-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r27-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r19-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://www.linkedin.com/company/planepowers/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r19-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r26-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r27-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r26-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r27-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r19-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://twitter.com/planepowers"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r19-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://twitter.com/planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="32"
-                                                                class="r26-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r28-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="32" class="r26-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r28-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r19-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://plane.so/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
+                                                                    <td class="r19-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://plane.so/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
@@ -1542,103 +287,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r23-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r23-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="center"
-                                              valign="top"
-                                              class="r29-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                word-break: break-word;
-                                                font-size: 18px;
-                                                line-height: 1.5;
-                                                padding-top: 5px;
-                                                text-align: center;
-                                              "
-                                            >
+                                            <td align="center" valign="top" class="r29-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; word-break: break-word; font-size: 18px; line-height: 1.5; padding-top: 5px; text-align: center; " >
                                               <div>
-                                                <p
-                                                  style="
-                                                    margin: 0;
-                                                    font-size: 14px;
-                                                  "
-                                                >
-                                                  <span style="font-size: 12px"
-                                                    >This email was sent to
-                                                    {{email}}. Please delete
-                                                    if you aren't the intended
-                                                    recipient.</span
-                                                  >
-                                                </p>
+                                                <p style=" margin: 0; font-size: 14px; " > <span style="font-size: 12px" >This email was sent to {{email}}. Please delete if you aren't the intended recipient.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -1662,4 +327,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/auth/magic_signin.html b/apiserver/templates/emails/auth/magic_signin.html
index ba469db7eb..a7a86a94c9 100644
--- a/apiserver/templates/emails/auth/magic_signin.html
+++ b/apiserver/templates/emails/auth/magic_signin.html
@@ -1,471 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="format-detection" content="telephone=no" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Your unique Plane login code is code</title>
-    <style type="text/css" emogrify="no">
-      #outlook a {
-        padding: 0;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%;
-      }
-      table td {
-        border-collapse: collapse;
-        mso-line-height-rule: exactly;
-      }
-      .editable.image {
-        font-size: 0 !important;
-        line-height: 0 !important;
-      }
-      .nl2go_preheader {
-        display: none !important;
-        mso-hide: all !important;
-        mso-line-height-rule: exactly;
-        visibility: hidden !important;
-        line-height: 0px !important;
-        font-size: 0px !important;
-      }
-      body {
-        width: 100% !important;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      img {
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
-      }
-      a img {
-        border: none;
-      }
-      table {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-      }
-      th {
-        font-weight: normal;
-        text-align: left;
-      }
-      *[class="gmail-fix"] {
-        display: none !important;
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-        .r0-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 320px !important;
-        }
-        .r1-i {
-          background-color: #ffffff !important;
-        }
-        .r2-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r3-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 100% !important;
-        }
-        .r4-i {
-          padding-bottom: 20px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 20px !important;
-        }
-        .r5-c {
-          box-sizing: border-box !important;
-          display: block !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r6-o {
-          border-style: solid !important;
-          width: 100% !important;
-        }
-        .r7-i {
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-        }
-        .r8-c {
-          box-sizing: border-box !important;
-          text-align: left !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r9-o {
-          border-style: solid !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r10-i {
-          padding-bottom: 15px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 15px !important;
-        }
-        .r11-i {
-          padding-bottom: 10px !important;
-          padding-top: 10px !important;
-          text-align: left !important;
-        }
-        .r12-i {
-          padding-bottom: 10px !important;
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-          padding-top: 10px !important;
-        }
-        .r13-o {
-          border-bottom-color: #d9e4ff !important;
-          border-bottom-width: 1px !important;
-          border-left-color: #d9e4ff !important;
-          border-left-width: 1px !important;
-          border-right-color: #d9e4ff !important;
-          border-right-width: 1px !important;
-          border-style: solid !important;
-          border-top-color: #d9e4ff !important;
-          border-top-width: 1px !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r14-i {
-          background-color: #ecf1ff !important;
-          padding-bottom: 10px !important;
-          padding-left: 10px !important;
-          padding-right: 10px !important;
-          padding-top: 10px !important;
-          text-align: left !important;
-        }
-        .r15-o {
-          border-bottom-color: #efefef !important;
-          border-bottom-width: 2px !important;
-          border-left-color: #efefef !important;
-          border-left-width: 2px !important;
-          border-right-color: #efefef !important;
-          border-right-width: 2px !important;
-          border-style: solid !important;
-          border-top-color: #efefef !important;
-          border-top-width: 2px !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r16-i {
-          padding-bottom: 5px !important;
-          padding-left: 5px !important;
-          padding-right: 5px !important;
-          padding-top: 5px !important;
-          text-align: left !important;
-        }
-        .r17-i {
-          padding-bottom: 5px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 5px !important;
-        }
-        .r18-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r19-c {
-          box-sizing: border-box !important;
-          width: 100% !important;
-        }
-        .r20-i {
-          font-size: 0px !important;
-          padding-bottom: 10px !important;
-          padding-left: 65px !important;
-          padding-right: 65px !important;
-          padding-top: 10px !important;
-        }
-        .r21-c {
-          box-sizing: border-box !important;
-          width: 32px !important;
-        }
-        .r22-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r23-i {
-          padding-bottom: 5px !important;
-          padding-top: 5px !important;
-        }
-        .r24-o {
-          border-style: solid !important;
-          margin-right: 0px !important;
-          width: 32px !important;
-        }
-        .r25-i {
-          padding-bottom: 0px !important;
-          padding-top: 5px !important;
-          text-align: center !important;
-        }
-        body {
-          -webkit-text-size-adjust: none;
-        }
-        .nl2go-responsive-hide {
-          display: none;
-        }
-        .nl2go-body-table {
-          min-width: unset !important;
-        }
-        .mobshow {
-          height: auto !important;
-          overflow: visible !important;
-          max-height: unset !important;
-          visibility: visible !important;
-          border: none !important;
-        }
-        .resp-table {
-          display: inline-table !important;
-        }
-        .magic-resp {
-          display: table-cell !important;
-        }
-      }
-    </style>
-    <style type="text/css">
-      p,
-      h1,
-      h2,
-      h3,
-      h4,
-      ol,
-      ul {
-        margin: 0;
-      }
-      a,
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-      .nl2go-default-textstyle {
-        color: #3b3f44;
-        font-family: georgia, serif;
-        font-size: 16px;
-        line-height: 1.5;
-        word-break: break-word;
-      }
-      .default-button {
-        color: #ffffff;
-        font-family: georgia, serif;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: normal;
-        line-height: 1.15;
-        text-decoration: none;
-        word-break: break-word;
-      }
-      .default-heading1 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 36px;
-        word-break: break-word;
-      }
-      .default-heading2 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 32px;
-        word-break: break-word;
-      }
-      .default-heading3 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 24px;
-        word-break: break-word;
-      }
-      .default-heading4 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 18px;
-        word-break: break-word;
-      }
-      a[x-apple-data-detectors] {
-        color: inherit !important;
-        text-decoration: inherit !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-      .no-show-for-you {
-        border: none;
-        display: none;
-        float: none;
-        font-size: 0;
-        height: 0;
-        line-height: 0;
-        max-height: 0;
-        mso-hide: all;
-        overflow: hidden;
-        table-layout: fixed;
-        visibility: hidden;
-        width: 0;
-      }
-    </style>
-    <!--[if mso
-      ]><xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG /> <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-      </xml><!
-    [endif]-->
-    <style type="text/css">
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-    </style>
+    <style type="text/css" emogrify="no"> #outlook a { padding: 0; } .ExternalClass { width: 100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide: all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width: 100% !important; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; } a img { border: none; } table { border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } .r0-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important; } .r1-i { background-color: #ffffff !important; } .r2-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important; } .r3-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important; } .r4-i { padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important; } .r5-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important; } .r6-o { border-style: solid !important; width: 100% !important; } .r7-i { padding-left: 0px !important; padding-right: 0px !important; } .r8-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important; } .r9-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r10-i { padding-bottom: 15px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 15px !important; } .r11-i { padding-bottom: 10px !important; padding-top: 10px !important; text-align: left !important; } .r12-i { padding-bottom: 10px !important; padding-left: 0px !important; padding-right: 0px !important; padding-top: 10px !important; } .r13-o { border-bottom-color: #d9e4ff !important; border-bottom-width: 1px !important; border-left-color: #d9e4ff !important; border-left-width: 1px !important; border-right-color: #d9e4ff !important; border-right-width: 1px !important; border-style: solid !important; border-top-color: #d9e4ff !important; border-top-width: 1px !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r14-i { background-color: #ecf1ff !important; padding-bottom: 10px !important; padding-left: 10px !important; padding-right: 10px !important; padding-top: 10px !important; text-align: left !important; } .r15-o { border-bottom-color: #efefef !important; border-bottom-width: 2px !important; border-left-color: #efefef !important; border-left-width: 2px !important; border-right-color: #efefef !important; border-right-width: 2px !important; border-style: solid !important; border-top-color: #efefef !important; border-top-width: 2px !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r16-i { padding-bottom: 5px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 5px !important; text-align: left !important; } .r17-i { padding-bottom: 5px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 5px !important; } .r18-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important; } .r19-c { box-sizing: border-box !important; width: 100% !important; } .r20-i { font-size: 0px !important; padding-bottom: 10px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 10px !important; } .r21-c { box-sizing: border-box !important; width: 32px !important; } .r22-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important; } .r23-i { padding-bottom: 5px !important; padding-top: 5px !important; } .r24-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important; } .r25-i { padding-bottom: 0px !important; padding-top: 5px !important; text-align: center !important; } body { -webkit-text-size-adjust: none; } .nl2go-responsive-hide { display: none; } .nl2go-body-table { min-width: unset !important; } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important; } .resp-table { display: inline-table !important; } .magic-resp { display: table-cell !important; } } </style>
+    <style type="text/css"> p, h1, h2, h3, h4, ol, ul { margin: 0; } a, a:link { color: #3f76ff; text-decoration: underline; } .nl2go-default-textstyle { color: #3b3f44; font-family: georgia, serif; font-size: 16px; line-height: 1.5; word-break: break-word; } .default-button { color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; font-weight: normal; line-height: 1.15; text-decoration: none; word-break: break-word; } .default-heading1 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 36px; word-break: break-word; } .default-heading2 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 32px; word-break: break-word; } .default-heading3 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 24px; word-break: break-word; } .default-heading4 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 18px; word-break: break-word; } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+    <!--[if mso ]>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG />
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+    <! [endif]--> 
+    <style type="text/css"> a:link { color: #3f76ff; text-decoration: underline; } </style>
   </head>
-  <body
-    bgcolor="#ffffff"
-    text="#3b3f44"
-    link="#3f76ff"
-    yahoo="fix"
-    style="background-color: #ffffff"
-  >
-    <table
-      cellspacing="0"
-      cellpadding="0"
-      border="0"
-      role="presentation"
-      class="nl2go-body-table"
-      width="100%"
-      style="background-color: #ffffff; width: 100%"
-    >
+  <body bgcolor="#ffffff" text="#3b3f44" link="#3f76ff" yahoo="fix" style="background-color: #ffffff" >
+    <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%" >
       <tr>
         <td>
-          <table
-            cellspacing="0"
-            cellpadding="0"
-            border="0"
-            role="presentation"
-            width="600"
-            align="center"
-            class="r0-o"
-            style="table-layout: fixed; width: 600px"
-          >
+          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" align="center" class="r0-o" style="table-layout: fixed; width: 600px" >
             <tr>
               <td valign="top" class="r1-i" style="background-color: #ffffff">
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r4-i"
-                      style="padding-bottom: 20px; padding-top: 20px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 10px;
-                                    padding-right: 10px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 10px; padding-right: 10px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="150"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 150px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="150" class="r9-o" style=" table-layout: fixed; width: 150px; " >
                                           <tr>
-                                            <td
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 0px;
-                                              "
-                                            >
-                                              <img
-                                                src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png"
-                                                width="150"
-                                                border="0"
-                                                style="
-                                                  display: block;
-                                                  width: 100%;
-                                                "
-                                              />
-                                            </td>
+                                            <td style=" font-size: 0px; line-height: 0px; " > <img src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png" width="150" border="0" style=" display: block; width: 100%; " /> </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -480,105 +56,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r10-i"
-                      style="padding-bottom: 15px; padding-top: 15px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r10-i" style="padding-bottom: 15px; padding-top: 15px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                line-height: 1.5;
-                                                word-break: break-word;
-                                                padding-bottom: 10px;
-                                                padding-top: 10px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r11-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; line-height: 1.5; word-break: break-word; padding-bottom: 10px; padding-top: 10px; text-align: left; " >
                                               <div>
-                                                <h2
-                                                  class="default-heading2"
-                                                  style="
-                                                    margin: 0;
-                                                    color: #1f2d3d;
-                                                    font-family: arial,
-                                                      helvetica, sans-serif;
-                                                    font-size: 32px;
-                                                    word-break: break-word;
-                                                  "
-                                                >
-                                                  The code below is only valid
-                                                  for 10 minutes.
-                                                </h2>
+                                                <h2 class="default-heading2" style=" margin: 0; color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 32px; word-break: break-word; " > The code below is only valid for 10 minutes. </h2>
                                               </div>
                                             </td>
                                           </tr>
@@ -595,130 +89,24 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r12-i"
-                      style="padding-bottom: 10px; padding-top: 10px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r12-i" style="padding-bottom: 10px; padding-top: 10px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r13-o"
-                                          style="
-                                            background-color: #ecf1ff;
-                                            border-bottom-color: #d9e4ff;
-                                            border-bottom-width: 1px;
-                                            border-collapse: separate;
-                                            border-left-color: #d9e4ff;
-                                            border-left-width: 1px;
-                                            border-radius: 5px;
-                                            border-right-color: #d9e4ff;
-                                            border-right-width: 1px;
-                                            border-style: solid;
-                                            border-top-color: #d9e4ff;
-                                            border-top-width: 1px;
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r13-o" style=" background-color: #ecf1ff; border-bottom-color: #d9e4ff; border-bottom-width: 1px; border-collapse: separate; border-left-color: #d9e4ff; border-left-width: 1px; border-radius: 5px; border-right-color: #d9e4ff; border-right-width: 1px; border-style: solid; border-top-color: #d9e4ff; border-top-width: 1px; table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r14-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                background-color: #ecf1ff;
-                                                border-radius: 4px;
-                                                line-height: 3;
-                                                padding-bottom: 10px;
-                                                padding-left: 10px;
-                                                padding-right: 10px;
-                                                padding-top: 10px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r14-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; word-break: break-word; background-color: #ecf1ff; border-radius: 4px; line-height: 3; padding-bottom: 10px; padding-left: 10px; padding-right: 10px; padding-top: 10px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span
-                                                    style="
-                                                      font-family: Arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 24px;
-                                                    "
-                                                    >{{code}}</span
-                                                  >
-                                                </p>
-                                                <p style="margin: 0">
-                                                  <span
-                                                    style="
-                                                      color: #5f5e5e;
-                                                      font-family: Arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 14px;
-                                                    "
-                                                    >Please copy and paste this
-                                                    on the screen where you
-                                                    requested this from.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style=" font-family: Arial, helvetica, sans-serif; font-size: 24px; " >{{code}}</span > </p>
+                                                <p style="margin: 0"> <span style=" color: #5f5e5e; font-family: Arial, helvetica, sans-serif; font-size: 14px; " >Please copy and paste this on the screen where you requested this from.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -735,254 +123,37 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r10-i"
-                      style="padding-bottom: 15px; padding-top: 15px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r10-i" style="padding-bottom: 15px; padding-top: 15px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r15-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r15-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r16-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 5px;
-                                                padding-left: 5px;
-                                                padding-right: 5px;
-                                                padding-top: 5px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
+                                            <td align="left" valign="top" class="r16-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; word-break: break-word; line-height: 1.5; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; padding-top: 5px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 13px"
-                                                    >Despite our popularity, we
-                                                    are humbly early-stage. We
-                                                    are shipping fast, so please
-                                                    reach out to us with feature
-                                                    requests, major and minor
-                                                    nits, and anything else you
-                                                    find missing. We read every </span
-                                                  ><a
-                                                    href="https://discord.com/channels/1031547764020084846/1094927053867995176"
-                                                    title="Plane Support on Discod"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >message</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, </span
-                                                  ><a
-                                                    href="http://twitter.com/planepowers"
-                                                    title="@planepowers"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >tweet</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, and </span
-                                                  ><a
-                                                    href="https://github.com/makeplane/plane/issues"
-                                                    title="Plane's GitHub conversations"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >conversation</span
-                                                    ></a
-                                                  ><span
-                                                    style="font-size: 13px"
-                                                  >
-                                                    and update </span
-                                                  ><a
-                                                    href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban"
-                                                    title="Plane's roadmap"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >our public roadmap</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style="font-size: 13px" >Despite our popularity, we are humbly early-stage. We are shipping fast, so please reach out to us with feature requests, major and minor nits, and anything else you find missing. We read every </span ><a href="https://discord.com/channels/1031547764020084846/1094927053867995176" title="Plane Support on Discod" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >message</span ></a ><span style="font-size: 13px" >, </span ><a href="http://twitter.com/planepowers" title="@planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >tweet</span ></a ><span style="font-size: 13px" >, and </span ><a href="https://github.com/makeplane/plane/issues" title="Plane's GitHub conversations" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >conversation</span ></a ><span style="font-size: 13px" > and update </span ><a href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban" title="Plane's roadmap" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >our public roadmap</span ></a ><span style="font-size: 13px" >.</span > </p>
                                               </div>
                                             </td>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -997,348 +168,57 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r17-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r17-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r18-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          align="center"
-                                          class="r3-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 570px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" align="center" class="r3-o" style=" table-layout: fixed; width: 570px; " >
                                           <tr>
                                             <td valign="top">
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                 <tr>
-                                                  <td
-                                                    class="r19-c"
-                                                    style="
-                                                      display: inline-block;
-                                                    "
-                                                  >
-                                                    <table
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      width="570"
-                                                      class="r6-o"
-                                                      style="
-                                                        table-layout: fixed;
-                                                        width: 570px;
-                                                      "
-                                                    >
+                                                  <td class="r19-c" style=" display: inline-block; " >
+                                                    <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r6-o" style=" table-layout: fixed; width: 570px; " >
                                                       <tr>
-                                                        <td
-                                                          class="r20-i"
-                                                          style="
-                                                            padding-bottom: 10px;
-                                                            padding-left: 209px;
-                                                            padding-right: 209px;
-                                                            padding-top: 10px;
-                                                          "
-                                                        >
-                                                          <table
-                                                            width="100%"
-                                                            cellspacing="0"
-                                                            cellpadding="0"
-                                                            border="0"
-                                                            role="presentation"
-                                                          >
+                                                        <td class="r20-i" style=" padding-bottom: 10px; padding-left: 209px; padding-right: 209px; padding-top: 10px; " >
+                                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                             <tr>
-                                                              <th
-                                                                width="40"
-                                                                class="r21-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r22-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r21-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r22-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r23-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://github.com/makeplane"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r23-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://github.com/makeplane" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r21-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r22-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r21-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r22-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r23-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://www.linkedin.com/company/planepowers/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r23-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r21-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r22-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r21-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r22-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r23-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://twitter.com/planepowers"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r23-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://twitter.com/planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="32"
-                                                                class="r21-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r24-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="32" class="r21-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r24-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r23-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://plane.so/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
+                                                                    <td class="r23-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://plane.so/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
@@ -1365,103 +245,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r17-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r17-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="center"
-                                              valign="top"
-                                              class="r25-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                word-break: break-word;
-                                                font-size: 18px;
-                                                line-height: 1.5;
-                                                padding-top: 5px;
-                                                text-align: center;
-                                              "
-                                            >
+                                            <td align="center" valign="top" class="r25-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; word-break: break-word; font-size: 18px; line-height: 1.5; padding-top: 5px; text-align: center; " >
                                               <div>
-                                                <p
-                                                  style="
-                                                    margin: 0;
-                                                    font-size: 14px;
-                                                  "
-                                                >
-                                                  <span style="font-size: 12px"
-                                                    >This email was sent to
-                                                    {{email}}. Please delete
-                                                    if you aren't the intended
-                                                    recipient.</span
-                                                  >
-                                                </p>
+                                                <p style=" margin: 0; font-size: 14px; " > <span style="font-size: 12px" >This email was sent to {{email}}. Please delete if you aren't the intended recipient.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -1485,4 +285,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/exports/analytics.html b/apiserver/templates/emails/exports/analytics.html
index f5611705ef..d2caa9d7a4 100644
--- a/apiserver/templates/emails/exports/analytics.html
+++ b/apiserver/templates/emails/exports/analytics.html
@@ -1,8 +1,2 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-    Hey there,<br/>
-    Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/>
-    Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/>
-    If you require any assistance or have any questions, please do not hesitate to contact us.<br/>
-    Thank you
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html> Hey there,<br/> Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/> Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/> If you require any assistance or have any questions, please do not hesitate to contact us.<br/> Thank you </html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/invitations/project_invitation.html b/apiserver/templates/emails/invitations/project_invitation.html
index def576601a..0a40d42bf8 100644
--- a/apiserver/templates/emails/invitations/project_invitation.html
+++ b/apiserver/templates/emails/invitations/project_invitation.html
@@ -1,940 +1,138 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="format-detection" content="telephone=no" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>
-      {{ first_name }} invited you to join {{ project_name }} on Plane
-    </title>
-    <style type="text/css" emogrify="no">
-      #outlook a {
-        padding: 0;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%;
-      }
-      table td {
-        border-collapse: collapse;
-        mso-line-height-rule: exactly;
-      }
-      .editable.image {
-        font-size: 0 !important;
-        line-height: 0 !important;
-      }
-      .nl2go_preheader {
-        display: none !important;
-        mso-hide: all !important;
-        mso-line-height-rule: exactly;
-        visibility: hidden !important;
-        line-height: 0px !important;
-        font-size: 0px !important;
-      }
-      body {
-        width: 100% !important;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      img {
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
-      }
-      a img {
-        border: none;
-      }
-      table {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-      }
-      th {
-        font-weight: normal;
-        text-align: left;
-      }
-      *[class="gmail-fix"] {
-        display: none !important;
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-        .r0-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 320px !important;
-        }
-        .r1-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 320px !important;
-        }
-        .r2-i {
-          background-color: #ffffff !important;
-        }
-        .r3-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r4-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          margin-top: 20px !important;
-          width: 100% !important;
-        }
-        .r5-i {
-          background-color: #f8f9fa !important;
-          padding-bottom: 20px !important;
-          padding-left: 10px !important;
-          padding-right: 10px !important;
-          padding-top: 20px !important;
-        }
-        .r6-c {
-          box-sizing: border-box !important;
-          display: block !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r7-o {
-          border-style: solid !important;
-          width: 100% !important;
-        }
-        .r8-i {
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-        }
-        .r9-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 100% !important;
-        }
-        .r10-i {
-          padding-bottom: 35px !important;
-          padding-top: 15px !important;
-        }
-        .r11-c {
-          box-sizing: border-box !important;
-          text-align: left !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r12-o {
-          border-style: solid !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r13-i {
-          padding-left: 20px !important;
-          padding-right: 20px !important;
-          padding-top: 0px !important;
-          text-align: center !important;
-        }
-        .r14-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          margin-bottom: 20px !important;
-          margin-top: 20px !important;
-          width: 100% !important;
-        }
-        .r15-i {
-          text-align: center !important;
-        }
-        .r16-r {
-          background-color: #ffffff !important;
-          border-color: #3f76ff !important;
-          border-radius: 4px !important;
-          border-width: 1px !important;
-          box-sizing: border-box;
-          height: initial !important;
-          padding-bottom: 7px !important;
-          padding-left: 20px !important;
-          padding-right: 20px !important;
-          padding-top: 7px !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r17-i {
-          padding-bottom: 15px !important;
-          padding-left: 20px !important;
-          padding-right: 20px !important;
-          padding-top: 15px !important;
-          text-align: left !important;
-        }
-        .r18-i {
-          background-color: #eff2f7 !important;
-          padding-bottom: 20px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 20px !important;
-        }
-        .r19-i {
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-        }
-        .r20-i {
-          color: #3b3f44 !important;
-          padding-bottom: 0px !important;
-          padding-top: 0px !important;
-          text-align: center !important;
-        }
-        .r21-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r22-c {
-          box-sizing: border-box !important;
-          width: 100% !important;
-        }
-        .r23-i {
-          font-size: 0px !important;
-          padding-bottom: 15px !important;
-          padding-left: 65px !important;
-          padding-right: 65px !important;
-          padding-top: 15px !important;
-        }
-        .r24-c {
-          box-sizing: border-box !important;
-          width: 32px !important;
-        }
-        .r25-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r26-i {
-          padding-bottom: 5px !important;
-          padding-top: 5px !important;
-        }
-        .r27-o {
-          border-style: solid !important;
-          margin-right: 0px !important;
-          width: 32px !important;
-        }
-        .r28-i {
-          color: #3b3f44 !important;
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-          text-align: center !important;
-        }
-        .r29-i {
-          padding-bottom: 15px !important;
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-          padding-top: 0px !important;
-        }
-        .r30-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 129px !important;
-        }
-        .r31-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 129px !important;
-        }
-        body {
-          -webkit-text-size-adjust: none;
-        }
-        .nl2go-responsive-hide {
-          display: none;
-        }
-        .nl2go-body-table {
-          min-width: unset !important;
-        }
-        .mobshow {
-          height: auto !important;
-          overflow: visible !important;
-          max-height: unset !important;
-          visibility: visible !important;
-          border: none !important;
-        }
-        .resp-table {
-          display: inline-table !important;
-        }
-        .magic-resp {
-          display: table-cell !important;
-        }
-      }
-    </style>
-    <!--[if !mso]><!-->
-    <style type="text/css" emogrify="no">
-      @import url("https://fonts.googleapis.com/css2?family=Bitter&family=Roboto");
-    </style>
-    <!--<![endif]-->
-    <style type="text/css">
-      p,
-      h1,
-      h2,
-      h3,
-      h4,
-      ol,
-      ul {
-        margin: 0;
-      }
-      a,
-      a:link {
-        color: #0092ff;
-        text-decoration: underline;
-      }
-      .nl2go-default-textstyle {
-        color: #3b3f44;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 16px;
-        line-height: 1.5;
-      }
-      .default-button {
-        border-radius: 4px;
-        color: #ffffff;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: bold;
-        line-height: 1.15;
-        text-decoration: none;
-        width: 50%;
-      }
-      .default-heading1 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 36px;
-      }
-      .default-heading2 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 32px;
-      }
-      .default-heading3 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 24px;
-      }
-      .default-heading4 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 18px;
-      }
-      a[x-apple-data-detectors] {
-        color: inherit !important;
-        text-decoration: inherit !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-      .no-show-for-you {
-        border: none;
-        display: none;
-        float: none;
-        font-size: 0;
-        height: 0;
-        line-height: 0;
-        max-height: 0;
-        mso-hide: all;
-        overflow: hidden;
-        table-layout: fixed;
-        visibility: hidden;
-        width: 0;
-      }
-    </style>
-    <!--[if mso]>
-      <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG />
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-      </xml>
-    <![endif]-->
-    <style type="text/css">
-      a:link {
-        color: #0092ff;
-        text-decoration: underline;
-      }
-    </style>
+    <title> {{ first_name }} invited you to join {{ project_name }} on Plane </title>
+    <style type="text/css" emogrify="no"> #outlook a { padding: 0; } .ExternalClass { width: 100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide: all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width: 100% !important; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; } a img { border: none; } table { border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } .r0-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 320px !important; } .r1-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important; } .r2-i { background-color: #ffffff !important; } .r3-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important; } .r4-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-top: 20px !important; width: 100% !important; } .r5-i { background-color: #f8f9fa !important; padding-bottom: 20px !important; padding-left: 10px !important; padding-right: 10px !important; padding-top: 20px !important; } .r6-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important; } .r7-o { border-style: solid !important; width: 100% !important; } .r8-i { padding-left: 0px !important; padding-right: 0px !important; } .r9-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important; } .r10-i { padding-bottom: 35px !important; padding-top: 15px !important; } .r11-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important; } .r12-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r13-i { padding-left: 20px !important; padding-right: 20px !important; padding-top: 0px !important; text-align: center !important; } .r14-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-bottom: 20px !important; margin-top: 20px !important; width: 100% !important; } .r15-i { text-align: center !important; } .r16-r { background-color: #ffffff !important; border-color: #3f76ff !important; border-radius: 4px !important; border-width: 1px !important; box-sizing: border-box; height: initial !important; padding-bottom: 7px !important; padding-left: 20px !important; padding-right: 20px !important; padding-top: 7px !important; text-align: center !important; width: 100% !important; } .r17-i { padding-bottom: 15px !important; padding-left: 20px !important; padding-right: 20px !important; padding-top: 15px !important; text-align: left !important; } .r18-i { background-color: #eff2f7 !important; padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important; } .r19-i { padding-bottom: 15px !important; padding-top: 15px !important; } .r20-i { color: #3b3f44 !important; padding-bottom: 0px !important; padding-top: 0px !important; text-align: center !important; } .r21-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important; } .r22-c { box-sizing: border-box !important; width: 100% !important; } .r23-i { font-size: 0px !important; padding-bottom: 15px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 15px !important; } .r24-c { box-sizing: border-box !important; width: 32px !important; } .r25-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important; } .r26-i { padding-bottom: 5px !important; padding-top: 5px !important; } .r27-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important; } .r28-i { color: #3b3f44 !important; padding-bottom: 15px !important; padding-top: 15px !important; text-align: center !important; } .r29-i { padding-bottom: 15px !important; padding-left: 0px !important; padding-right: 0px !important; padding-top: 0px !important; } .r30-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 129px !important; } .r31-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 129px !important; } body { -webkit-text-size-adjust: none; } .nl2go-responsive-hide { display: none; } .nl2go-body-table { min-width: unset !important; } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important; } .resp-table { display: inline-table !important; } .magic-resp { display: table-cell !important; } } </style>
+    <!--[if !mso]><!--> 
+    <style type="text/css" emogrify="no"> @import url("https://fonts.googleapis.com/css2?family=Bitter&family=Roboto"); </style>
+    <!--<![endif]--> 
+    <style type="text/css"> p, h1, h2, h3, h4, ol, ul { margin: 0; } a, a:link { color: #0092ff; text-decoration: underline; } .nl2go-default-textstyle { color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; } .default-button { border-radius: 4px; color: #ffffff; font-family: arial, helvetica, sans-serif; font-size: 16px; font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; width: 50%; } .default-heading1 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 36px; } .default-heading2 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 32px; } .default-heading3 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 24px; } .default-heading4 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 18px; } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+    <!--[if mso]> 
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG />
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+    <![endif]--> 
+    <style type="text/css"> a:link { color: #0092ff; text-decoration: underline; } </style>
   </head>
-  <body
-    bgcolor="#ffffff"
-    text="#3b3f44"
-    link="#0092ff"
-    yahoo="fix"
-    style="background-color: #ffffff; padding-bottom: 0px; padding-top: 0px"
-  >
-    <table
-      cellspacing="0"
-      cellpadding="0"
-      border="0"
-      role="presentation"
-      class="nl2go-body-table"
-      width="100%"
-      style="background-color: #ffffff; width: 100%"
-    >
+  <body bgcolor="#ffffff" text="#3b3f44" link="#0092ff" yahoo="fix" style="background-color: #ffffff; padding-bottom: 0px; padding-top: 0px" >
+    <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%" >
       <tr>
         <td align="center" class="r0-c">
-          <table
-            cellspacing="0"
-            cellpadding="0"
-            border="0"
-            role="presentation"
-            width="600"
-            class="r1-o"
-            style="table-layout: fixed; width: 600px"
-          >
+          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" class="r1-o" style="table-layout: fixed; width: 600px" >
             <tr>
               <td valign="top" class="r2-i" style="background-color: #ffffff">
-                <table
-                  width="100%"
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                >
+                <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                   <tr>
                     <td class="r3-c" align="center">
-                      <table
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                        width="100%"
-                        class="r4-o"
-                        style="table-layout: fixed; width: 100%"
-                      >
-                        <!-- -->
+                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r4-o" style="table-layout: fixed; width: 100%" >
+                        <!-- --> 
                         <tr class="nl2go-responsive-hide">
-                          <td
-                            height="20"
-                            style="font-size: 20px; line-height: 20px"
-                          >
-                            ­
-                          </td>
+                          <td height="20" style="font-size: 20px; line-height: 20px" > ­ </td>
                         </tr>
                         <tr class="nl2go-responsive-hide">
-                          <td
-                            height="20"
-                            style="
-                              font-size: 20px;
-                              line-height: 20px;
-                              background-color: #f8f9fa;
-                            "
-                          >
-                            ­
-                          </td>
+                          <td height="20" style=" font-size: 20px; line-height: 20px; background-color: #f8f9fa; " > ­ </td>
                         </tr>
                         <tr>
                           <td class="r5-i" style="background-color: #f8f9fa">
-                            <table
-                              width="100%"
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                            >
+                            <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                               <tr>
-                                <th
-                                  width="100%"
-                                  valign="top"
-                                  class="r6-c"
-                                  style="font-weight: normal"
-                                >
-                                  <table
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                    width="100%"
-                                    class="r7-o"
-                                    style="table-layout: fixed; width: 100%"
-                                  >
-                                    <!-- -->
+                                <th width="100%" valign="top" class="r6-c" style="font-weight: normal" >
+                                  <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r7-o" style="table-layout: fixed; width: 100%" >
+                                    <!-- --> 
                                     <tr>
                                       <td valign="top" class="r8-i">
-                                        <table
-                                          width="100%"
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                        >
+                                        <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                           <tr>
                                             <td class="r3-c" align="center">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="120"
-                                                class="r9-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 120px;
-                                                "
-                                              >
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="120" class="r9-o" style=" table-layout: fixed; width: 120px; " >
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                                 <tr>
-                                                  <td
-                                                    class="r10-i"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 0px;
-                                                    "
-                                                  >
-                                                    <img
-                                                      src="https://ik.imagekit.io/w2okwbtu2/Plane_Logo_pIhtbyIoa.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670873447444"
-                                                      width="120"
-                                                      border="0"
-                                                      class=""
-                                                      style="
-                                                        display: block;
-                                                        width: 100%;
-                                                      "
-                                                    />
-                                                  </td>
+                                                  <td class="r10-i" style=" font-size: 0px; line-height: 0px; " > <img src="https://ik.imagekit.io/w2okwbtu2/Plane_Logo_pIhtbyIoa.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670873447444" width="120" border="0" class="" style=" display: block; width: 100%; " /> </td>
                                                 </tr>
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="35"
-                                                    style="
-                                                      font-size: 35px;
-                                                      line-height: 35px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="35" style=" font-size: 35px; line-height: 35px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
                                           </tr>
                                           <tr>
                                             <td class="r11-c" align="left">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="100%"
-                                                class="r12-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 100%;
-                                                "
-                                              >
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r12-o" style=" table-layout: fixed; width: 100%; " >
                                                 <tr>
-                                                  <td
-                                                    class="nl2go-responsive-hide"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 1px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    align="center"
-                                                    valign="top"
-                                                    class="r13-i nl2go-default-textstyle"
-                                                    style="
-                                                      color: #3b3f44;
-                                                      font-family: arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 16px;
-                                                      line-height: 1.5;
-                                                      text-align: center;
-                                                    "
-                                                  >
+                                                  <td class="nl2go-responsive-hide" width="20" style=" font-size: 0px; line-height: 1px; " > ­ </td>
+                                                  <td align="center" valign="top" class="r13-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; text-align: center; " >
                                                     <div>
-                                                      <p style="margin: 0">
-                                                        <span
-                                                          style="
-                                                            font-size: 26px;
-                                                          "
-                                                          ><strong
-                                                            >{{first_name}}</strong
-                                                          >
-                                                          has invited you to
-                                                          join the
-                                                        </span>
-                                                      </p>
-                                                      <p style="margin: 0">
-                                                        <span
-                                                          style="
-                                                            font-size: 26px;
-                                                          "
-                                                          ><strong
-                                                            >{{project_name}}</strong
-                                                          >
-                                                          project on Plane</span
-                                                        >
-                                                      </p>
+                                                      <p style="margin: 0"> <span style=" font-size: 26px; " ><strong >{{first_name}}</strong > has invited you to join the </span> </p>
+                                                      <p style="margin: 0"> <span style=" font-size: 26px; " ><strong >{{project_name}}</strong > project on Plane</span > </p>
                                                     </div>
                                                   </td>
-                                                  <td
-                                                    class="nl2go-responsive-hide"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 1px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                  <td class="nl2go-responsive-hide" width="20" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
                                           </tr>
                                           <tr>
                                             <td class="r3-c" align="center">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="300"
-                                                class="r14-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 300px;
-                                                "
-                                              >
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="20"
-                                                    style="
-                                                      font-size: 20px;
-                                                      line-height: 20px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="300" class="r14-o" style=" table-layout: fixed; width: 300px; " >
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="20" style=" font-size: 20px; line-height: 20px; " > ­ </td>
                                                 </tr>
                                                 <tr>
-                                                  <td
-                                                    height="18"
-                                                    align="center"
-                                                    valign="top"
-                                                    class="r15-i nl2go-default-textstyle"
-                                                    style="
-                                                      color: #3b3f44;
-                                                      font-family: arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 16px;
-                                                      line-height: 1.5;
-                                                    "
-                                                  >
-                                                    <!--[if mso]>
-                                                      <v:roundrect
-                                                        xmlns:v="urn:schemas-microsoft-com:vml"
-                                                        xmlns:w="urn:schemas-microsoft-com:office:word"
-                                                        href="{{invitation_url}}"
-                                                        style="
-                                                          v-text-anchor: middle;
-                                                          height: 33px;
-                                                          width: 301px;
-                                                        "
-                                                        arcsize="12%"
-                                                        fillcolor="#ffffff"
-                                                        strokecolor="#3f76ff"
-                                                        strokeweight="1px"
-                                                        data-btn="1"
-                                                      >
-                                                        <w:anchorlock />
-                                                        <div
-                                                          style="display: none"
-                                                        >
-                                                          <center
-                                                            class="default-button"
-                                                          >
-                                                            <p>
-                                                              <span
-                                                                style="
-                                                                  color: #3f76ff;
-                                                                "
-                                                                >Accept the
-                                                                invite</span
-                                                              >
-                                                            </p>
-                                                          </center>
-                                                        </div>
-                                                      </v:roundrect>
-                                                    <![endif]-->
-                                                    <!--[if !mso]><!-- -->
-                                                    <a
-                                                      href="{{invitation_url}}"
-                                                      class="r16-r default-button"
-                                                      target="_blank"
-                                                      rel="noopener noreferrer"
-                                                      data-btn="1"
-                                                      style="
-                                                        font-style: normal;
-                                                        font-weight: bold;
-                                                        line-height: 1.15;
-                                                        text-decoration: none;
-                                                        border-style: solid;
-                                                        word-wrap: break-word;
-                                                        display: inline-block;
-                                                        -webkit-text-size-adjust: none;
-                                                        mso-hide: all;
-                                                        background-color: #ffffff;
-                                                        border-color: #3f76ff;
-                                                        border-radius: 4px;
-                                                        border-width: 1px;
-                                                        color: #ffffff;
-                                                        font-family: arial,
-                                                          helvetica, sans-serif;
-                                                        font-size: 16px;
-                                                        height: 18px;
-                                                        padding-bottom: 7px;
-                                                        padding-left: 20px;
-                                                        padding-right: 20px;
-                                                        padding-top: 7px;
-                                                        width: 258px;
-                                                      "
-                                                    >
-                                                      <p style="margin: 0">
-                                                        <span
-                                                          style="color: #3f76ff"
-                                                          >Accept the
-                                                          invite</span
-                                                        >
-                                                      </p>
+                                                  <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; " >
+                                                    <!--[if mso]> 
+                                                    <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{invitation_url}}" style=" v-text-anchor: middle; height: 33px; width: 301px; " arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1" >
+                                                      <w:anchorlock />
+                                                      <div style="display: none" >
+                                                        <center class="default-button" >
+                                                          <p> <span style=" color: #3f76ff; " >Accept the invite</span > </p>
+                                                        </center>
+                                                      </div>
+                                                    </v:roundrect>
+                                                    <![endif]--> <!--[if !mso]><!-- --> 
+                                                    <a href="{{invitation_url}}" class="r16-r default-button" target="_blank" rel="noopener noreferrer" data-btn="1" style=" font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #3f76ff; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial, helvetica, sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 20px; padding-right: 20px; padding-top: 7px; width: 258px; " >
+                                                      <p style="margin: 0"> <span style="color: #3f76ff" >Accept the invite</span > </p>
                                                     </a>
-                                                    <!--<![endif]-->
+                                                    <!--<![endif]--> 
                                                   </td>
                                                 </tr>
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="20"
-                                                    style="
-                                                      font-size: 20px;
-                                                      line-height: 20px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="20" style=" font-size: 20px; line-height: 20px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
                                           </tr>
                                           <tr>
                                             <td class="r11-c" align="left">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="100%"
-                                                class="r12-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 100%;
-                                                "
-                                              >
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    height="15"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r12-o" style=" table-layout: fixed; width: 100%; " >
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" width="20" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                  <td height="15" width="20" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                                 <tr>
-                                                  <td
-                                                    class="nl2go-responsive-hide"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 1px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    align="left"
-                                                    valign="top"
-                                                    class="r17-i nl2go-default-textstyle"
-                                                    style="
-                                                      color: #3b3f44;
-                                                      font-family: arial,
-                                                        helvetica, sans-serif;
-                                                      font-size: 16px;
-                                                      line-height: 1.5;
-                                                      text-align: left;
-                                                    "
-                                                  >
+                                                  <td class="nl2go-responsive-hide" width="20" style=" font-size: 0px; line-height: 1px; " > ­ </td>
+                                                  <td align="left" valign="top" class="r17-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: arial, helvetica, sans-serif; font-size: 16px; line-height: 1.5; text-align: left; " >
                                                     <div>
-                                                      <p style="margin: 0">
-                                                        <span
-                                                          style="
-                                                            font-size: 12px;
-                                                          "
-                                                          >Note: Plane is still
-                                                          in its early days, not
-                                                          everything will be
-                                                          perfect yet, and
-                                                          hiccups may happen.
-                                                          Please let us know of
-                                                          any suggestions,
-                                                          ideas, or bugs that
-                                                          you encounter on our </span
-                                                        ><a
-                                                          href="https://discord.gg/A92xrEGCge"
-                                                          target="_blank"
-                                                          style="
-                                                            color: #0092ff;
-                                                            text-decoration: underline;
-                                                          "
-                                                          ><span
-                                                            style="
-                                                              font-size: 12px;
-                                                            "
-                                                            >Discord</span
-                                                          ></a
-                                                        ><span
-                                                          style="
-                                                            font-size: 12px;
-                                                          "
-                                                        >
-                                                          or </span
-                                                        ><a
-                                                          href="https://github.com/makeplane/plane"
-                                                          target="_blank"
-                                                          style="
-                                                            color: #0092ff;
-                                                            text-decoration: underline;
-                                                          "
-                                                          ><span
-                                                            style="
-                                                              font-size: 12px;
-                                                            "
-                                                            >GitHub</span
-                                                          ></a
-                                                        ><span
-                                                          style="
-                                                            font-size: 12px;
-                                                          "
-                                                          >, and we will use
-                                                          your feedback to
-                                                          improve on our
-                                                          upcoming
-                                                          releases.</span
-                                                        >
-                                                      </p>
+                                                      <p style="margin: 0"> <span style=" font-size: 12px; " >Note: Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our </span ><a href="https://discord.gg/A92xrEGCge" target="_blank" style=" color: #0092ff; text-decoration: underline; " ><span style=" font-size: 12px; " >Discord</span ></a ><span style=" font-size: 12px; " > or </span ><a href="https://github.com/makeplane/plane" target="_blank" style=" color: #0092ff; text-decoration: underline; " ><span style=" font-size: 12px; " >GitHub</span ></a ><span style=" font-size: 12px; " >, and we will use your feedback to improve on our upcoming releases.</span > </p>
                                                     </div>
                                                   </td>
-                                                  <td
-                                                    class="nl2go-responsive-hide"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 1px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                  <td class="nl2go-responsive-hide" width="20" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                 </tr>
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
-                                                  <td
-                                                    height="15"
-                                                    width="20"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" width="20" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                  <td height="15" width="20" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
@@ -949,190 +147,51 @@
                           </td>
                         </tr>
                         <tr class="nl2go-responsive-hide">
-                          <td
-                            height="20"
-                            style="
-                              font-size: 20px;
-                              line-height: 20px;
-                              background-color: #f8f9fa;
-                            "
-                          >
-                            ­
-                          </td>
+                          <td height="20" style=" font-size: 20px; line-height: 20px; background-color: #f8f9fa; " > ­ </td>
                         </tr>
                       </table>
                     </td>
                   </tr>
                   <tr>
                     <td class="r3-c" align="center">
-                      <table
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                        width="100%"
-                        class="r9-o"
-                        style="table-layout: fixed; width: 100%"
-                      >
-                        <!-- -->
+                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style="table-layout: fixed; width: 100%" >
+                        <!-- --> 
                         <tr class="nl2go-responsive-hide">
-                          <td
-                            height="20"
-                            style="
-                              font-size: 20px;
-                              line-height: 20px;
-                              background-color: #eff2f7;
-                            "
-                          >
-                            ­
-                          </td>
+                          <td height="20" style=" font-size: 20px; line-height: 20px; background-color: #eff2f7; " > ­ </td>
                         </tr>
                         <tr>
                           <td class="r18-i" style="background-color: #eff2f7">
-                            <table
-                              width="100%"
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                            >
+                            <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                               <tr>
-                                <th
-                                  width="100%"
-                                  valign="top"
-                                  class="r6-c"
-                                  style="font-weight: normal"
-                                >
-                                  <table
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                    width="100%"
-                                    class="r7-o"
-                                    style="table-layout: fixed; width: 100%"
-                                  >
-                                    <!-- -->
+                                <th width="100%" valign="top" class="r6-c" style="font-weight: normal" >
+                                  <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r7-o" style="table-layout: fixed; width: 100%" >
+                                    <!-- --> 
                                     <tr>
-                                      <td
-                                        class="nl2go-responsive-hide"
-                                        width="15"
-                                        style="font-size: 0px; line-height: 1px"
-                                      >
-                                        ­
-                                      </td>
+                                      <td class="nl2go-responsive-hide" width="15" style="font-size: 0px; line-height: 1px" > ­ </td>
                                       <td valign="top" class="r8-i">
-                                        <table
-                                          width="100%"
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                        >
+                                        <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                           <tr>
                                             <td class="r3-c" align="center">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="57"
-                                                class="r9-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 57px;
-                                                "
-                                              >
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="57" class="r9-o" style=" table-layout: fixed; width: 57px; " >
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                                 <tr>
-                                                  <td
-                                                    class="r19-i"
-                                                    style="
-                                                      font-size: 0px;
-                                                      line-height: 0px;
-                                                    "
-                                                  >
-                                                    <img
-                                                      src="https://ik.imagekit.io/w2okwbtu2/115727700_n9t8rrnwT.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670872429989"
-                                                      width="57"
-                                                      border="0"
-                                                      class=""
-                                                      style="
-                                                        display: block;
-                                                        width: 100%;
-                                                      "
-                                                    />
-                                                  </td>
+                                                  <td class="r19-i" style=" font-size: 0px; line-height: 0px; " > <img src="https://ik.imagekit.io/w2okwbtu2/115727700_n9t8rrnwT.png?ik-sdk-version=javascript-1.4.3&updatedAt=1670872429989" width="57" border="0" class="" style=" display: block; width: 100%; " /> </td>
                                                 </tr>
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
                                           </tr>
                                           <tr>
                                             <td class="r11-c" align="left">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="100%"
-                                                class="r12-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 100%;
-                                                "
-                                              >
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r12-o" style=" table-layout: fixed; width: 100%; " >
                                                 <tr>
-                                                  <td
-                                                    align="center"
-                                                    valign="top"
-                                                    class="r20-i nl2go-default-textstyle"
-                                                    style="
-                                                      font-family: arial,
-                                                        helvetica, sans-serif;
-                                                      color: #3b3f44;
-                                                      font-size: 18px;
-                                                      line-height: 1.5;
-                                                      text-align: center;
-                                                    "
-                                                  >
+                                                  <td align="center" valign="top" class="r20-i nl2go-default-textstyle" style=" font-family: arial, helvetica, sans-serif; color: #3b3f44; font-size: 18px; line-height: 1.5; text-align: center; " >
                                                     <div>
-                                                      <p
-                                                        style="
-                                                          margin: 0;
-                                                          font-size: 14px;
-                                                        "
-                                                      >
-                                                        Proudly made on
-                                                        <strong
-                                                          >Planet Earth
-                                                          🌍</strong
-                                                        >.
-                                                      </p>
+                                                      <p style=" margin: 0; font-size: 14px; " > Proudly made on <strong >Planet Earth 🌍</strong >. </p>
                                                     </div>
                                                   </td>
                                                 </tr>
@@ -1141,545 +200,99 @@
                                           </tr>
                                           <tr>
                                             <td class="r21-c" align="center">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="570"
-                                                class="r9-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 570px;
-                                                "
-                                              >
-                                                <!-- -->
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r9-o" style=" table-layout: fixed; width: 570px; " >
+                                                <!-- --> 
                                                 <tr>
                                                   <td valign="top" class="">
-                                                    <table
-                                                      width="100%"
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                    >
+                                                    <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                       <tr>
-                                                        <td
-                                                          class="r22-c"
-                                                          style="
-                                                            display: inline-block;
-                                                          "
-                                                        >
-                                                          <table
-                                                            cellspacing="0"
-                                                            cellpadding="0"
-                                                            border="0"
-                                                            role="presentation"
-                                                            width="570"
-                                                            class="r7-o"
-                                                            style="
-                                                              table-layout: fixed;
-                                                              width: 570px;
-                                                            "
-                                                          >
-                                                            <!-- -->
-                                                            <tr
-                                                              class="nl2go-responsive-hide"
-                                                            >
-                                                              <td
-                                                                height="15"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
-                                                              <td
-                                                                height="15"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
-                                                              <td
-                                                                height="15"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
+                                                        <td class="r22-c" style=" display: inline-block; " >
+                                                          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r7-o" style=" table-layout: fixed; width: 570px; " >
+                                                            <!-- --> 
+                                                            <tr class="nl2go-responsive-hide" >
+                                                              <td height="15" width="209" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                              <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                              <td height="15" width="209" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                             </tr>
                                                             <tr>
-                                                              <td
-                                                                class="nl2go-responsive-hide"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 0px;
-                                                                  line-height: 1px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
+                                                              <td class="nl2go-responsive-hide" width="209" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                               <td class="r23-i">
-                                                                <table
-                                                                  width="100%"
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                >
+                                                                <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                                   <tr>
-                                                                    <th
-                                                                      width="40"
-                                                                      valign=""
-                                                                      class="r24-c mobshow resp-table"
-                                                                      style="
-                                                                        font-weight: normal;
-                                                                      "
-                                                                    >
-                                                                      <table
-                                                                        cellspacing="0"
-                                                                        cellpadding="0"
-                                                                        border="0"
-                                                                        role="presentation"
-                                                                        width="100%"
-                                                                        class="r25-o"
-                                                                        style="
-                                                                          table-layout: fixed;
-                                                                          width: 100%;
-                                                                        "
-                                                                      >
-                                                                        <!-- -->
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                    <th width="40" valign="" class="r24-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r25-o" style=" table-layout: fixed; width: 100%; " >
+                                                                        <!-- --> 
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                         <tr>
-                                                                          <td
-                                                                            class="r26-i"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 0px;
-                                                                            "
-                                                                          >
-                                                                            <a
-                                                                              href="https://github.com/makeplane/plane"
-                                                                              target="_blank"
-                                                                              style="
-                                                                                color: #0092ff;
-                                                                                text-decoration: underline;
-                                                                              "
-                                                                            >
-                                                                              <img
-                                                                                src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/github_32px.png"
-                                                                                width="32"
-                                                                                border="0"
-                                                                                class=""
-                                                                                style="
-                                                                                  display: block;
-                                                                                  width: 100%;
-                                                                                "
-                                                                            /></a>
-                                                                          </td>
-                                                                          <td
-                                                                            class="nl2go-responsive-hide"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 1px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                          <td class="r26-i" style=" font-size: 0px; line-height: 0px; " > <a href="https://github.com/makeplane/plane" target="_blank" style=" color: #0092ff; text-decoration: underline; " > <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/github_32px.png" width="32" border="0" class="" style=" display: block; width: 100%; " /></a> </td>
+                                                                          <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                         </tr>
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                       </table>
                                                                     </th>
-                                                                    <th
-                                                                      width="40"
-                                                                      valign=""
-                                                                      class="r24-c mobshow resp-table"
-                                                                      style="
-                                                                        font-weight: normal;
-                                                                      "
-                                                                    >
-                                                                      <table
-                                                                        cellspacing="0"
-                                                                        cellpadding="0"
-                                                                        border="0"
-                                                                        role="presentation"
-                                                                        width="100%"
-                                                                        class="r25-o"
-                                                                        style="
-                                                                          table-layout: fixed;
-                                                                          width: 100%;
-                                                                        "
-                                                                      >
-                                                                        <!-- -->
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                    <th width="40" valign="" class="r24-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r25-o" style=" table-layout: fixed; width: 100%; " >
+                                                                        <!-- --> 
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                         <tr>
-                                                                          <td
-                                                                            class="r26-i"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 0px;
-                                                                            "
-                                                                          >
-                                                                            <a
-                                                                              href="https://discord.gg/A92xrEGCge"
-                                                                              target="_blank"
-                                                                              style="
-                                                                                color: #0092ff;
-                                                                                text-decoration: underline;
-                                                                              "
-                                                                            >
-                                                                              <img
-                                                                                src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/discord_32px.png"
-                                                                                width="32"
-                                                                                border="0"
-                                                                                class=""
-                                                                                style="
-                                                                                  display: block;
-                                                                                  width: 100%;
-                                                                                "
-                                                                            /></a>
-                                                                          </td>
-                                                                          <td
-                                                                            class="nl2go-responsive-hide"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 1px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                          <td class="r26-i" style=" font-size: 0px; line-height: 0px; " > <a href="https://discord.gg/A92xrEGCge" target="_blank" style=" color: #0092ff; text-decoration: underline; " > <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/discord_32px.png" width="32" border="0" class="" style=" display: block; width: 100%; " /></a> </td>
+                                                                          <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                         </tr>
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                       </table>
                                                                     </th>
-                                                                    <th
-                                                                      width="40"
-                                                                      valign=""
-                                                                      class="r24-c mobshow resp-table"
-                                                                      style="
-                                                                        font-weight: normal;
-                                                                      "
-                                                                    >
-                                                                      <table
-                                                                        cellspacing="0"
-                                                                        cellpadding="0"
-                                                                        border="0"
-                                                                        role="presentation"
-                                                                        width="100%"
-                                                                        class="r25-o"
-                                                                        style="
-                                                                          table-layout: fixed;
-                                                                          width: 100%;
-                                                                        "
-                                                                      >
-                                                                        <!-- -->
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                    <th width="40" valign="" class="r24-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r25-o" style=" table-layout: fixed; width: 100%; " >
+                                                                        <!-- --> 
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                         <tr>
-                                                                          <td
-                                                                            class="r26-i"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 0px;
-                                                                            "
-                                                                          >
-                                                                            <a
-                                                                              href="https://twitter.com/planepowers"
-                                                                              target="_blank"
-                                                                              style="
-                                                                                color: #0092ff;
-                                                                                text-decoration: underline;
-                                                                              "
-                                                                            >
-                                                                              <img
-                                                                                src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/twitter_32px.png"
-                                                                                width="32"
-                                                                                border="0"
-                                                                                class=""
-                                                                                style="
-                                                                                  display: block;
-                                                                                  width: 100%;
-                                                                                "
-                                                                            /></a>
-                                                                          </td>
-                                                                          <td
-                                                                            class="nl2go-responsive-hide"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 1px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                          <td class="r26-i" style=" font-size: 0px; line-height: 0px; " > <a href="https://twitter.com/planepowers" target="_blank" style=" color: #0092ff; text-decoration: underline; " > <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/twitter_32px.png" width="32" border="0" class="" style=" display: block; width: 100%; " /></a> </td>
+                                                                          <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                         </tr>
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
-                                                                          <td
-                                                                            height="5"
-                                                                            width="8"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
+                                                                          <td height="5" width="8" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                       </table>
                                                                     </th>
-                                                                    <th
-                                                                      width="32"
-                                                                      valign=""
-                                                                      class="r24-c mobshow resp-table"
-                                                                      style="
-                                                                        font-weight: normal;
-                                                                      "
-                                                                    >
-                                                                      <table
-                                                                        cellspacing="0"
-                                                                        cellpadding="0"
-                                                                        border="0"
-                                                                        role="presentation"
-                                                                        width="100%"
-                                                                        class="r27-o"
-                                                                        style="
-                                                                          table-layout: fixed;
-                                                                          width: 100%;
-                                                                        "
-                                                                      >
-                                                                        <!-- -->
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                    <th width="32" valign="" class="r24-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                      <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r27-o" style=" table-layout: fixed; width: 100%; " >
+                                                                        <!-- --> 
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                         <tr>
-                                                                          <td
-                                                                            class="r26-i"
-                                                                            style="
-                                                                              font-size: 0px;
-                                                                              line-height: 0px;
-                                                                            "
-                                                                          >
-                                                                            <a
-                                                                              href="https://www.linkedin.com/company/planepowers/"
-                                                                              target="_blank"
-                                                                              style="
-                                                                                color: #0092ff;
-                                                                                text-decoration: underline;
-                                                                              "
-                                                                            >
-                                                                              <img
-                                                                                src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/linkedin_32px.png"
-                                                                                width="32"
-                                                                                border="0"
-                                                                                class=""
-                                                                                style="
-                                                                                  display: block;
-                                                                                  width: 100%;
-                                                                                "
-                                                                            /></a>
-                                                                          </td>
+                                                                          <td class="r26-i" style=" font-size: 0px; line-height: 0px; " > <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style=" color: #0092ff; text-decoration: underline; " > <img src="https://sendinblue-templates.s3.eu-west-3.amazonaws.com/icons/rounded_colored/linkedin_32px.png" width="32" border="0" class="" style=" display: block; width: 100%; " /></a> </td>
                                                                         </tr>
-                                                                        <tr
-                                                                          class="nl2go-responsive-hide"
-                                                                        >
-                                                                          <td
-                                                                            height="5"
-                                                                            style="
-                                                                              font-size: 5px;
-                                                                              line-height: 5px;
-                                                                            "
-                                                                          >
-                                                                            ­
-                                                                          </td>
+                                                                        <tr class="nl2go-responsive-hide" >
+                                                                          <td height="5" style=" font-size: 5px; line-height: 5px; " > ­ </td>
                                                                         </tr>
                                                                       </table>
                                                                     </th>
                                                                   </tr>
                                                                 </table>
                                                               </td>
-                                                              <td
-                                                                class="nl2go-responsive-hide"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 0px;
-                                                                  line-height: 1px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
+                                                              <td class="nl2go-responsive-hide" width="209" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                             </tr>
-                                                            <tr
-                                                              class="nl2go-responsive-hide"
-                                                            >
-                                                              <td
-                                                                height="15"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
-                                                              <td
-                                                                height="15"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
-                                                              <td
-                                                                height="15"
-                                                                width="209"
-                                                                style="
-                                                                  font-size: 15px;
-                                                                  line-height: 15px;
-                                                                "
-                                                              >
-                                                                ­
-                                                              </td>
+                                                            <tr class="nl2go-responsive-hide" >
+                                                              <td height="15" width="209" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                              <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
+                                                              <td height="15" width="209" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                             </tr>
                                                           </table>
                                                         </td>
@@ -1692,98 +305,26 @@
                                           </tr>
                                           <tr>
                                             <td class="r11-c" align="left">
-                                              <table
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                                width="100%"
-                                                class="r12-o"
-                                                style="
-                                                  table-layout: fixed;
-                                                  width: 100%;
-                                                "
-                                              >
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                              <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r12-o" style=" table-layout: fixed; width: 100%; " >
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                                 <tr>
-                                                  <td
-                                                    align="center"
-                                                    valign="top"
-                                                    class="r28-i nl2go-default-textstyle"
-                                                    style="
-                                                      font-family: arial,
-                                                        helvetica, sans-serif;
-                                                      color: #3b3f44;
-                                                      font-size: 18px;
-                                                      line-height: 1.5;
-                                                      text-align: center;
-                                                    "
-                                                  >
+                                                  <td align="center" valign="top" class="r28-i nl2go-default-textstyle" style=" font-family: arial, helvetica, sans-serif; color: #3b3f44; font-size: 18px; line-height: 1.5; text-align: center; " >
                                                     <div>
-                                                      <p
-                                                        style="
-                                                          margin: 0;
-                                                          font-size: 14px;
-                                                        "
-                                                      >
-                                                        <a
-                                                          href="{{ mirror }}"
-                                                          style="
-                                                            color: #0092ff;
-                                                            text-decoration: underline;
-                                                          "
-                                                          >View in browser</a
-                                                        >
-                                                        |
-                                                        <a
-                                                          href="{{ unsubscribe }}"
-                                                          style="
-                                                            color: #0092ff;
-                                                            text-decoration: underline;
-                                                          "
-                                                          >Unsubscribe</a
-                                                        >
-                                                      </p>
+                                                      <p style=" margin: 0; font-size: 14px; " > <a href="{{ mirror }}" style=" color: #0092ff; text-decoration: underline; " >View in browser</a > | <a href="{{ unsubscribe }}" style=" color: #0092ff; text-decoration: underline; " >Unsubscribe</a > </p>
                                                     </div>
                                                   </td>
                                                 </tr>
-                                                <tr
-                                                  class="nl2go-responsive-hide"
-                                                >
-                                                  <td
-                                                    height="15"
-                                                    style="
-                                                      font-size: 15px;
-                                                      line-height: 15px;
-                                                    "
-                                                  >
-                                                    ­
-                                                  </td>
+                                                <tr class="nl2go-responsive-hide" >
+                                                  <td height="15" style=" font-size: 15px; line-height: 15px; " > ­ </td>
                                                 </tr>
                                               </table>
                                             </td>
                                           </tr>
                                         </table>
                                       </td>
-                                      <td
-                                        class="nl2go-responsive-hide"
-                                        width="15"
-                                        style="font-size: 0px; line-height: 1px"
-                                      >
-                                        ­
-                                      </td>
+                                      <td class="nl2go-responsive-hide" width="15" style="font-size: 0px; line-height: 1px" > ­ </td>
                                     </tr>
                                   </table>
                                 </th>
@@ -1792,14 +333,7 @@
                           </td>
                         </tr>
                         <tr class="nl2go-responsive-hide">
-                          <td
-                            height="20"
-                            style="
-                              font-size: 20px;
-                              line-height: 20px;
-                              background-color: #eff2f7;
-                            "
-                          ></td>
+                          <td height="20" style=" font-size: 20px; line-height: 20px; background-color: #eff2f7; " ></td>
                         </tr>
                       </table>
                     </td>
@@ -1812,4 +346,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/invitations/workspace_invitation.html b/apiserver/templates/emails/invitations/workspace_invitation.html
index cdca6d62d5..a947453831 100644
--- a/apiserver/templates/emails/invitations/workspace_invitation.html
+++ b/apiserver/templates/emails/invitations/workspace_invitation.html
@@ -1,489 +1,47 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="format-detection" content="telephone=no" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>
-      {{first_name}} has invited you
-      to join them in {{workspace_name}} on Plane.
-    </title>
-    <style type="text/css" emogrify="no">
-      #outlook a {
-        padding: 0;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%;
-      }
-      table td {
-        border-collapse: collapse;
-        mso-line-height-rule: exactly;
-      }
-      .editable.image {
-        font-size: 0 !important;
-        line-height: 0 !important;
-      }
-      .nl2go_preheader {
-        display: none !important;
-        mso-hide: all !important;
-        mso-line-height-rule: exactly;
-        visibility: hidden !important;
-        line-height: 0px !important;
-        font-size: 0px !important;
-      }
-      body {
-        width: 100% !important;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      img {
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
-      }
-      a img {
-        border: none;
-      }
-      table {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-      }
-      th {
-        font-weight: normal;
-        text-align: left;
-      }
-      *[class="gmail-fix"] {
-        display: none !important;
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-        .r0-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 320px !important;
-        }
-        .r1-i {
-          background-color: #ffffff !important;
-        }
-        .r2-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r3-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 100% !important;
-        }
-        .r4-i {
-          padding-bottom: 20px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 20px !important;
-        }
-        .r5-c {
-          box-sizing: border-box !important;
-          display: block !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r6-o {
-          border-style: solid !important;
-          width: 100% !important;
-        }
-        .r7-i {
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-        }
-        .r8-c {
-          box-sizing: border-box !important;
-          text-align: left !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r9-o {
-          border-style: solid !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r10-i {
-          padding-bottom: 10px !important;
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-          padding-top: 10px !important;
-        }
-        .r11-i {
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-          text-align: left !important;
-        }
-        .r12-c {
-          box-sizing: border-box !important;
-          padding: 0 !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r13-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          margin-bottom: 15px !important;
-          margin-top: 15px !important;
-          width: 100% !important;
-        }
-        .r14-i {
-          padding: 0 !important;
-          text-align: center !important;
-        }
-        .r15-r {
-          background-color: #3f76ff !important;
-          border-radius: 4px !important;
-          border-width: 0px !important;
-          box-sizing: border-box;
-          height: initial !important;
-          padding: 0 !important;
-          padding-bottom: 12px !important;
-          padding-top: 12px !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r16-i {
-          padding-bottom: 0px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 0px !important;
-        }
-        .r17-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r18-i {
-          padding-bottom: 5px !important;
-          padding-top: 5px !important;
-        }
-        .r19-i {
-          padding-bottom: 15px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 15px !important;
-        }
-        .r20-o {
-          border-bottom-color: #efefef !important;
-          border-bottom-width: 2px !important;
-          border-left-color: #efefef !important;
-          border-left-width: 2px !important;
-          border-right-color: #efefef !important;
-          border-right-width: 2px !important;
-          border-style: solid !important;
-          border-top-color: #efefef !important;
-          border-top-width: 2px !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r21-i {
-          padding-bottom: 5px !important;
-          padding-left: 5px !important;
-          padding-right: 5px !important;
-          padding-top: 5px !important;
-          text-align: left !important;
-        }
-        .r22-i {
-          padding-bottom: 5px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 5px !important;
-        }
-        .r23-c {
-          box-sizing: border-box !important;
-          width: 100% !important;
-        }
-        .r24-i {
-          font-size: 0px !important;
-          padding-bottom: 10px !important;
-          padding-left: 65px !important;
-          padding-right: 65px !important;
-          padding-top: 10px !important;
-        }
-        .r25-c {
-          box-sizing: border-box !important;
-          width: 32px !important;
-        }
-        .r26-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r27-o {
-          border-style: solid !important;
-          margin-right: 0px !important;
-          width: 32px !important;
-        }
-        .r28-i {
-          padding-bottom: 0px !important;
-          padding-top: 5px !important;
-          text-align: center !important;
-        }
-        body {
-          -webkit-text-size-adjust: none;
-        }
-        .nl2go-responsive-hide {
-          display: none;
-        }
-        .nl2go-body-table {
-          min-width: unset !important;
-        }
-        .mobshow {
-          height: auto !important;
-          overflow: visible !important;
-          max-height: unset !important;
-          visibility: visible !important;
-          border: none !important;
-        }
-        .resp-table {
-          display: inline-table !important;
-        }
-        .magic-resp {
-          display: table-cell !important;
-        }
-      }
-    </style>
-    <style type="text/css">
-      p,
-      h1,
-      h2,
-      h3,
-      h4,
-      ol,
-      ul {
-        margin: 0;
-      }
-      a,
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-      .nl2go-default-textstyle {
-        color: #3b3f44;
-        font-family: georgia, serif;
-        font-size: 16px;
-        line-height: 1.5;
-        word-break: break-word;
-      }
-      .default-button {
-        color: #ffffff;
-        font-family: georgia, serif;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: normal;
-        line-height: 1.15;
-        text-decoration: none;
-        word-break: break-word;
-      }
-      .default-heading1 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 36px;
-        word-break: break-word;
-      }
-      .default-heading2 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 32px;
-        word-break: break-word;
-      }
-      .default-heading3 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 24px;
-        word-break: break-word;
-      }
-      .default-heading4 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 18px;
-        word-break: break-word;
-      }
-      a[x-apple-data-detectors] {
-        color: inherit !important;
-        text-decoration: inherit !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-      .no-show-for-you {
-        border: none;
-        display: none;
-        float: none;
-        font-size: 0;
-        height: 0;
-        line-height: 0;
-        max-height: 0;
-        mso-hide: all;
-        overflow: hidden;
-        table-layout: fixed;
-        visibility: hidden;
-        width: 0;
-      }
-    </style>
-    <!--[if mso
-      ]><xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG /> <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-      </xml><!
-    [endif]-->
-    <style type="text/css">
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-    </style>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{{first_name}} has invited you to join them in {{workspace_name}} on Plane.</title>
+    <style type="text/css" emogrify="no">#outlook a { padding:0; } .ExternalClass { width:100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide:all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0; } img { outline:none; text-decoration:none; -ms-interpolation-mode: bicubic; } a img { border:none; } table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: ' \03D1';} } </style>
+    <style type="text/css" emogrify="no">@media (max-width: 600px) { .gmx-killpill { content: ' \03D1';} .r0-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important } .r1-i { background-color: #ffffff !important } .r2-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important } .r3-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important } .r4-i { padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important } .r5-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important } .r6-o { border-style: solid !important; width: 100% !important } .r7-i { padding-left: 0px !important; padding-right: 0px !important } .r8-i { padding-bottom: 20px !important; padding-left: 10px !important; padding-right: 10px !important; padding-top: 20px !important } .r9-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important } .r10-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important } .r11-i { padding-top: 15px !important; text-align: center !important } .r12-c { box-sizing: border-box !important; padding-bottom: 15px !important; padding-top: 15px !important; text-align: left !important; valign: top !important; width: 100% !important } .r13-c { box-sizing: border-box !important; padding: 0 !important; text-align: center !important; valign: top !important; width: 100% !important } .r14-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-bottom: 15px !important; margin-top: 15px !important; width: 100% !important } .r15-i { padding: 0 !important; text-align: center !important } .r16-r { background-color: #3f76ff !important; border-radius: 4px !important; border-width: 0px !important; box-sizing: border-box; height: initial !important; padding: 0 !important; padding-bottom: 12px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 12px !important; text-align: center !important; width: 100% !important } .r17-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important } .r18-c { box-sizing: border-box !important; width: 100% !important } .r19-i { font-size: 0px !important; padding-bottom: 15px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 15px !important } .r20-c { box-sizing: border-box !important; width: 32px !important } .r21-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important } .r22-i { padding-bottom: 5px !important; padding-top: 5px !important } .r23-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important } body { -webkit-text-size-adjust: none } .nl2go-responsive-hide { display: none } .nl2go-body-table { min-width: unset !important } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important } .resp-table { display: inline-table !important } .magic-resp { display: table-cell !important } } </style>
+    <style type="text/css">p, h1, h2, h3, h4, ol, ul, li { margin: 0; } a, a:link { color: #3f76ff; text-decoration: underline } .nl2go-default-textstyle { color: #3b3f44; font-family: georgia, serif; font-size: 18px; line-height: 1.5; word-break: break-word } .default-button { color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; word-break: break-word } .default-heading1 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 36px; word-break: break-word } .default-heading2 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 32px; word-break: break-word } .default-heading3 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 24px; word-break: break-word } .default-heading4 { color: #1F2D3D; font-family: arial,helvetica,sans-serif; font-size: 18px; word-break: break-word } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+    <!--[if mso]>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG/>
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+    <![endif]-->
+    <style type="text/css">a:link{color: #3f76ff; text-decoration: underline;}</style>
   </head>
-  <body
-    bgcolor="#ffffff"
-    text="#3b3f44"
-    link="#3f76ff"
-    yahoo="fix"
-    style="background-color: #ffffff"
-  >
-    <table
-      cellspacing="0"
-      cellpadding="0"
-      border="0"
-      role="presentation"
-      class="nl2go-body-table"
-      width="100%"
-      style="background-color: #ffffff; width: 100%"
-    >
+  <body bgcolor="#ffffff" text="#3b3f44" link="#3f76ff" yahoo="fix" style="background-color: #ffffff;">
+    <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%;">
       <tr>
         <td>
-          <table
-            cellspacing="0"
-            cellpadding="0"
-            border="0"
-            role="presentation"
-            width="600"
-            align="center"
-            class="r0-o"
-            style="table-layout: fixed; width: 600px"
-          >
+          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" align="center" class="r0-o" style="table-layout: fixed; width: 600px;">
             <tr>
-              <td valign="top" class="r1-i" style="background-color: #ffffff">
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+              <td valign="top" class="r1-i" style="background-color: #ffffff;">
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%;">
                   <tr>
-                    <td
-                      class="r4-i"
-                      style="padding-bottom: 20px; padding-top: 20px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px;">
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal;">
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%;">
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 10px;
-                                    padding-right: 10px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style="padding-left: 10px; padding-right: 10px;">
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                     <tr>
-                                      <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="150"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 150px;
-                                          "
-                                        >
+                                      <td class="r2-c" align="center">
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="200" class="r3-o" style="table-layout: fixed; width: 200px;">
                                           <tr>
-                                            <td
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 0px;
-                                              "
-                                            >
-                                              <img
-                                                src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png"
-                                                width="150"
-                                                border="0"
-                                                style="
-                                                  display: block;
-                                                  width: 100%;
-                                                "
-                                              />
-                                            </td>
+                                            <td style="font-size: 0px; line-height: 0px;"> <img src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png" width="200" border="0" style="display: block; width: 100%;"></td>
                                           </tr>
                                         </table>
                                       </td>
@@ -498,116 +56,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%;">
                   <tr>
-                    <td
-                      class="r10-i"
-                      style="padding-bottom: 10px; padding-top: 10px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r8-i" style="padding-bottom: 20px; padding-top: 20px;">
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal;">
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%;">
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i">
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                     <tr>
-                                      <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                      <td class="r9-c" align="left">
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r10-o" style="table-layout: fixed; width: 100%;">
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="center" valign="top" class="r11-i nl2go-default-textstyle" style="color: #3b3f44; font-family: georgia,serif; font-size: 18px; word-break: break-word; line-height: 1.5; padding-top: 15px; text-align: center;">
                                               <div>
-                                                <h2
-                                                  class="default-heading2"
-                                                  style="
-                                                    color: #1f2d3d;
-                                                    font-family: arial,
-                                                      helvetica, sans-serif;
-                                                    font-size: 32px;
-                                                    -webkit-text-stroke-width: 0px;
-                                                    font-style: normal;
-                                                    letter-spacing: normal;
-                                                    margin: 0px;
-                                                    orphans: 2;
-                                                    text-decoration-style: initial;
-                                                    text-decoration-thickness: initial;
-                                                    text-indent: 0px;
-                                                    text-transform: none;
-                                                    white-space: normal;
-                                                    widows: 2;
-                                                    word-break: break-word;
-                                                    word-spacing: 0px;
-                                                  "
-                                                >
-                                                  You are a celebrated
-                                                  colleague!
-                                                </h2>
+                                                <h1 class="default-heading1" style="margin: 0; color: #1f2d3d; font-family: arial,helvetica,sans-serif; font-size: 36px; word-break: break-word;">You are a celebrated colleague!</h1>
                                               </div>
                                             </td>
                                           </tr>
@@ -615,150 +80,17 @@
                                       </td>
                                     </tr>
                                     <tr>
-                                      <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
-                                          <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                line-height: 1.5;
-                                                word-break: break-word;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
-                                              <div>
-                                                <p
-                                                  style="
-                                                    -webkit-text-stroke-width: 0px;
-                                                    font-style: normal;
-                                                    letter-spacing: normal;
-                                                    margin: 0px;
-                                                    orphans: 2;
-                                                    text-decoration-style: initial;
-                                                    text-decoration-thickness: initial;
-                                                    text-indent: 0px;
-                                                    text-transform: none;
-                                                    white-space: normal;
-                                                    widows: 2;
-                                                    word-break: break-word;
-                                                    word-spacing: 0px;
-                                                  "
-                                                >
-                                                  <span
-                                                    style="
-                                                      font-family: arial,
-                                                      helvetica, sans-serif;
-                                                      font-size: 17px;
-                                                    "
-                                                    ><b>{{first_name}}</b> has invited you
-                                                    to join them in
-                                                    <b>{{workspace_name}}</b>, a workspace for projects and progress, on Plane.
-                                                    Some of our users have told
-                                                    us it's a privilege, but we
-                                                    will let you be the judge of
-                                                    that.</span
-                                                  >
-                                                </p>
-                                              </div>
-                                            </td>
-                                          </tr>
-                                        </table>
+                                      <td class="r12-c nl2go-default-textstyle" align="left" style="color: #3b3f44; font-family: georgia,serif; font-size: 18px; line-height: 1.5; word-break: break-word; padding-bottom: 15px; padding-top: 15px; text-align: left; valign: top;">
+                                        <div>
+                                          <p style="margin: 0;">{{first_name}} has invited you to join them in {{workspace_name}}, a workspace for projects and progress, on Plane. Some of our users have told us it's a privilege, but we will let you be the judge of that.</p>
+                                        </div>
                                       </td>
                                     </tr>
                                     <tr>
-                                      <td
-                                        class="r12-c"
-                                        align="center"
-                                        style="
-                                          align: center;
-                                          padding-bottom: 15px;
-                                          padding-top: 15px;
-                                          valign: top;
-                                        "
-                                      >
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="285"
-                                          class="r13-o"
-                                          style="
-                                            background-color: #3f76ff;
-                                            border-collapse: separate;
-                                            border-color: #3f76ff;
-                                            border-radius: 4px;
-                                            border-style: solid;
-                                            border-width: 0px;
-                                            table-layout: fixed;
-                                            width: 285px;
-                                          "
-                                        >
+                                      <td class="r13-c" align="center" style="align: center; padding-bottom: 15px; padding-top: 15px; valign: top;">
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="300" class="r14-o" style="background-color: #3f76ff; border-collapse: separate; border-color: #3f76ff; border-radius: 4px; border-style: solid; border-width: 0px; table-layout: fixed; width: 300px;">
                                           <tr>
-                                            <td
-                                              height="20"
-                                              align="center"
-                                              valign="top"
-                                              class="r14-i nl2go-default-textstyle"
-                                              style="
-                                                word-break: break-word;
-                                                background-color: #3f76ff;
-                                                border-radius: 4px;
-                                                color: #ffffff;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                font-style: normal;
-                                                line-height: 1.15;
-                                                padding-bottom: 12px;
-                                                padding-top: 12px;
-                                                text-align: center;
-                                              "
-                                            >
-                                              <a
-                                                href="{{abs_url}}"
-                                                class="r15-r default-button"
-                                                target="_blank"
-                                                data-btn="1"
-                                                style="
-                                                  font-style: normal;
-                                                  font-weight: normal;
-                                                  line-height: 1.15;
-                                                  text-decoration: none;
-                                                  word-break: break-word;
-                                                  word-wrap: break-word;
-                                                  display: block;
-                                                  -webkit-text-size-adjust: none;
-                                                  color: #ffffff;
-                                                  font-family: arial,
-                                                      helvetica, sans-serif;
-                                                  font-size: 16px;
-                                                "
-                                              >
-                                                <span
-                                                  ><span style="font-size: 18px"
-                                                    >Join them on Plane</span
-                                                  ></span
-                                                ></a
-                                              >
-                                            </td>
+                                            <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="word-break: break-word; background-color: #3f76ff; border-radius: 4px; color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; line-height: 1.15; padding-bottom: 12px; padding-left: 5px; padding-right: 5px; padding-top: 12px; text-align: center;"> <a href="{{abs_url}}" class="r16-r default-button" target="_blank" data-btn="1" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; word-break: break-word; word-wrap: break-word; display: block; -webkit-text-size-adjust: none; color: #ffffff; font-family: georgia, serif; font-size: 16px;"> <span><span style="font-family: Arial, helvetica, sans-serif;">Join them on Plane</span></span></a> </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -773,738 +105,57 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%;">
                   <tr>
-                    <td class="r16-i">
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px;">
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal;">
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%;">
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style="padding-left: 15px; padding-right: 15px;">
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                     <tr>
                                       <td class="r17-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          class="r3-o"
-                                          style="table-layout: fixed"
-                                        >
-                                          <tr>
-                                            <td
-                                              class="r18-i"
-                                              style="
-                                                padding-bottom: 5px;
-                                                padding-top: 5px;
-                                                height: 1px;
-                                              "
-                                            >
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
-                                                <tr>
-                                                  <td>
-                                                    <table
-                                                      width="100%"
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      valign=""
-                                                      class="r18-i"
-                                                      height="1"
-                                                      style="
-                                                        border-top-style: solid;
-                                                        background-clip: border-box;
-                                                        border-top-color: #efefef;
-                                                        border-top-width: 1px;
-                                                        font-size: 1px;
-                                                        line-height: 1px;
-                                                      "
-                                                    >
-                                                      <tr>
-                                                        <td
-                                                          height="0"
-                                                          style="
-                                                            font-size: 0px;
-                                                            line-height: 0px;
-                                                          "
-                                                        >
-                                                          ­
-                                                        </td>
-                                                      </tr>
-                                                    </table>
-                                                  </td>
-                                                </tr>
-                                              </table>
-                                            </td>
-                                          </tr>
-                                        </table>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </td>
-                              </tr>
-                            </table>
-                          </th>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
-                  <tr>
-                    <td
-                      class="r19-i"
-                      style="padding-bottom: 15px; padding-top: 15px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
-                        <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
-                              <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
-                                    <tr>
-                                      <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r20-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
-                                          <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r21-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 5px;
-                                                padding-left: 5px;
-                                                padding-right: 5px;
-                                                padding-top: 5px;
-                                                text-align: left;
-                                              "
-                                            >
-                                              <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 13px"
-                                                    >Despite our popularity, we
-                                                    are humbly early-stage. We
-                                                    are shipping fast, so please
-                                                    reach out to us with feature
-                                                    requests, major and minor
-                                                    nits, and anything else you
-                                                    find missing. We read every </span
-                                                  ><a
-                                                    href="https://discord.com/channels/1031547764020084846/1094927053867995176"
-                                                    title="Plane Support on Discod"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >message</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, </span
-                                                  ><a
-                                                    href="http://twitter.com/planepowers"
-                                                    title="@planepowers"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >tweet</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, and </span
-                                                  ><a
-                                                    href="https://github.com/makeplane/plane/issues"
-                                                    title="Plane's GitHub conversations"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >conversation</span
-                                                    ></a
-                                                  ><span
-                                                    style="font-size: 13px"
-                                                  >
-                                                    and update </span
-                                                  ><a
-                                                    href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban"
-                                                    title="Plane's roadmap"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >our public roadmap</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >.</span
-                                                  >
-                                                </p>
-                                              </div>
-                                            </td>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                          </tr>
-                                          <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                          </tr>
-                                        </table>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </td>
-                              </tr>
-                            </table>
-                          </th>
-                        </tr>
-                      </table>
-                    </td>
-                  </tr>
-                </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
-                  <tr>
-                    <td
-                      class="r22-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
-                        <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
-                              <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
-                                    <tr>
-                                      <td class="r17-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          align="center"
-                                          class="r3-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 570px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" align="center" class="r3-o" style="table-layout: fixed; width: 570px;">
                                           <tr>
                                             <td valign="top">
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                                 <tr>
-                                                  <td
-                                                    class="r23-c"
-                                                    style="
-                                                      display: inline-block;
-                                                    "
-                                                  >
-                                                    <table
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      width="570"
-                                                      class="r6-o"
-                                                      style="
-                                                        table-layout: fixed;
-                                                        width: 570px;
-                                                      "
-                                                    >
+                                                  <td class="r18-c" style="display: inline-block;">
+                                                    <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r6-o" style="table-layout: fixed; width: 570px;">
                                                       <tr>
-                                                        <td
-                                                          class="r24-i"
-                                                          style="
-                                                            padding-bottom: 10px;
-                                                            padding-left: 209px;
-                                                            padding-right: 209px;
-                                                            padding-top: 10px;
-                                                          "
-                                                        >
-                                                          <table
-                                                            width="100%"
-                                                            cellspacing="0"
-                                                            cellpadding="0"
-                                                            border="0"
-                                                            role="presentation"
-                                                          >
+                                                        <td class="r19-i" style="padding-bottom: 15px; padding-left: 209px; padding-right: 209px; padding-top: 15px;">
+                                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                                             <tr>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r20-c mobshow resp-table" style="font-weight: normal;">
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r21-o" style="table-layout: fixed; width: 100%;">
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://github.com/makeplane"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r22-i" style="font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px;"> <a href="https://github.com/makeplane" target="_blank" style="color: #3f76ff; text-decoration: underline;"> <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="32" border="0" style="display: block; width: 100%;"></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r20-c mobshow resp-table" style="font-weight: normal;">
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r21-o" style="table-layout: fixed; width: 100%;">
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://www.linkedin.com/company/planepowers/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r22-i" style="font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px;"> <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style="color: #3f76ff; text-decoration: underline;"> <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="32" border="0" style="display: block; width: 100%;"></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r20-c mobshow resp-table" style="font-weight: normal;">
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r21-o" style="table-layout: fixed; width: 100%;">
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://twitter.com/planepowers"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r22-i" style="font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px;"> <a href="https://twitter.com/planepowers" target="_blank" style="color: #3f76ff; text-decoration: underline;"> <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="32" border="0" style="display: block; width: 100%;"></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style="font-size: 0px; line-height: 1px;">­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="32"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r27-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="32" class="r20-c mobshow resp-table" style="font-weight: normal;">
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r23-o" style="table-layout: fixed; width: 100%;">
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://plane.so/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
+                                                                    <td class="r22-i" style="font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px;"> <a href="https://plane.so/" target="_blank" style="color: #3f76ff; text-decoration: underline;"> <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png" width="32" border="0" style="display: block; width: 100%;"></a> </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
@@ -1531,107 +182,21 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%;">
                   <tr>
-                    <td
-                      class="r22-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px;">
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal;">
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%;">
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style="padding-left: 15px; padding-right: 15px;">
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation">
                                     <tr>
-                                      <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
-                                          <tr>
-                                            <td
-                                              align="center"
-                                              valign="top"
-                                              class="r28-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                word-break: break-word;
-                                                font-size: 18px;
-                                                line-height: 1.5;
-                                                padding-top: 5px;
-                                                text-align: center;
-                                              "
-                                            >
-                                              <div>
-                                                <p
-                                                  style="
-                                                    margin: 0;
-                                                    font-size: 14px;
-                                                  "
-                                                >
-                                                  <span style="font-size: 12px"
-                                                    >This email was sent to
-                                                    {{email}}. Please delete
-                                                    if you aren't the intended
-                                                    recipient.</span
-                                                  >
-                                                </p>
-                                              </div>
-                                            </td>
-                                          </tr>
-                                        </table>
+                                      <td class="r12-c nl2go-default-textstyle" align="left" style="color: #3b3f44; font-family: georgia,serif; font-size: 18px; line-height: 1.5; word-break: break-word; padding-bottom: 15px; padding-top: 15px; text-align: left; valign: top;">
+                                        <div>
+                                          <p style="margin: 0; text-align: center;"><span style="font-family: Georgia, serif; font-size: 12px;">This email was sent to {{email}}. Please delete if you are not the intended recipient.</span></p>
+                                        </div>
                                       </td>
                                     </tr>
                                   </table>
@@ -1651,4 +216,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/notifications/issue-updates.html b/apiserver/templates/emails/notifications/issue-updates.html
index 3c561f37ac..c1a48752fd 100644
--- a/apiserver/templates/emails/notifications/issue-updates.html
+++ b/apiserver/templates/emails/notifications/issue-updates.html
@@ -1,1139 +1,243 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-   xmlns="http://www.w3.org/1999/xhtml"
-   xmlns:v="urn:schemas-microsoft-com:vml"
-   xmlns:o="urn:schemas-microsoft-com:office:office"
-   >
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <title>Updates on issue</title>
-      <style type="text/css" emogrify="no">
-         html {
-         font-family: system-ui;
-         }
-         p,
-         h1,
-         h2,
-         h3,
-         h4,
-         ol,
-         ul {
-         margin: 0;
-         }
-         h-full {
-         height: 100%;
-         }
-         a:hover {
-         color: #3358d4 !important;
-         }
-      </style>
-      <style>
-         *[class="gmail-fix"] {
-         display: none !important;
-         }
-      </style>
-      <style type="text/css" emogrify="no">
-         @media (max-width: 600px) {
-         .gmx-killpill {
-         content: " \03D1";
-         }
-         }
-      </style>
-   </head>
-   <body
-      bgcolor="#ffffff"
-      text="#3b3f44"
-      link="#3f76ff"
-      yahoo="fix"
-      style="background-color: #f7f9ff; margin: 20px"
-      >
-      <div
-         style="
-         width: 600px;
-         table-layout: fixed;
-         height: 100%;
-         margin-left: auto;
-         margin-right: auto;
-         "
-         >
-         <!-- Header -->
-         <div>
-            <table style="width: 600px" cellspacing="0">
-               <tr>
-                  <td>
-                     <div
-                        style="margin-left: 30px; margin-bottom: 20px; margin-top: 20px"
-                        >
-                        <img
-                           src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/plane-logo.png"
-                           width="130"
-                           height="40"
-                           border="0"
-                           />
-                     </div>
-                  </td>
-               </tr>
-            </table>
-         </div>
-         <!-- Body -->
-         <div
-            style="
-            color: #1f2d5c;
-            padding: 30px;
-            border-radius: 4px;
-            background-color: #fcfcfd;
-            max-width: 100%;
-            "
-            >
-            <div>
-               <table style="width: 100%">
-                  <tr>
-                     <td>
-                        <p style="font-size: 1rem; color: #1f2d5c; font-weight: 600">
-                           {{ issue.issue_identifier }} updates
-                        </p>
-                        <p style="font-size: 1rem; font-weight: 500; color: #1f2d5c; line-height: 28px">
-                           {{workspace}}/<a target="_blank" style="color: #1f2d5c; text-decoration: none;" href="{{project_url}}">{{project}}</a>/<a style="color: #1f2d5c; text-decoration: none;" target="_blank" href="{{issue_url}}">{{issue.issue_identifier}}</a>: {{ issue.name }}
-                        </p>
-                     </td>
-                  </tr>
-               </table>
-               <hr
-                  style="
-                  background-color: #f0f0f3;
-                  height: 1px;
-                  border: 0;
-                  margin-top: 15px;
-                  margin-bottom: 15px;
-                  "
-                  />
-                  {% if actors_involved == 1 %}
-                  <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                     {{summary}}
-                     <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                     {% if data|length > 0 %}
-                     {{ data.0.actor_detail.first_name}}
-                     {{data.0.actor_detail.last_name}}
-                     {% else %}
-                     {{ comments.0.actor_detail.first_name}}
-                     {{comments.0.actor_detail.last_name}}
-                     {% endif %}
-                     </span>.
-                  </p>
-                  {% else %}
-                  <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                     {{summary}}
-                     <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                     {% if data|length > 0 %}
-                     {{ data.0.actor_detail.first_name}}
-                     {{data.0.actor_detail.last_name}}
-                     {% else %}
-                     {{ comments.0.actor_detail.first_name}}
-                     {{comments.0.actor_detail.last_name}}
-                     {% endif %}
-                     </span>and others.
-                  </p>
-                  {% endif %}
-               <!-- {% if actors_involved == 1 %}
-               {% if data|length > 0 and comments|length == 0 %}
-               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                  <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                  {{ data.0.actor_detail.first_name}}
-                  {{data.0.actor_detail.last_name }}
-                  </span>
-                  made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} to the issue.
-               </p>
-               {% elif data|length == 0 and comments|length > 0 %}
-               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                  <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                  {{ comments.0.actor_detail.first_name}}
-                  {{comments.0.actor_detail.last_name }}
-                  </span>
-                  added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %}.
-               </p>
-               {% elif data|length > 0 and comments|length > 0 %}
-               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                  <span style="font-size: 1rem; font-weight: 700; line-height: 28px">
-                  {{ data.0.actor_detail.first_name}}
-                  {{data.0.actor_detail.last_name }}
-                  </span>
-                  made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} and added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %} on the issue.
-               </p>
-               {% endif %}
-               {% else %}
-               <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px">
-                  There are {{ total_updates }} new updates and {{total_comments}} new comments on the issue.
-               </p>
-               {% endif %} -->
-               {% for update in data %} {% if update.changes.name %}
-               <!-- Issue title updated -->
-               <p style="font-size: 1rem; line-height: 28px; color: #1f2d5c">
-                  The issue title has been updated to {{ issue.name}}
-               </p>
-               {% endif %}
-               <!-- Outer update Box start -->
-               {% if data %}
-               <div
-                  style="
-                  background-color: #f7f9ff;
-                  border-radius: 8px;
-                  border-style: solid;
-                  border-width: 1px;
-                  border-color: #c1d0ff;
-                  padding: 20px;
-                  margin-top: 15px;
-                  max-width: 100%;
-                  "
-                  >
-                  <!-- Block Heading -->
-                  <div style="padding-bottom: 20px">
-                     <p style="font-size: 0.8rem; font-weight: 600; color: #121a26">
-                        Updates
-                     </p>
-                  </div>
-                  <!-- Property Updates -->
-                  <div
-                     style="
-                     background-color: white;
-                     max-width: 100%;
-                     overflow: hidden;
-                     overflow-wrap: break-word;
-                     word-wrap: break-word;
-                     padding-left: 15px;
-                     padding-bottom: 15px;
-                     border-radius: 8px;
-                     "
-                     >
-                     <!-- action performer -->
-                     <table
-                        role="presentation"
-                        cellspacing="0"
-                        cellpadding="0"
-                        style="max-width: 100%"
-                        >
-                        <tr style="border-radius: 8px; margin-top: 20px">
-                           <td style="width: 30px">
-                              {% if update.actor_detail.avatar_url %}
-                              <img src="{{ update.actor_detail.avatar_url }}" width="25" height="25" border="0" />
-                              {% else %}
-                              <table cellspacing="0" cellpadding="0">
-                                 <tr>
-                                    <td
-                                       style="
-                                       width: 25px;
-                                       height: 25px;
-                                       background-color: #4f3422;
-                                       border-radius: 50%;
-                                       text-align: center;
-                                       "
-                                       >
-                                       <span
-                                          style="
-                                          color: white;
-                                          font-weight: 500;
-                                          font-size: 13px;
-                                          line-height: 25px;
-                                          display: inline-block;
-                                          "
-                                          >
-                                       {{ update.actor_detail.first_name.0 }}
-                                       </span>
-                                    </td>
-                                 </tr>
-                              </table>
-                              {% endif %}
-                           </td>
-                           <td style="padding-top: 20px; padding-bottom: 20px">
-                              <p
-                                 style="
-                                 font-weight: 500;
-                                 font-size: 0.8rem;
-                                 color: #1c2024;
-                                 width: fit-content;
-                                 margin-left: 5px;
-                                 "
-                                 >
-                                 {{ update.actor_detail.first_name }} {{ update.actor_detail.last_name }}
-                              </p>
-                           </td>
-                           <td>
-                              <p
-                                 style="
-                                 font-weight: 500;
-                                 font-size: 0.6rem;
-                                 color: #80838d;
-                                 margin-left: 10px;
-                                 "
-                                 >
-                                 {{ update.activity_time }}
-                              </p>
-                           </td>
-                        </tr>
-                     </table>
-                     {% if update.changes.target_date %}
-                     <!-- due date changed -->
-                     <table
-                        role="presentation"
-                        style="max-width: 100%; padding-bottom: 15px"
-                        >
-                        <tr>
-                           <td>
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/due-date.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block"
-                                 />
-                           </td>
-                           <td style="padding: 0px; text-align: center">
-                              <div>
-                                 <p
-                                    style="
-                                    padding: 0px;
-                                    margin: 0px;
-                                    font-size: 0.8rem;
-                                    font-weight: 500;
-                                    color: #525252;
-                                    "
-                                    >
-                                    Due Date:
-                                 </p>
-                              </div>
-                           </td>
-                           <td>
-                              {% if update.changes.target_date.new_value.0 %}
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #171717;
-                                 margin-left: 5px;
-                                 padding: 0px;
-                                 "
-                                 >
-                                 {{ update.changes.target_date.new_value.0 }}
-                              </p>
-                              {% else %}
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #171717;
-                                 margin-left: 5px;
-                                 padding: 0px;
-                                 text-decoration: line-through;
-                                 "
-                                 >
-                                 {{ update.changes.target_date.old_value.0 }}
-                              </p>
-                              {% endif %}
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %} {% if update.changes.duplicate %}
-                     <!-- duplicate changed -->
-                     <table
-                        role="presentation"
-                        style="max-width: 100%; padding-bottom: 15px"
-                        >
-                        <tr>
-                           <td>
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/duplicate.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: inline-block"
-                                 />
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 "
-                                 >
-                              Duplicate:
-                              </span>
-                           </td>
-                           {% if update.changes.duplicate.new_value.0 %}
-                           <td style="padding-left: 5px;overflow-wrap: break-word;">
-                              {% for duplicate in update.changes.duplicate.new_value|slice:":2" %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #3a5bc7;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              {{ duplicate }}
-                              </span>
-                              {% endfor %}
-                           </td>
-                           {% endif %}
-                           {% if update.changes.duplicate.new_value.2 %}
-                           <td>
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #3a5bc7;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              +{{ update.changes.duplicate.new_value|length|add:"-2" }}
-                              more
-                              </span>
-                           </td>
-                           {% endif %}
-                           {% if update.changes.duplicate.old_value.0 %}
-                           <td style="padding-left: 8px;">
-                              {% for duplicate in update.changes.duplicate.old_value|slice:":2" %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 text-decoration: line-through;
-                                 "
-                                 >
-                              {{ duplicate }}
-                              </span>
-                              {% endfor %}
-                           </td>
-                           {% endif %}
-                           {% if update.changes.duplicate.old_value.2 %}
-                           <td>
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              +{{ update.changes.duplicate.old_value|length|add:"-2" }}
-                              more
-                              </span>
-                           </td>
-                           {% endif %}
-                        </tr>
-                     </table>
-                     {% endif %}
-                     <!-- Assignee changed-->
-                     {% if update.changes.assignees %}
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%; padding-right: 10px;"
-                        >
-                        <tr>
-                           <td valign="top" style="white-space: nowrap; padding: 0px;">
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/assignee.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: inline-block"
-                                 />
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 padding-right: 5px;
-                                 "
-                                 >
-                              Assignee:
-                              </span>
-                           </td>
-                           <td style="overflow-wrap: anywhere;word-break: break-all; padding: 0px;">
-                              {% if update.changes.assignees.new_value.0 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 color: #0d74ce;
-                                 background-color: #e6f4fe;
-                                 margin-right: 5px;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 2px;
-                                 padding-top: 2px;
-                                 font-weight: 500;
-                                 border-radius: 2px;
-                                 max-lines: 1;
-                                 "
-                                 >
-                              {{update.changes.assignees.new_value.0}}
-                              </span>
-                              {% endif %}
-                              {% if update.changes.assignees.new_value.1 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #0d74ce;
-                                 margin-left: 2px;
-                                 margin-right: 5px;
-                                 white-space: nowrap;
-                                 padding: 0px;
-                                 "
-                                 >
-                              +{{ update.changes.assignees.new_value|length|add:"-1"}} more
-                              </span>
-                              {% endif %}
-                              {% if update.changes.assignees.old_value.0 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 2px;
-                                 padding-top: 2px;
-                                 font-weight: 500;
-                                 text-decoration: line-through;
-                                 color: #641723;
-                                 background-color: #feebec;
-                                 margin-right: 5px;
-                                 border-radius: 2px;
-                                 "
-                                 >
-                              {{update.changes.assignees.old_value.0}}
-                              </span>
-                              {% endif %}
-                              {% if update.changes.assignees.old_value.1 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-left: 2px;
-                                 white-space: nowrap;
-                                 "
-                                 >
-                              +{{ update.changes.assignees.old_value|length|add:"-1"}} more
-                              </span>
-                              {% endif %}
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %} {% if update.changes.labels %}
-                     <!-- Labels -->
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%; padding-right: 10px;"
-                        >
-                        <tr>
-                           <td valign="top" style="white-space: nowrap; padding: 0px;">
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/labels.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: inline-block;"
-                                 />
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 padding-right: 5px;
-                                 "
-                                 >
-                              Labels:
-                              </span>
-                           </td>
-                           <td style="overflow-wrap: anywhere;word-break: break-all; padding: 0px;">
-                              {% if update.changes.labels.new_value.0 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 line-height: 1px;
-                                 color: #0d74ce;
-                                 background-color: #e6f4fe;
-                                 margin-right: 5px;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 2px;
-                                 padding-top: 2px;
-                                 font-weight: 500;
-                                 border-radius: 2px;
-                                 max-lines: 1;
-                                 "
-                                 >
-                              {{update.changes.labels.new_value.0}}
-                              </span>
-                              {% endif %}
-                              {% if update.changes.labels.new_value.1 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #0d74ce;
-                                 margin-left: 2px;
-                                 margin-right: 5px;
-                                 white-space: nowrap;
-                                 "
-                                 >
-                              +{{ update.changes.labels.new_value|length|add:"-1"}} more
-                              </span>
-                              {% endif %}
-                              {% if update.changes.labels.old_value.0 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 2px;
-                                 padding-top: 2px;
-                                 font-weight: 500;
-                                 text-decoration: line-through;
-                                 color: #641723;
-                                 background-color: #feebec;
-                                 margin-right: 5px;
-                                 border-radius: 2px;
-                                 "
-                                 >
-                              {{update.changes.labels.old_value.0}}
-                              </span>
-                              {% endif %}
-                              {% if update.changes.labels.old_value.1 %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-left: 2px;
-                                 white-space: nowrap;
-                                 "
-                                 >
-                              +{{ update.changes.labels.old_value|length|add:"-1"}} more
-                              </span>
-                              {% endif %}
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %}
-                     <!-- State changed -->
-                     {% if update.changes.state %}
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%"
-                        >
-                        <tr>
-                           <td>
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/state.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block"
-                                 />
-                           </td>
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 "
-                                 >
-                                 State:
-                              </p>
-                           </td>
-                           {% if update.changes.state.old_value.0 == 'Backlog' or  update.changes.state.old_value.0 == 'In Progress' or update.changes.state.old_value.0 == 'Done' or update.changes.state.old_value.0 == 'Cancelled' %}
-                           <td>
-                              <img
-                                 src="{% if update.changes.state.old_value.0 == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% endif %}{% if update.changes.state.old_value.0 == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% endif %}{% if update.changes.state.old_value.0 == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% endif %}{% if update.changes.state.old_value.0 == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block; margin-left: 5px;"
-                                 />
-                           </td>
-                           {% endif %}
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #60646C;
-                                 "
-                                 >
-                                 {{ update.changes.state.old_value.0 }}
-                              </p>
-                           </td>
-                           <td style="padding-left: 10px; padding-right: 10px;">
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png"
-                                 width="16"
-                                 height="16"
-                                 border="0"
-                                 style="display: block;"
-                                 />
-                           </td>
-                           {% if update.changes.state.new_value|last == 'Backlog' or  update.changes.state.new_value|last == 'In Progress' or update.changes.state.new_value|last == 'Done' or update.changes.state.new_value|last == 'Cancelled' %}
-                           <td>
-                              <img
-                                 src="{% if update.changes.state.new_value|last == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% elif update.changes.state.new_value|last == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% elif update.changes.state.new_value|last == 'Todo' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/todo.png{% elif update.changes.state.new_value|last == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% elif update.changes.state.new_value|last == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block;"
-                                 />
-                           </td>
-                           {% endif %}
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #60646c;
-                                 "
-                                 >
-                                 {{update.changes.state.new_value|last }}
-                              </p>
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %} {% if update.changes.link %}
-                     <!-- Link Added -->
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%"
-                        >
-                        <tr>
-                           <td valign="top">
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/link.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block; margin-top: 3px;"
-                                 />
-                           </td>
-                           <td valign="top">
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 margin-right: 5px;
-                                 "
-                                 >
-                                 Links:
-                              </p>
-                           </td>
-                           <td>
-                              {% for link in update.changes.link.new_value %}
-                              <a
-                                 href="{{link}}"
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 600;
-                                 color: #3a5bc7;
-                                 display: block;
-                                 padding-bottom: 5px;
-                                 "
-                                 >
-                              {{ link }}
-                              </a>
-                              {% endfor %}
-                              {% if update.changes.link.old_value|length > 0 %}
-                              {% if update.changes.link.old_value.0 != "None" %}
-                              <p
-                                 href=""
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #60646c;
-                                 "
-                                 >
-                                 2 Links were removed
-                              </p>
-                              {% endif %}
-                              {% endif %}
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %} 
-                     {% if update.changes.priority %}
-                     <!-- Priority changed -->
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%"
-                        >
-                        <tr>
-                           <td>
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/priority.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: block; margin: 0px; padding: 0px"
-                                 />
-                           </td>
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 margin-right: 5px;
-                                 "
-                                 >
-                                 Priority:
-                              </p>
-                           </td>
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 0px;
-                                 font-weight: 500;
-                                 border-radius: 2px;
-                                 text-transform: capitalize;
-                                 {% if update.changes.priority.old_value.0 == 'urgent' %}background-color: #FFDBDC; color: #CE2C31;{% endif %}
-                                 {% if update.changes.priority.old_value.0 == 'high' %}background-color: #FFE2C7; color: #F04610;{% endif %}
-                                 {% if update.changes.priority.old_value.0 == 'medium' %}background-color: #FEFBE9; color: #E2A336;{% endif %}
-                                 {% if update.changes.priority.old_value.0 == 'low' %}background-color: #E9F6E9; color: #2A7E3B;{% endif %}
-                                 "
-                                 >
-                                 {{ update.changes.priority.old_value.0 }}
-                              </p>
-                           </td>
-                           <td style="padding-left: 10px; padding-right: 10px;">
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png"
-                                 width="16"
-                                 height="16"
-                                 border="0"
-                                 style="display: block;"
-                                 />
-                           </td>
-                           <td>
-                              <p
-                                 style="
-                                 font-size: 0.8rem;
-                                 padding-left: 4px;
-                                 padding-right: 4px;
-                                 padding-bottom: 0px;
-                                 font-weight: 500;
-                                 border-radius: 2px;
-                                 text-transform: capitalize;
-                                 {% if update.changes.priority.new_value|last == 'urgent' %}background-color: #FFDBDC; color: #CE2C31;{% endif %}
-                                 {% if update.changes.priority.new_value|last == 'high' %}background-color: #FEEBEC; color: #CE2C31;{% endif %}
-                                 {% if update.changes.priority.new_value|last == 'medium' %}background-color: #FEFBE9; color: #E2A336;{% endif %}
-                                 {% if update.changes.priority.new_value|last == 'low' %}background-color: #E9F6E9; color: #2A7E3B;{% endif %}
-                                 "
-                                 >
-                                 {{ update.changes.priority.new_value|last }}
-                              </p>
-                           </td>
-                        </tr>
-                     </table>
-                     {% endif %} 
-                     {% if update.changes.blocking.new_value %}
-                     <!-- Blocking changed -->
-                     <table
-                        role="presentation"
-                        style="padding-bottom: 15px; max-width: 100%"
-                        >
-                        <tr style="overflow-wrap: break-word;">
-                           <td> 
-                              <img
-                                 src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/blocking.png"
-                                 width="12"
-                                 height="12"
-                                 border="0"
-                                 style="display: inline-block;"
-                                 />
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #525252;
-                                 margin-right: 5px;
-                                 "
-                                 >
-                              Blocking:
-                              </span>
-                           </td>
-                           {% if update.changes.blocking.new_value.0 %}
-                           <td style="padding-left: 5px;overflow-wrap: break-word;">
-                              {% for blocking in update.changes.blocking.new_value|slice:":2" %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #3a5bc7;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              {{ blocking }}
-                              </span>
-                              {% endfor %}
-                           </td>
-                           {% endif %}
-                           {% if update.changes.blocking.new_value.2 %}
-                           <td>
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #3a5bc7;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              +{{ update.changes.blocking.new_value|length|add:"-2" }}
-                              more
-                              </span>
-                           </td>
-                           {% endif %}
-                           {% if update.changes.blocking.old_value.0 %}
-                           <td style="padding-left: 8px;">
-                              {% for blocking in update.changes.blocking.old_value|slice:":2" %}
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 text-decoration: line-through;
-                                 "
-                                 >
-                              {{ blocking }}
-                              </span>
-                              {% endfor %}
-                           </td>
-                           {% endif %}
-                           {% if update.changes.blocking.old_value.2 %}
-                           <td>
-                              <span
-                                 style="
-                                 font-size: 0.8rem;
-                                 font-weight: 500;
-                                 color: #641723;
-                                 margin-right: 3px;
-                                 padding-top: 0px;
-                                 "
-                                 >
-                              +{{ update.changes.blocking.old_value|length|add:"-2" }}
-                              more
-                              </span>
-                           </td>
-                           {% endif %}
-                        </tr>
-                     </table>
-                     {% endif %}
-                  </div>
-               </div>
-               {% endif %}
-               <!-- Outer update Box end -->
-               {% endfor %} {% if comments.0 %}
-               <!-- Comments outer update Box -->
-               <div
-                  style="
-                  max-width: 100%;
-                  background-color: #f7f9ff;
-                  border-radius: 8px;
-                  border-style: solid;
-                  border-width: 1px;
-                  border-color: #c1d0ff;
-                  padding: 20px;
-                  margin-top: 15px;
-                  "
-                  >
-                  <!-- Block Heading -->
-                  <p style="font-size: 0.8rem; font-weight: 600; color: #121a26; padding-bottom: 20px;">
-                     Comments
-                  </p>
-                  <!-- Comments -->
-                  {% for comment in comments %}
-                  <table cellspacing="0">
-                     <tr style="border-radius: 8px">
-                        <td valign="top">
-                           {% if comment.actor_detail.avatar_url %}
-                           <img
-                              src="{{ comment.actor_detail.avatar_url }}"
-                              width="25"
-                              height="25"
-                              border="0"
-                              />
-                           {% else %}
-                           <table cellspacing="0" cellpadding="0">
-                              <tr>
-                                 <td
-                                    style="
-                                    width: 25px;
-                                    height: 25px;
-                                    background-color: #4f3422;
-                                    border-radius: 50%;
-                                    text-align: center;
-                                    "
-                                    >
-                                    <span
-                                       style="
-                                       color: white;
-                                       font-weight: 500;
-                                       font-size: 13px;
-                                       line-height: 25px;
-                                       display: inline-block;
-                                       "
-                                       >
-                                    {{ comment.actor_detail.first_name.0 }}
-                                    </span>
-                                 </td>
-                              </tr>
-                           </table>
-                           {% endif %}
-                        </td>
-                        <td style="padding-bottom: 15px">
-                           <table>
-                              <tr>
-                                 <td>
-                                    <p
-                                       style="
-                                       font-weight: 500;
-                                       font-size: 0.8rem;
-                                       color: #1c2024;
-                                       margin-left: 8px;
-                                       "
-                                       >
-                                       {{ comment.actor_detail.first_name }} {{ comment.actor_detail.last_name }}
-                                    </p>
-                                 </td>
-                              </tr>
-                              {% for actor_comment in  comment.actor_comments.new_value %}
-                              <tr>
-                                 <td>
-                                    <div
-                                       style="
-                                       padding: 6px 10px;
-                                       margin-left: 10px;
-                                       background-color: white;
-                                       font-size: 0.8rem;
-                                       color: #525252;
-                                       margin-top: 5px;
-                                       border-radius: 4px;
-                                       display: flex;
-                                       align-items: center;
-                                       "
-                                       >
-                                       <p>
-                                          {{ actor_comment|safe }}
-                                       </p>
-                                    </div>
-                                 </td>
-                              </tr>
-                              {% endfor %}
-                           </table>
-                        </td>
-                     </tr>
-                  </table>
-                  {% endfor %}
-               </div>
-               {% endif %}
-            </div>
-            <a href="{{ issue_url }}" style="text-decoration: none;">
-               <div
-                  style="
-                  max-width: min-content;
-                  white-space: nowrap;
-                  background-color: #3e63dd;
-                  padding: 10px 15px;
-                  border: 1px solid #2f4ba8;
-                  border-radius: 4px;
-                  margin-top: 15px;
-                  cursor: pointer;
-                  font-size: 0.8rem;
-                  color: white;
-                  "
-                  >
-                  View issue
-               </div>
-            </a>
-         </div>
-         <!-- Footer -->
-         <table style="width: 100%; padding: 20px; justify-content: center">
-            <tr>
-               <td>
-                  <div style="font-size: 0.8rem; color: #1c2024">
-                     This email was sent to
-                     <a
-                        href="mailto:{{receiver.email}}"
-                        style="color: #3a5bc7; font-weight: 500; text-decoration: none"
-                        >{{ receiver.email }}.</a
-                        >
-                     If you'd rather not receive this kind of email,
-                     <a
-                        href="{{ issue_url }}"
-                        style="color: #3a5bc7; text-decoration: none"
-                        >you can unsubscribe to the issue</a
-                        >
-                     or
-                     <a
-                        href="{{ user_preference }}"
-                        style="color: #3a5bc7; text-decoration: none"
-                        >manage your email preferences</a
-                        >.
-                     <!-- Github | LinkedIn | Twitter -->
-                     <div style="margin-top: 60px; float: right">
-                        <a
-                           href="https://github.com/makeplane"
-                           target="_blank"
-                           style="margin-left: 10px; text-decoration: none"
-                           >
-                        <img
-                           src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png"
-                           width="25"
-                           height="25"
-                           border="0"
-                           style="display: inline-block"
-                           />
-                        </a>
-                        <a
-                           href="https://www.linkedin.com/company/planepowers/"
-                           target="_blank"
-                           style="margin-left: 10px; text-decoration: none"
-                           >
-                        <img
-                           src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png"
-                           width="25"
-                           height="25"
-                           border="0"
-                           style="display: inline-block"
-                           />
-                        </a>
-                        <a
-                           href="https://twitter.com/planepowers"
-                           target="_blank"
-                           style="margin-left: 10px; text-decoration: none"
-                           >
-                        <img
-                           src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png"
-                           width="25"
-                           height="25"
-                           border="0"
-                           style="display: inline-block"
-                           />
-                        </a>
-                     </div>
-                  </div>
-               </td>
-            </tr>
-         </table>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Updates on issue</title>
+    <style type="text/css" emogrify="no"> html { font-family: system-ui; } p, h1, h2, h3, h4, ol, ul { margin: 0; } h-full { height: 100%; } a:hover { color: #3358d4 !important; } </style>
+    <style> *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
+  </head>
+  <body bgcolor="#ffffff" text="#3b3f44" link="#3f76ff" yahoo="fix" style="background-color: #f7f9ff; margin: 20px" >
+    <div style=" width: 600px; table-layout: fixed; height: 100%; margin-left: auto; margin-right: auto; " >
+      <!-- Header --> 
+      <div>
+        <table style="width: 600px" cellspacing="0">
+          <tr>
+            <td>
+              <div style="margin-left: 30px; margin-bottom: 20px; margin-top: 20px" > <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/plane-logo.png" width="130" height="40" border="0" /> </div>
+            </td>
+          </tr>
+        </table>
       </div>
-   </body>
+      <!-- Body --> 
+      <div style=" color: #1f2d5c; padding: 30px; border-radius: 4px; background-color: #fcfcfd; max-width: 100%; " >
+        <div>
+          <table style="width: 100%">
+            <tr>
+              <td>
+                <p style="font-size: 1rem; color: #1f2d5c; font-weight: 600"> {{ issue.issue_identifier }} updates </p>
+                <p style="font-size: 1rem; font-weight: 500; color: #1f2d5c; line-height: 28px"> {{workspace}}/<a target="_blank" style="color: #1f2d5c; text-decoration: none;" href="{{project_url}}">{{project}}</a>/<a style="color: #1f2d5c; text-decoration: none;" target="_blank" href="{{issue_url}}">{{issue.issue_identifier}}</a>: {{ issue.name }} </p>
+              </td>
+            </tr>
+          </table>
+          <hr style=" background-color: #f0f0f3; height: 1px; border: 0; margin-top: 15px; margin-bottom: 15px; " />
+          {% if actors_involved == 1 %} 
+          <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> {{summary}} <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} </span>. </p>
+          {% else %} 
+          <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> {{summary}} <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} </span>and others. </p>
+          {% endif %} <!-- {% if actors_involved == 1 %} {% if data|length > 0 and comments|length == 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name }} </span> made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} to the issue. </p> {% elif data|length == 0 and comments|length > 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name }} </span> added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %}. </p> {% elif data|length > 0 and comments|length > 0 %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> <span style="font-size: 1rem; font-weight: 700; line-height: 28px"> {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name }} </span> made {{total_updates}} {% if total_updates > 1 %}updates{% else %}update{% endif %} and added {{total_comments}} new {% if total_comments > 1 %}comments{% else %}comment{% endif %} on the issue. </p> {% endif %} {% else %} <p style="font-size: 1rem;color: #1f2d5c; line-height: 28px"> There are {{ total_updates }} new updates and {{total_comments}} new comments on the issue. </p> {% endif %} --> {% for update in data %} {% if update.changes.name %} <!-- Issue title updated --> 
+          <p style="font-size: 1rem; line-height: 28px; color: #1f2d5c"> The issue title has been updated to {{ issue.name}} </p>
+          {% endif %} <!-- Outer update Box start --> {% if data %} 
+          <div style=" background-color: #f7f9ff; border-radius: 8px; border-style: solid; border-width: 1px; border-color: #c1d0ff; padding: 20px; margin-top: 15px; max-width: 100%; " >
+            <!-- Block Heading --> 
+            <div style="padding-bottom: 20px">
+              <p style="font-size: 0.8rem; font-weight: 600; color: #121a26"> Updates </p>
+            </div>
+            <!-- Property Updates --> 
+            <div style=" background-color: white; max-width: 100%; overflow: hidden; overflow-wrap: break-word; word-wrap: break-word; padding-left: 15px; padding-bottom: 15px; border-radius: 8px; " >
+              <!-- action performer --> 
+              <table role="presentation" cellspacing="0" cellpadding="0" style="max-width: 100%" >
+                <tr style="border-radius: 8px; margin-top: 20px">
+                  <td style="width: 30px">
+                    {% if update.actor_detail.avatar_url %} <img src="{{ update.actor_detail.avatar_url }}" width="25" height="25" border="0" /> {% else %} 
+                    <table cellspacing="0" cellpadding="0">
+                      <tr>
+                        <td style=" width: 25px; height: 25px; background-color: #4f3422; border-radius: 50%; text-align: center; " > <span style=" color: white; font-weight: 500; font-size: 13px; line-height: 25px; display: inline-block; " > {{ update.actor_detail.first_name.0 }} </span> </td>
+                      </tr>
+                    </table>
+                    {% endif %} 
+                  </td>
+                  <td style="padding-top: 20px; padding-bottom: 20px">
+                    <p style=" font-weight: 500; font-size: 0.8rem; color: #1c2024; width: fit-content; margin-left: 5px; " > {{ update.actor_detail.first_name }} {{ update.actor_detail.last_name }} </p>
+                  </td>
+                  <td>
+                    <p style=" font-weight: 500; font-size: 0.6rem; color: #80838d; margin-left: 10px; " > {{ update.activity_time }} </p>
+                  </td>
+                </tr>
+              </table>
+              {% if update.changes.target_date %} <!-- due date changed --> 
+              <table role="presentation" style="max-width: 100%; padding-bottom: 15px" >
+                <tr>
+                  <td> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/due-date.png" width="12" height="12" border="0" style="display: block" /> </td>
+                  <td style="padding: 0px; text-align: center">
+                    <div>
+                      <p style=" padding: 0px; margin: 0px; font-size: 0.8rem; font-weight: 500; color: #525252; " > Due Date: </p>
+                    </div>
+                  </td>
+                  <td>
+                    {% if update.changes.target_date.new_value.0 %} 
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #171717; margin-left: 5px; padding: 0px; " > {{ update.changes.target_date.new_value.0 }} </p>
+                    {% else %} 
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #171717; margin-left: 5px; padding: 0px; text-decoration: line-through; " > {{ update.changes.target_date.old_value.0 }} </p>
+                    {% endif %} 
+                  </td>
+                </tr>
+              </table>
+              {% endif %} {% if update.changes.duplicate %} <!-- duplicate changed --> 
+              <table role="presentation" style="max-width: 100%; padding-bottom: 15px" >
+                <tr>
+                  <td> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/duplicate.png" width="12" height="12" border="0" style="display: inline-block" /> <span style=" font-size: 0.8rem; font-weight: 500; color: #525252; " > Duplicate: </span> </td>
+                  {% if update.changes.duplicate.new_value.0 %} 
+                  <td style="padding-left: 5px;overflow-wrap: break-word;"> {% for duplicate in update.changes.duplicate.new_value|slice:":2" %} <span style=" font-size: 0.8rem; font-weight: 500; color: #3a5bc7; margin-right: 3px; padding-top: 0px; " > {{ duplicate }} </span> {% endfor %} </td>
+                  {% endif %} {% if update.changes.duplicate.new_value.2 %} 
+                  <td> <span style=" font-size: 0.8rem; font-weight: 500; color: #3a5bc7; margin-right: 3px; padding-top: 0px; " > +{{ update.changes.duplicate.new_value|length|add:"-2" }} more </span> </td>
+                  {% endif %} {% if update.changes.duplicate.old_value.0 %} 
+                  <td style="padding-left: 8px;"> {% for duplicate in update.changes.duplicate.old_value|slice:":2" %} <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-right: 3px; padding-top: 0px; text-decoration: line-through; " > {{ duplicate }} </span> {% endfor %} </td>
+                  {% endif %} {% if update.changes.duplicate.old_value.2 %} 
+                  <td> <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-right: 3px; padding-top: 0px; " > +{{ update.changes.duplicate.old_value|length|add:"-2" }} more </span> </td>
+                  {% endif %} 
+                </tr>
+              </table>
+              {% endif %} <!-- Assignee changed--> {% if update.changes.assignees %} 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%; padding-right: 10px;" >
+                <tr>
+                  <td valign="top" style="white-space: nowrap; padding: 0px;"> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/assignee.png" width="12" height="12" border="0" style="display: inline-block" /> <span style=" font-size: 0.8rem; font-weight: 500; color: #525252; padding-right: 5px; " > Assignee: </span> </td>
+                  <td style="overflow-wrap: anywhere;word-break: break-all; padding: 0px;"> {% if update.changes.assignees.new_value.0 %} <span style=" font-size: 0.8rem; color: #0d74ce; background-color: #e6f4fe; margin-right: 5px; padding-left: 4px; padding-right: 4px; padding-bottom: 2px; padding-top: 2px; font-weight: 500; border-radius: 2px; max-lines: 1; " > {{update.changes.assignees.new_value.0}} </span> {% endif %} {% if update.changes.assignees.new_value.1 %} <span style=" font-size: 0.8rem; font-weight: 500; color: #0d74ce; margin-left: 2px; margin-right: 5px; white-space: nowrap; padding: 0px; " > +{{ update.changes.assignees.new_value|length|add:"-1"}} more </span> {% endif %} {% if update.changes.assignees.old_value.0 %} <span style=" font-size: 0.8rem; padding-left: 4px; padding-right: 4px; padding-bottom: 2px; padding-top: 2px; font-weight: 500; text-decoration: line-through; color: #641723; background-color: #feebec; margin-right: 5px; border-radius: 2px; " > {{update.changes.assignees.old_value.0}} </span> {% endif %} {% if update.changes.assignees.old_value.1 %} <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-left: 2px; white-space: nowrap; " > +{{ update.changes.assignees.old_value|length|add:"-1"}} more </span> {% endif %} </td>
+                </tr>
+              </table>
+              {% endif %} {% if update.changes.labels %} <!-- Labels --> 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%; padding-right: 10px;" >
+                <tr>
+                  <td valign="top" style="white-space: nowrap; padding: 0px;"> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/labels.png" width="12" height="12" border="0" style="display: inline-block;" /> <span style=" font-size: 0.8rem; font-weight: 500; color: #525252; padding-right: 5px; " > Labels: </span> </td>
+                  <td style="overflow-wrap: anywhere;word-break: break-all; padding: 0px;"> {% if update.changes.labels.new_value.0 %} <span style=" font-size: 0.8rem; line-height: 1px; color: #0d74ce; background-color: #e6f4fe; margin-right: 5px; padding-left: 4px; padding-right: 4px; padding-bottom: 2px; padding-top: 2px; font-weight: 500; border-radius: 2px; max-lines: 1; " > {{update.changes.labels.new_value.0}} </span> {% endif %} {% if update.changes.labels.new_value.1 %} <span style=" font-size: 0.8rem; font-weight: 500; color: #0d74ce; margin-left: 2px; margin-right: 5px; white-space: nowrap; " > +{{ update.changes.labels.new_value|length|add:"-1"}} more </span> {% endif %} {% if update.changes.labels.old_value.0 %} <span style=" font-size: 0.8rem; padding-left: 4px; padding-right: 4px; padding-bottom: 2px; padding-top: 2px; font-weight: 500; text-decoration: line-through; color: #641723; background-color: #feebec; margin-right: 5px; border-radius: 2px; " > {{update.changes.labels.old_value.0}} </span> {% endif %} {% if update.changes.labels.old_value.1 %} <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-left: 2px; white-space: nowrap; " > +{{ update.changes.labels.old_value|length|add:"-1"}} more </span> {% endif %} </td>
+                </tr>
+              </table>
+              {% endif %} <!-- State changed --> {% if update.changes.state %} 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%" >
+                <tr>
+                  <td> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/state.png" width="12" height="12" border="0" style="display: block" /> </td>
+                  <td>
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #525252; " > State: </p>
+                  </td>
+                  {% if update.changes.state.old_value.0 == 'Backlog' or update.changes.state.old_value.0 == 'In Progress' or update.changes.state.old_value.0 == 'Done' or update.changes.state.old_value.0 == 'Cancelled' %} 
+                  <td> <img src="{% if update.changes.state.old_value.0 == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% endif %}{% if update.changes.state.old_value.0 == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% endif %}{% if update.changes.state.old_value.0 == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% endif %}{% if update.changes.state.old_value.0 == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}" width="12" height="12" border="0" style="display: block; margin-left: 5px;" /> </td>
+                  {% endif %} 
+                  <td>
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #60646C; " > {{ update.changes.state.old_value.0 }} </p>
+                  </td>
+                  <td style="padding-left: 10px; padding-right: 10px;"> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png" width="16" height="16" border="0" style="display: block;" /> </td>
+                  {% if update.changes.state.new_value|last == 'Backlog' or update.changes.state.new_value|last == 'In Progress' or update.changes.state.new_value|last == 'Done' or update.changes.state.new_value|last == 'Cancelled' %} 
+                  <td> <img src="{% if update.changes.state.new_value|last == 'Backlog' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/backlog.png{% elif update.changes.state.new_value|last == 'In Progress' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/in-progress.png{% elif update.changes.state.new_value|last == 'Todo' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/todo.png{% elif update.changes.state.new_value|last == 'Done' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/done.png{% elif update.changes.state.new_value|last == 'Cancelled' %}https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/cancelled.png{% endif %}" width="12" height="12" border="0" style="display: block;" /> </td>
+                  {% endif %} 
+                  <td>
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #60646c; " > {{update.changes.state.new_value|last }} </p>
+                  </td>
+                </tr>
+              </table>
+              {% endif %} {% if update.changes.link %} <!-- Link Added --> 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%" >
+                <tr>
+                  <td valign="top"> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/link.png" width="12" height="12" border="0" style="display: block; margin-top: 3px;" /> </td>
+                  <td valign="top">
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #525252; margin-right: 5px; " > Links: </p>
+                  </td>
+                  <td>
+                    {% for link in update.changes.link.new_value %} <a href="{{link}}" style=" font-size: 0.8rem; font-weight: 600; color: #3a5bc7; display: block; padding-bottom: 5px; " > {{ link }} </a> {% endfor %} {% if update.changes.link.old_value|length > 0 %} {% if update.changes.link.old_value.0 != "None" %} 
+                    <p href="" style=" font-size: 0.8rem; font-weight: 500; color: #60646c; " > 2 Links were removed </p>
+                    {% endif %} {% endif %} 
+                  </td>
+                </tr>
+              </table>
+              {% endif %} {% if update.changes.priority %} <!-- Priority changed --> 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%" >
+                <tr>
+                  <td> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/priority.png" width="12" height="12" border="0" style="display: block; margin: 0px; padding: 0px" /> </td>
+                  <td>
+                    <p style=" font-size: 0.8rem; font-weight: 500; color: #525252; margin-right: 5px; " > Priority: </p>
+                  </td>
+                  <td>
+                    <p style=" font-size: 0.8rem; padding-left: 4px; padding-right: 4px; padding-bottom: 0px; font-weight: 500; border-radius: 2px; text-transform: capitalize; {% if update.changes.priority.old_value.0 == 'urgent' %}background-color: #FFDBDC; color: #CE2C31;{% endif %} {% if update.changes.priority.old_value.0 == 'high' %}background-color: #FFE2C7; color: #F04610;{% endif %} {% if update.changes.priority.old_value.0 == 'medium' %}background-color: #FEFBE9; color: #E2A336;{% endif %} {% if update.changes.priority.old_value.0 == 'low' %}background-color: #E9F6E9; color: #2A7E3B;{% endif %} " > {{ update.changes.priority.old_value.0 }} </p>
+                  </td>
+                  <td style="padding-left: 10px; padding-right: 10px;"> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/forward-arrow.png" width="16" height="16" border="0" style="display: block;" /> </td>
+                  <td>
+                    <p style=" font-size: 0.8rem; padding-left: 4px; padding-right: 4px; padding-bottom: 0px; font-weight: 500; border-radius: 2px; text-transform: capitalize; {% if update.changes.priority.new_value|last == 'urgent' %}background-color: #FFDBDC; color: #CE2C31;{% endif %} {% if update.changes.priority.new_value|last == 'high' %}background-color: #FEEBEC; color: #CE2C31;{% endif %} {% if update.changes.priority.new_value|last == 'medium' %}background-color: #FEFBE9; color: #E2A336;{% endif %} {% if update.changes.priority.new_value|last == 'low' %}background-color: #E9F6E9; color: #2A7E3B;{% endif %} " > {{ update.changes.priority.new_value|last }} </p>
+                  </td>
+                </tr>
+              </table>
+              {% endif %} {% if update.changes.blocking.new_value %} <!-- Blocking changed --> 
+              <table role="presentation" style="padding-bottom: 15px; max-width: 100%" >
+                <tr style="overflow-wrap: break-word;">
+                  <td> <img src="https://plane-marketing.s3.ap-south-1.amazonaws.com/plane-assets/emails/blocking.png" width="12" height="12" border="0" style="display: inline-block;" /> <span style=" font-size: 0.8rem; font-weight: 500; color: #525252; margin-right: 5px; " > Blocking: </span> </td>
+                  {% if update.changes.blocking.new_value.0 %} 
+                  <td style="padding-left: 5px;overflow-wrap: break-word;"> {% for blocking in update.changes.blocking.new_value|slice:":2" %} <span style=" font-size: 0.8rem; font-weight: 500; color: #3a5bc7; margin-right: 3px; padding-top: 0px; " > {{ blocking }} </span> {% endfor %} </td>
+                  {% endif %} {% if update.changes.blocking.new_value.2 %} 
+                  <td> <span style=" font-size: 0.8rem; font-weight: 500; color: #3a5bc7; margin-right: 3px; padding-top: 0px; " > +{{ update.changes.blocking.new_value|length|add:"-2" }} more </span> </td>
+                  {% endif %} {% if update.changes.blocking.old_value.0 %} 
+                  <td style="padding-left: 8px;"> {% for blocking in update.changes.blocking.old_value|slice:":2" %} <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-right: 3px; padding-top: 0px; text-decoration: line-through; " > {{ blocking }} </span> {% endfor %} </td>
+                  {% endif %} {% if update.changes.blocking.old_value.2 %} 
+                  <td> <span style=" font-size: 0.8rem; font-weight: 500; color: #641723; margin-right: 3px; padding-top: 0px; " > +{{ update.changes.blocking.old_value|length|add:"-2" }} more </span> </td>
+                  {% endif %} 
+                </tr>
+              </table>
+              {% endif %} 
+            </div>
+          </div>
+          {% endif %} <!-- Outer update Box end --> {% endfor %} {% if comments.0 %} <!-- Comments outer update Box --> 
+          <div style=" max-width: 100%; background-color: #f7f9ff; border-radius: 8px; border-style: solid; border-width: 1px; border-color: #c1d0ff; padding: 20px; margin-top: 15px; " >
+            <!-- Block Heading --> 
+            <p style="font-size: 0.8rem; font-weight: 600; color: #121a26; padding-bottom: 20px;"> Comments </p>
+            <!-- Comments --> {% for comment in comments %} 
+            <table cellspacing="0">
+              <tr style="border-radius: 8px">
+                <td valign="top">
+                  {% if comment.actor_detail.avatar_url %} <img src="{{ comment.actor_detail.avatar_url }}" width="25" height="25" border="0" /> {% else %} 
+                  <table cellspacing="0" cellpadding="0">
+                    <tr>
+                      <td style=" width: 25px; height: 25px; background-color: #4f3422; border-radius: 50%; text-align: center; " > <span style=" color: white; font-weight: 500; font-size: 13px; line-height: 25px; display: inline-block; " > {{ comment.actor_detail.first_name.0 }} </span> </td>
+                    </tr>
+                  </table>
+                  {% endif %} 
+                </td>
+                <td style="padding-bottom: 15px">
+                  <table>
+                    <tr>
+                      <td>
+                        <p style=" font-weight: 500; font-size: 0.8rem; color: #1c2024; margin-left: 8px; " > {{ comment.actor_detail.first_name }} {{ comment.actor_detail.last_name }} </p>
+                      </td>
+                    </tr>
+                    {% for actor_comment in comment.actor_comments.new_value %} 
+                    <tr>
+                      <td>
+                        <div style=" padding: 6px 10px; margin-left: 10px; background-color: white; font-size: 0.8rem; color: #525252; margin-top: 5px; border-radius: 4px; display: flex; align-items: center; " >
+                          <p> {{ actor_comment|safe }} </p>
+                        </div>
+                      </td>
+                    </tr>
+                    {% endfor %} 
+                  </table>
+                </td>
+              </tr>
+            </table>
+            {% endfor %} 
+          </div>
+          {% endif %} 
+        </div>
+        <a href="{{ issue_url }}" style="text-decoration: none;">
+          <div style=" max-width: min-content; white-space: nowrap; background-color: #3e63dd; padding: 10px 15px; border: 1px solid #2f4ba8; border-radius: 4px; margin-top: 15px; cursor: pointer; font-size: 0.8rem; color: white; " > View issue </div>
+        </a>
+      </div>
+      <!-- Footer --> 
+      <table style="width: 100%; padding: 20px; justify-content: center">
+        <tr>
+          <td>
+            <div style="font-size: 0.8rem; color: #1c2024">
+              This email was sent to <a href="mailto:{{receiver.email}}" style="color: #3a5bc7; font-weight: 500; text-decoration: none" >{{ receiver.email }}.</a > If you'd rather not receive this kind of email, <a href="{{ issue_url }}" style="color: #3a5bc7; text-decoration: none" >you can unsubscribe to the issue</a > or <a href="{{ user_preference }}" style="color: #3a5bc7; text-decoration: none" >manage your email preferences</a >. <!-- Github | LinkedIn | Twitter --> 
+              <div style="margin-top: 60px; float: right"> <a href="https://github.com/makeplane" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> <a href="https://twitter.com/planepowers" target="_blank" style="margin-left: 10px; text-decoration: none" > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="25" height="25" border="0" style="display: inline-block" /> </a> </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </body>
 </html>
\ No newline at end of file
diff --git a/apiserver/templates/emails/notifications/webhook-deactivate.html b/apiserver/templates/emails/notifications/webhook-deactivate.html
index 0543952351..0755eb4983 100644
--- a/apiserver/templates/emails/notifications/webhook-deactivate.html
+++ b/apiserver/templates/emails/notifications/webhook-deactivate.html
@@ -1,486 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="format-detection" content="telephone=no" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{ message }}</title>
-    <style type="text/css" emogrify="no">
-      #outlook a {
-        padding: 0;
-      }
-      .ExternalClass {
-        width: 100%;
-      }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%;
-      }
-      table td {
-        border-collapse: collapse;
-        mso-line-height-rule: exactly;
-      }
-      .editable.image {
-        font-size: 0 !important;
-        line-height: 0 !important;
-      }
-      .nl2go_preheader {
-        display: none !important;
-        mso-hide: all !important;
-        mso-line-height-rule: exactly;
-        visibility: hidden !important;
-        line-height: 0px !important;
-        font-size: 0px !important;
-      }
-      body {
-        width: 100% !important;
-        -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-        margin: 0;
-        padding: 0;
-      }
-      img {
-        outline: none;
-        text-decoration: none;
-        -ms-interpolation-mode: bicubic;
-      }
-      a img {
-        border: none;
-      }
-      table {
-        border-collapse: collapse;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-      }
-      th {
-        font-weight: normal;
-        text-align: left;
-      }
-      *[class="gmail-fix"] {
-        display: none !important;
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-      }
-    </style>
-    <style type="text/css" emogrify="no">
-      @media (max-width: 600px) {
-        .gmx-killpill {
-          content: " \03D1";
-        }
-        .r0-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 320px !important;
-        }
-        .r1-i {
-          background-color: #ffffff !important;
-        }
-        .r2-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r3-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          width: 100% !important;
-        }
-        .r4-i {
-          padding-bottom: 20px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 20px !important;
-        }
-        .r5-c {
-          box-sizing: border-box !important;
-          display: block !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r6-o {
-          border-style: solid !important;
-          width: 100% !important;
-        }
-        .r7-i {
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-        }
-        .r8-c {
-          box-sizing: border-box !important;
-          text-align: left !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r9-o {
-          border-style: solid !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r10-i {
-          padding-bottom: 10px !important;
-          padding-left: 0px !important;
-          padding-right: 0px !important;
-          padding-top: 10px !important;
-        }
-        .r11-i {
-          padding-bottom: 15px !important;
-          padding-top: 15px !important;
-          text-align: left !important;
-        }
-        .r12-c {
-          box-sizing: border-box !important;
-          padding: 0 !important;
-          text-align: center !important;
-          valign: top !important;
-          width: 100% !important;
-        }
-        .r13-o {
-          border-style: solid !important;
-          margin: 0 auto 0 auto !important;
-          margin-bottom: 15px !important;
-          margin-top: 15px !important;
-          width: 100% !important;
-        }
-        .r14-i {
-          padding: 0 !important;
-          text-align: center !important;
-        }
-        .r15-r {
-          background-color: #3f76ff !important;
-          border-radius: 4px !important;
-          border-width: 0px !important;
-          box-sizing: border-box;
-          height: initial !important;
-          padding: 0 !important;
-          padding-bottom: 12px !important;
-          padding-top: 12px !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r16-i {
-          padding-bottom: 0px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 0px !important;
-        }
-        .r17-c {
-          box-sizing: border-box !important;
-          text-align: center !important;
-          width: 100% !important;
-        }
-        .r18-i {
-          padding-bottom: 5px !important;
-          padding-top: 5px !important;
-        }
-        .r19-i {
-          padding-bottom: 15px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 15px !important;
-        }
-        .r20-o {
-          border-bottom-color: #efefef !important;
-          border-bottom-width: 2px !important;
-          border-left-color: #efefef !important;
-          border-left-width: 2px !important;
-          border-right-color: #efefef !important;
-          border-right-width: 2px !important;
-          border-style: solid !important;
-          border-top-color: #efefef !important;
-          border-top-width: 2px !important;
-          margin: 0 auto 0 0 !important;
-          width: 100% !important;
-        }
-        .r21-i {
-          padding-bottom: 5px !important;
-          padding-left: 5px !important;
-          padding-right: 5px !important;
-          padding-top: 5px !important;
-          text-align: left !important;
-        }
-        .r22-i {
-          padding-bottom: 5px !important;
-          padding-left: 15px !important;
-          padding-right: 15px !important;
-          padding-top: 5px !important;
-        }
-        .r23-c {
-          box-sizing: border-box !important;
-          width: 100% !important;
-        }
-        .r24-i {
-          font-size: 0px !important;
-          padding-bottom: 10px !important;
-          padding-left: 65px !important;
-          padding-right: 65px !important;
-          padding-top: 10px !important;
-        }
-        .r25-c {
-          box-sizing: border-box !important;
-          width: 32px !important;
-        }
-        .r26-o {
-          border-style: solid !important;
-          margin-right: 8px !important;
-          width: 32px !important;
-        }
-        .r27-o {
-          border-style: solid !important;
-          margin-right: 0px !important;
-          width: 32px !important;
-        }
-        .r28-i {
-          padding-bottom: 0px !important;
-          padding-top: 5px !important;
-          text-align: center !important;
-        }
-        body {
-          -webkit-text-size-adjust: none;
-        }
-        .nl2go-responsive-hide {
-          display: none;
-        }
-        .nl2go-body-table {
-          min-width: unset !important;
-        }
-        .mobshow {
-          height: auto !important;
-          overflow: visible !important;
-          max-height: unset !important;
-          visibility: visible !important;
-          border: none !important;
-        }
-        .resp-table {
-          display: inline-table !important;
-        }
-        .magic-resp {
-          display: table-cell !important;
-        }
-      }
-    </style>
-    <style type="text/css">
-      p,
-      h1,
-      h2,
-      h3,
-      h4,
-      ol,
-      ul {
-        margin: 0;
-      }
-      a,
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-      .nl2go-default-textstyle {
-        color: #3b3f44;
-        font-family: georgia, serif;
-        font-size: 16px;
-        line-height: 1.5;
-        word-break: break-word;
-      }
-      .default-button {
-        color: #ffffff;
-        font-family: georgia, serif;
-        font-size: 16px;
-        font-style: normal;
-        font-weight: normal;
-        line-height: 1.15;
-        text-decoration: none;
-        word-break: break-word;
-      }
-      .default-heading1 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 36px;
-        word-break: break-word;
-      }
-      .default-heading2 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 32px;
-        word-break: break-word;
-      }
-      .default-heading3 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 24px;
-        word-break: break-word;
-      }
-      .default-heading4 {
-        color: #1f2d3d;
-        font-family: arial, helvetica, sans-serif;
-        font-size: 18px;
-        word-break: break-word;
-      }
-      a[x-apple-data-detectors] {
-        color: inherit !important;
-        text-decoration: inherit !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-      .no-show-for-you {
-        border: none;
-        display: none;
-        float: none;
-        font-size: 0;
-        height: 0;
-        line-height: 0;
-        max-height: 0;
-        mso-hide: all;
-        overflow: hidden;
-        table-layout: fixed;
-        visibility: hidden;
-        width: 0;
-      }
-    </style>
-    <!--[if mso
-      ]><xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG /> <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-      </xml><!
-    [endif]-->
-    <style type="text/css">
-      a:link {
-        color: #3f76ff;
-        text-decoration: underline;
-      }
-    </style>
+    <style type="text/css" emogrify="no"> #outlook a { padding: 0; } .ExternalClass { width: 100%; } .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div { line-height: 100%; } table td { border-collapse: collapse; mso-line-height-rule: exactly; } .editable.image { font-size: 0 !important; line-height: 0 !important; } .nl2go_preheader { display: none !important; mso-hide: all !important; mso-line-height-rule: exactly; visibility: hidden !important; line-height: 0px !important; font-size: 0px !important; } body { width: 100% !important; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0; } img { outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; } a img { border: none; } table { border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; } th { font-weight: normal; text-align: left; } *[class="gmail-fix"] { display: none !important; } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } } </style>
+    <style type="text/css" emogrify="no"> @media (max-width: 600px) { .gmx-killpill { content: " \03D1"; } .r0-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 320px !important; } .r1-i { background-color: #ffffff !important; } .r2-c { box-sizing: border-box !important; text-align: center !important; valign: top !important; width: 100% !important; } .r3-o { border-style: solid !important; margin: 0 auto 0 auto !important; width: 100% !important; } .r4-i { padding-bottom: 20px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 20px !important; } .r5-c { box-sizing: border-box !important; display: block !important; valign: top !important; width: 100% !important; } .r6-o { border-style: solid !important; width: 100% !important; } .r7-i { padding-left: 0px !important; padding-right: 0px !important; } .r8-c { box-sizing: border-box !important; text-align: left !important; valign: top !important; width: 100% !important; } .r9-o { border-style: solid !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r10-i { padding-bottom: 10px !important; padding-left: 0px !important; padding-right: 0px !important; padding-top: 10px !important; } .r11-i { padding-bottom: 15px !important; padding-top: 15px !important; text-align: left !important; } .r12-c { box-sizing: border-box !important; padding: 0 !important; text-align: center !important; valign: top !important; width: 100% !important; } .r13-o { border-style: solid !important; margin: 0 auto 0 auto !important; margin-bottom: 15px !important; margin-top: 15px !important; width: 100% !important; } .r14-i { padding: 0 !important; text-align: center !important; } .r15-r { background-color: #3f76ff !important; border-radius: 4px !important; border-width: 0px !important; box-sizing: border-box; height: initial !important; padding: 0 !important; padding-bottom: 12px !important; padding-top: 12px !important; text-align: center !important; width: 100% !important; } .r16-i { padding-bottom: 0px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 0px !important; } .r17-c { box-sizing: border-box !important; text-align: center !important; width: 100% !important; } .r18-i { padding-bottom: 5px !important; padding-top: 5px !important; } .r19-i { padding-bottom: 15px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 15px !important; } .r20-o { border-bottom-color: #efefef !important; border-bottom-width: 2px !important; border-left-color: #efefef !important; border-left-width: 2px !important; border-right-color: #efefef !important; border-right-width: 2px !important; border-style: solid !important; border-top-color: #efefef !important; border-top-width: 2px !important; margin: 0 auto 0 0 !important; width: 100% !important; } .r21-i { padding-bottom: 5px !important; padding-left: 5px !important; padding-right: 5px !important; padding-top: 5px !important; text-align: left !important; } .r22-i { padding-bottom: 5px !important; padding-left: 15px !important; padding-right: 15px !important; padding-top: 5px !important; } .r23-c { box-sizing: border-box !important; width: 100% !important; } .r24-i { font-size: 0px !important; padding-bottom: 10px !important; padding-left: 65px !important; padding-right: 65px !important; padding-top: 10px !important; } .r25-c { box-sizing: border-box !important; width: 32px !important; } .r26-o { border-style: solid !important; margin-right: 8px !important; width: 32px !important; } .r27-o { border-style: solid !important; margin-right: 0px !important; width: 32px !important; } .r28-i { padding-bottom: 0px !important; padding-top: 5px !important; text-align: center !important; } body { -webkit-text-size-adjust: none; } .nl2go-responsive-hide { display: none; } .nl2go-body-table { min-width: unset !important; } .mobshow { height: auto !important; overflow: visible !important; max-height: unset !important; visibility: visible !important; border: none !important; } .resp-table { display: inline-table !important; } .magic-resp { display: table-cell !important; } } </style>
+    <style type="text/css"> p, h1, h2, h3, h4, ol, ul { margin: 0; } a, a:link { color: #3f76ff; text-decoration: underline; } .nl2go-default-textstyle { color: #3b3f44; font-family: georgia, serif; font-size: 16px; line-height: 1.5; word-break: break-word; } .default-button { color: #ffffff; font-family: georgia, serif; font-size: 16px; font-style: normal; font-weight: normal; line-height: 1.15; text-decoration: none; word-break: break-word; } .default-heading1 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 36px; word-break: break-word; } .default-heading2 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 32px; word-break: break-word; } .default-heading3 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 24px; word-break: break-word; } .default-heading4 { color: #1f2d3d; font-family: arial, helvetica, sans-serif; font-size: 18px; word-break: break-word; } a[x-apple-data-detectors] { color: inherit !important; text-decoration: inherit !important; font-size: inherit !important; font-family: inherit !important; font-weight: inherit !important; line-height: inherit !important; } .no-show-for-you { border: none; display: none; float: none; font-size: 0; height: 0; line-height: 0; max-height: 0; mso-hide: all; overflow: hidden; table-layout: fixed; visibility: hidden; width: 0; } </style>
+    <!--[if mso ]>
+    <xml>
+      <o:OfficeDocumentSettings>
+        <o:AllowPNG />
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+    </xml>
+    <! [endif]--> 
+    <style type="text/css"> a:link { color: #3f76ff; text-decoration: underline; } </style>
   </head>
-  <body
-    bgcolor="#ffffff"
-    text="#3b3f44"
-    link="#3f76ff"
-    yahoo="fix"
-    style="background-color: #ffffff"
-  >
-    <table
-      cellspacing="0"
-      cellpadding="0"
-      border="0"
-      role="presentation"
-      class="nl2go-body-table"
-      width="100%"
-      style="background-color: #ffffff; width: 100%"
-    >
+  <body bgcolor="#ffffff" text="#3b3f44" link="#3f76ff" yahoo="fix" style="background-color: #ffffff" >
+    <table cellspacing="0" cellpadding="0" border="0" role="presentation" class="nl2go-body-table" width="100%" style="background-color: #ffffff; width: 100%" >
       <tr>
         <td>
-          <table
-            cellspacing="0"
-            cellpadding="0"
-            border="0"
-            role="presentation"
-            width="600"
-            align="center"
-            class="r0-o"
-            style="table-layout: fixed; width: 600px"
-          >
+          <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="600" align="center" class="r0-o" style="table-layout: fixed; width: 600px" >
             <tr>
               <td valign="top" class="r1-i" style="background-color: #ffffff">
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r4-i"
-                      style="padding-bottom: 20px; padding-top: 20px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r4-i" style="padding-bottom: 20px; padding-top: 20px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 10px;
-                                    padding-right: 10px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 10px; padding-right: 10px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="150"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 150px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="150" class="r9-o" style=" table-layout: fixed; width: 150px; " >
                                           <tr>
-                                            <td
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 0px;
-                                              "
-                                            >
-                                              <img
-                                                src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png"
-                                                width="150"
-                                                border="0"
-                                                style="
-                                                  display: block;
-                                                  width: 100%;
-                                                "
-                                              />
-                                            </td>
+                                            <td style=" font-size: 0px; line-height: 0px; " > <img src="https://img.mailinblue.com/5942152/images/content_library/original/64708f00b503b149db7ff135.png" width="150" border="0" style=" display: block; width: 100%; " /> </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -495,163 +56,31 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r10-i"
-                      style="padding-bottom: 10px; padding-top: 10px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r10-i" style="padding-bottom: 10px; padding-top: 10px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r11-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                line-height: 1.5;
-                                                word-break: break-word;
-                                                padding-bottom: 15px;
-                                                padding-top: 15px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td align="left" valign="top" class="r11-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; line-height: 1.5; word-break: break-word; padding-bottom: 15px; padding-top: 15px; text-align: left; " >
                                               <div>
-                                                <p
-                                                  style="
-                                                    -webkit-text-stroke-width: 0px;
-                                                    font-style: normal;
-                                                    letter-spacing: normal;
-                                                    margin: 0px;
-                                                    orphans: 2;
-                                                    text-decoration-style: initial;
-                                                    text-decoration-thickness: initial;
-                                                    text-indent: 0px;
-                                                    text-transform: none;
-                                                    white-space: normal;
-                                                    widows: 2;
-                                                    word-break: break-word;
-                                                    word-spacing: 0px;
-                                                  "
-                                                >
-                                                  {{ message }}
-                                                </p>
+                                                <p style=" -webkit-text-stroke-width: 0px; font-style: normal; letter-spacing: normal; margin: 0px; orphans: 2; text-decoration-style: initial; text-decoration-thickness: initial; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-break: break-word; word-spacing: 0px; " > {{ message }} </p>
                                               </div>
                                             </td>
                                           </tr>
                                         </table>
                                       </td>
                                     </tr>
-                                    <tr
-                                      style="
-                                        display: flex;
-                                        align-items: center;
-                                        width: 100%;
-                                        justify-content: center;
-                                      "
-                                    >
-                                      <td
-                                        style="
-                                          display: flex;
-                                          align-items: center;
-                                          width: 100%;
-                                          justify-content: center;
-                                        "
-                                      >
-                                        <a
-                                          href="{{ webhook_url }}"
-                                          style="
-                                            text-decoration: none;
-                                            display: flex;
-                                            align-items: center;
-                                            width: 100%;
-                                            justify-content: center;
-                                          "
-                                        >
-                                          <span
-                                            style="
-                                              max-width: min-content;
-                                              white-space: nowrap;
-                                              background-color: #3f76ff;
-                                              padding: 10px 15px;
-                                              border: 1px solid #2f4ba8;
-                                              border-radius: 4px;
-                                              margin-top: 15px;
-                                              cursor: pointer;
-                                              font-size: 0.8rem;
-                                              color: #ffffff;
-                                              display: flex;
-                                              align-items: center;
-                                              justify-content: center;
-                                            "
-                                          >
-                                            View webhook
-                                          </span>
-                                        </a>
-                                      </td>
+                                    <tr style=" display: flex; align-items: center; width: 100%; justify-content: center; " >
+                                      <td style=" display: flex; align-items: center; width: 100%; justify-content: center; " > <a href="{{ webhook_url }}" style=" text-decoration: none; display: flex; align-items: center; width: 100%; justify-content: center; " > <span style=" max-width: min-content; white-space: nowrap; background-color: #3f76ff; padding: 10px 15px; border: 1px solid #2f4ba8; border-radius: 4px; margin-top: 15px; cursor: pointer; font-size: 0.8rem; color: #ffffff; display: flex; align-items: center; justify-content: center; " > View webhook </span> </a> </td>
                                     </tr>
                                   </table>
                                 </td>
@@ -663,114 +92,27 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
                     <td class="r16-i">
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r17-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          class="r3-o"
-                                          style="table-layout: fixed"
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r3-o" style="table-layout: fixed" >
                                           <tr>
-                                            <td
-                                              class="r18-i"
-                                              style="
-                                                padding-bottom: 5px;
-                                                padding-top: 5px;
-                                                height: 1px;
-                                              "
-                                            >
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                            <td class="r18-i" style=" padding-bottom: 5px; padding-top: 5px; height: 1px; " >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                 <tr>
                                                   <td>
-                                                    <table
-                                                      width="100%"
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      valign=""
-                                                      class="r18-i"
-                                                      height="1"
-                                                      style="
-                                                        border-top-style: solid;
-                                                        background-clip: border-box;
-                                                        border-top-color: #efefef;
-                                                        border-top-width: 1px;
-                                                        font-size: 1px;
-                                                        line-height: 1px;
-                                                      "
-                                                    >
+                                                    <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" valign="" class="r18-i" height="1" style=" border-top-style: solid; background-clip: border-box; border-top-color: #efefef; border-top-width: 1px; font-size: 1px; line-height: 1px; " >
                                                       <tr>
-                                                        <td
-                                                          height="0"
-                                                          style="
-                                                            font-size: 0px;
-                                                            line-height: 0px;
-                                                          "
-                                                        >
-                                                          ­
-                                                        </td>
+                                                        <td height="0" style=" font-size: 0px; line-height: 0px; " > ­ </td>
                                                       </tr>
                                                     </table>
                                                   </td>
@@ -791,254 +133,37 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r19-i"
-                      style="padding-bottom: 15px; padding-top: 15px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r19-i" style="padding-bottom: 15px; padding-top: 15px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r20-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r20-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              align="left"
-                                              valign="top"
-                                              class="r21-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                font-size: 16px;
-                                                word-break: break-word;
-                                                line-height: 1.5;
-                                                padding-bottom: 5px;
-                                                padding-left: 5px;
-                                                padding-right: 5px;
-                                                padding-top: 5px;
-                                                text-align: left;
-                                              "
-                                            >
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
+                                            <td align="left" valign="top" class="r21-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; font-size: 16px; word-break: break-word; line-height: 1.5; padding-bottom: 5px; padding-left: 5px; padding-right: 5px; padding-top: 5px; text-align: left; " >
                                               <div>
-                                                <p style="margin: 0">
-                                                  <span style="font-size: 13px"
-                                                    >Despite our popularity, we
-                                                    are humbly early-stage. We
-                                                    are shipping fast, so please
-                                                    reach out to us with feature
-                                                    requests, major and minor
-                                                    nits, and anything else you
-                                                    find missing. We read every </span
-                                                  ><a
-                                                    href="https://discord.com/channels/1031547764020084846/1094927053867995176"
-                                                    title="Plane Support on Discod"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >message</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, </span
-                                                  ><a
-                                                    href="http://twitter.com/planepowers"
-                                                    title="@planepowers"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >tweet</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >, and </span
-                                                  ><a
-                                                    href="https://github.com/makeplane/plane/issues"
-                                                    title="Plane's GitHub conversations"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >conversation</span
-                                                    ></a
-                                                  ><span
-                                                    style="font-size: 13px"
-                                                  >
-                                                    and update </span
-                                                  ><a
-                                                    href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban"
-                                                    title="Plane's roadmap"
-                                                    target="_blank"
-                                                    style="
-                                                      color: #3f76ff;
-                                                      text-decoration: underline;
-                                                    "
-                                                    ><span
-                                                      style="font-size: 13px"
-                                                      >our public roadmap</span
-                                                    ></a
-                                                  ><span style="font-size: 13px"
-                                                    >.</span
-                                                  >
-                                                </p>
+                                                <p style="margin: 0"> <span style="font-size: 13px" >Despite our popularity, we are humbly early-stage. We are shipping fast, so please reach out to us with feature requests, major and minor nits, and anything else you find missing. We read every </span ><a href="https://discord.com/channels/1031547764020084846/1094927053867995176" title="Plane Support on Discod" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >message</span ></a ><span style="font-size: 13px" >, </span ><a href="http://twitter.com/planepowers" title="@planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >tweet</span ></a ><span style="font-size: 13px" >, and </span ><a href="https://github.com/makeplane/plane/issues" title="Plane's GitHub conversations" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >conversation</span ></a ><span style="font-size: 13px" > and update </span ><a href="https://plane.sh/plane/0b170a1c-0e55-47cb-9307-ea49a05672b5?board=kanban" title="Plane's roadmap" target="_blank" style=" color: #3f76ff; text-decoration: underline; " ><span style="font-size: 13px" >our public roadmap</span ></a ><span style="font-size: 13px" >.</span > </p>
                                               </div>
                                             </td>
-                                            <td
-                                              class="nl2go-responsive-hide"
-                                              width="2"
-                                              style="
-                                                font-size: 0px;
-                                                line-height: 1px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td class="nl2go-responsive-hide" width="2" style=" font-size: 0px; line-height: 1px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                           <tr class="nl2go-responsive-hide">
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
-                                            <td
-                                              height="2"
-                                              width="2"
-                                              style="
-                                                font-size: 2px;
-                                                line-height: 2px;
-                                                background-color: #efefef;
-                                              "
-                                            >
-                                              ­
-                                            </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
+                                            <td height="2" width="2" style=" font-size: 2px; line-height: 2px; background-color: #efefef; " > ­ </td>
                                           </tr>
                                         </table>
                                       </td>
@@ -1053,348 +178,57 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r22-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r22-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r17-c" align="center">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="570"
-                                          align="center"
-                                          class="r3-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 570px;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" align="center" class="r3-o" style=" table-layout: fixed; width: 570px; " >
                                           <tr>
                                             <td valign="top">
-                                              <table
-                                                width="100%"
-                                                cellspacing="0"
-                                                cellpadding="0"
-                                                border="0"
-                                                role="presentation"
-                                              >
+                                              <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                 <tr>
-                                                  <td
-                                                    class="r23-c"
-                                                    style="
-                                                      display: inline-block;
-                                                    "
-                                                  >
-                                                    <table
-                                                      cellspacing="0"
-                                                      cellpadding="0"
-                                                      border="0"
-                                                      role="presentation"
-                                                      width="570"
-                                                      class="r6-o"
-                                                      style="
-                                                        table-layout: fixed;
-                                                        width: 570px;
-                                                      "
-                                                    >
+                                                  <td class="r23-c" style=" display: inline-block; " >
+                                                    <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="570" class="r6-o" style=" table-layout: fixed; width: 570px; " >
                                                       <tr>
-                                                        <td
-                                                          class="r24-i"
-                                                          style="
-                                                            padding-bottom: 10px;
-                                                            padding-left: 209px;
-                                                            padding-right: 209px;
-                                                            padding-top: 10px;
-                                                          "
-                                                        >
-                                                          <table
-                                                            width="100%"
-                                                            cellspacing="0"
-                                                            cellpadding="0"
-                                                            border="0"
-                                                            role="presentation"
-                                                          >
+                                                        <td class="r24-i" style=" padding-bottom: 10px; padding-left: 209px; padding-right: 209px; padding-top: 10px; " >
+                                                          <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                                             <tr>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r25-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r26-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://github.com/makeplane"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r18-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://github.com/makeplane" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/github_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r25-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r26-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://www.linkedin.com/company/planepowers/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r18-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://www.linkedin.com/company/planepowers/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/linkedin_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="40"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r26-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="40" class="r25-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r26-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://twitter.com/planepowers"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
-                                                                    <td
-                                                                      class="nl2go-responsive-hide"
-                                                                      width="8"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 1px;
-                                                                      "
-                                                                    >
-                                                                      ­
-                                                                    </td>
+                                                                    <td class="r18-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://twitter.com/planepowers" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/twitter_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
+                                                                    <td class="nl2go-responsive-hide" width="8" style=" font-size: 0px; line-height: 1px; " > ­ </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
-                                                              <th
-                                                                width="32"
-                                                                class="r25-c mobshow resp-table"
-                                                                style="
-                                                                  font-weight: normal;
-                                                                "
-                                                              >
-                                                                <table
-                                                                  cellspacing="0"
-                                                                  cellpadding="0"
-                                                                  border="0"
-                                                                  role="presentation"
-                                                                  width="100%"
-                                                                  class="r27-o"
-                                                                  style="
-                                                                    table-layout: fixed;
-                                                                    width: 100%;
-                                                                  "
-                                                                >
+                                                              <th width="32" class="r25-c mobshow resp-table" style=" font-weight: normal; " >
+                                                                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r27-o" style=" table-layout: fixed; width: 100%; " >
                                                                   <tr>
-                                                                    <td
-                                                                      class="r18-i"
-                                                                      style="
-                                                                        font-size: 0px;
-                                                                        line-height: 0px;
-                                                                        padding-bottom: 5px;
-                                                                        padding-top: 5px;
-                                                                      "
-                                                                    >
-                                                                      <a
-                                                                        href="https://plane.so/"
-                                                                        target="_blank"
-                                                                        style="
-                                                                          color: #3f76ff;
-                                                                          text-decoration: underline;
-                                                                        "
-                                                                      >
-                                                                        <img
-                                                                          src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png"
-                                                                          width="32"
-                                                                          border="0"
-                                                                          style="
-                                                                            display: block;
-                                                                            width: 100%;
-                                                                          "
-                                                                      /></a>
-                                                                    </td>
+                                                                    <td class="r18-i" style=" font-size: 0px; line-height: 0px; padding-bottom: 5px; padding-top: 5px; " > <a href="https://plane.so/" target="_blank" style=" color: #3f76ff; text-decoration: underline; " > <img src="https://creative-assets.mailinblue.com/editor/social-icons/rounded_colored/website_32px.png" width="32" border="0" style=" display: block; width: 100%; " /></a> </td>
                                                                   </tr>
                                                                 </table>
                                                               </th>
@@ -1421,103 +255,23 @@
                     </td>
                   </tr>
                 </table>
-                <table
-                  cellspacing="0"
-                  cellpadding="0"
-                  border="0"
-                  role="presentation"
-                  width="100%"
-                  align="center"
-                  class="r3-o"
-                  style="table-layout: fixed; width: 100%"
-                >
+                <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" align="center" class="r3-o" style="table-layout: fixed; width: 100%" >
                   <tr>
-                    <td
-                      class="r22-i"
-                      style="padding-bottom: 5px; padding-top: 5px"
-                    >
-                      <table
-                        width="100%"
-                        cellspacing="0"
-                        cellpadding="0"
-                        border="0"
-                        role="presentation"
-                      >
+                    <td class="r22-i" style="padding-bottom: 5px; padding-top: 5px" >
+                      <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                         <tr>
-                          <th
-                            width="100%"
-                            valign="top"
-                            class="r5-c"
-                            style="font-weight: normal"
-                          >
-                            <table
-                              cellspacing="0"
-                              cellpadding="0"
-                              border="0"
-                              role="presentation"
-                              width="100%"
-                              class="r6-o"
-                              style="table-layout: fixed; width: 100%"
-                            >
+                          <th width="100%" valign="top" class="r5-c" style="font-weight: normal" >
+                            <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r6-o" style="table-layout: fixed; width: 100%" >
                               <tr>
-                                <td
-                                  valign="top"
-                                  class="r7-i"
-                                  style="
-                                    padding-left: 15px;
-                                    padding-right: 15px;
-                                  "
-                                >
-                                  <table
-                                    width="100%"
-                                    cellspacing="0"
-                                    cellpadding="0"
-                                    border="0"
-                                    role="presentation"
-                                  >
+                                <td valign="top" class="r7-i" style=" padding-left: 15px; padding-right: 15px; " >
+                                  <table width="100%" cellspacing="0" cellpadding="0" border="0" role="presentation" >
                                     <tr>
                                       <td class="r8-c" align="left">
-                                        <table
-                                          cellspacing="0"
-                                          cellpadding="0"
-                                          border="0"
-                                          role="presentation"
-                                          width="100%"
-                                          class="r9-o"
-                                          style="
-                                            table-layout: fixed;
-                                            width: 100%;
-                                          "
-                                        >
+                                        <table cellspacing="0" cellpadding="0" border="0" role="presentation" width="100%" class="r9-o" style=" table-layout: fixed; width: 100%; " >
                                           <tr>
-                                            <td
-                                              align="center"
-                                              valign="top"
-                                              class="r28-i nl2go-default-textstyle"
-                                              style="
-                                                color: #3b3f44;
-                                                font-family: georgia, serif;
-                                                word-break: break-word;
-                                                font-size: 18px;
-                                                line-height: 1.5;
-                                                padding-top: 5px;
-                                                text-align: center;
-                                              "
-                                            >
+                                            <td align="center" valign="top" class="r28-i nl2go-default-textstyle" style=" color: #3b3f44; font-family: georgia, serif; word-break: break-word; font-size: 18px; line-height: 1.5; padding-top: 5px; text-align: center; " >
                                               <div>
-                                                <p
-                                                  style="
-                                                    margin: 0;
-                                                    font-size: 14px;
-                                                  "
-                                                >
-                                                  <span style="font-size: 12px"
-                                                    >This email was sent to
-                                                    {{email}}. Please delete if
-                                                    you aren't the intended
-                                                    recipient.</span
-                                                  >
-                                                </p>
+                                                <p style=" margin: 0; font-size: 14px; " > <span style="font-size: 12px" >This email was sent to {{email}}. Please delete if you aren't the intended recipient.</span > </p>
                                               </div>
                                             </td>
                                           </tr>
@@ -1541,4 +295,4 @@
       </tr>
     </table>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/packages/editor/core/package.json b/packages/editor/core/package.json
index 6f2744dca8..883610ebe9 100644
--- a/packages/editor/core/package.json
+++ b/packages/editor/core/package.json
@@ -49,7 +49,7 @@
     "jsx-dom-cjs": "^8.0.3",
     "linkifyjs": "^4.1.3",
     "lowlight": "^3.0.0",
-    "lucide-react": "^0.294.0",
+    "lucide-react": "^0.378.0",
     "prosemirror-codemark": "^0.4.2",
     "react-moveable": "^0.54.2",
     "tailwind-merge": "^1.14.0",
diff --git a/packages/editor/core/src/hooks/use-editor.tsx b/packages/editor/core/src/hooks/use-editor.tsx
index a90be65f13..778fdc5e4e 100644
--- a/packages/editor/core/src/hooks/use-editor.tsx
+++ b/packages/editor/core/src/hooks/use-editor.tsx
@@ -3,7 +3,6 @@ import { useImperativeHandle, useRef, MutableRefObject, useState, useEffect } fr
 import { CoreEditorProps } from "src/ui/props";
 import { CoreEditorExtensions } from "src/ui/extensions";
 import { EditorProps } from "@tiptap/pm/view";
-import { getTrimmedHTML } from "src/lib/utils";
 import { DeleteImage } from "src/types/delete-image";
 import { IMentionHighlight, IMentionSuggestion } from "src/types/mention-suggestion";
 import { RestoreImage } from "src/types/restore-image";
@@ -86,7 +85,7 @@ export const useEditor = ({
       setSavedSelection(editor.state.selection);
     },
     onUpdate: async ({ editor }) => {
-      onChange?.(editor.getJSON(), getTrimmedHTML(editor.getHTML()));
+      onChange?.(editor.getJSON(), editor.getHTML());
     },
     onDestroy: async () => {
       handleEditorReady?.(false);
diff --git a/packages/editor/core/src/styles/editor.css b/packages/editor/core/src/styles/editor.css
index dddf54b753..5a609c3d35 100644
--- a/packages/editor/core/src/styles/editor.css
+++ b/packages/editor/core/src/styles/editor.css
@@ -72,10 +72,16 @@ ul[data-type="taskList"] li {
 }
 
 ul[data-type="taskList"] li > label {
+  position: absolute;
+  left: -5px;
   margin: 0.1rem 0.15rem 0 0;
   user-select: none;
 }
 
+ul[data-type="taskList"] li > div {
+  margin-left: 1.15rem;
+}
+
 ul[data-type="taskList"] li > label input[type="checkbox"] {
   border: 1px solid rgba(var(--color-border-300)) !important;
   outline: none;
diff --git a/packages/editor/core/src/ui/extensions/code/code-block-node-view.tsx b/packages/editor/core/src/ui/extensions/code/code-block-node-view.tsx
index f7218986b9..21fc36b39f 100644
--- a/packages/editor/core/src/ui/extensions/code/code-block-node-view.tsx
+++ b/packages/editor/core/src/ui/extensions/code/code-block-node-view.tsx
@@ -5,6 +5,7 @@ import ts from "highlight.js/lib/languages/typescript";
 import { CopyIcon, CheckIcon } from "lucide-react";
 import { Node as ProseMirrorNode } from "@tiptap/pm/model";
 import { cn } from "src/lib/utils";
+import { Tooltip } from "@plane/ui";
 
 // we just have ts support for now
 const lowlight = createLowlight(common);
@@ -30,23 +31,25 @@ export const CodeBlockComponent: React.FC<CodeBlockComponentProps> = ({ node })
   };
 
   return (
-    <NodeViewWrapper className="code-block relative">
-      <button
-        type="button"
-        className={cn(
-          "group absolute top-2 right-2 z-10 flex items-center justify-center w-8 h-8 rounded-md bg-custom-background-80 border border-custom-border-200 transition duration-150 ease-in-out",
-          {
-            "bg-green-500/10 hover:bg-green-500/10 active:bg-green-500/10": copied,
-          }
-        )}
-        onClick={copyToClipboard}
-      >
-        {copied ? (
-          <CheckIcon className="h-3 w-3 text-green-500" strokeWidth={3} />
-        ) : (
-          <CopyIcon className="h-3 w-3 text-custom-text-300 group-hover:text-custom-text-100" />
-        )}
-      </button>
+    <NodeViewWrapper className="code-block relative group/code">
+      <Tooltip tooltipContent="Copy code">
+        <button
+          type="button"
+          className={cn(
+            "group/button hidden group-hover/code:flex items-center justify-center absolute top-2 right-2 z-10 size-8 rounded-md bg-custom-background-80 border border-custom-border-200 transition duration-150 ease-in-out",
+            {
+              "bg-green-500/10 hover:bg-green-500/10 active:bg-green-500/10": copied,
+            }
+          )}
+          onClick={copyToClipboard}
+        >
+          {copied ? (
+            <CheckIcon className="h-3 w-3 text-green-500" strokeWidth={3} />
+          ) : (
+            <CopyIcon className="h-3 w-3 text-custom-text-300 group-hover/button:text-custom-text-100" />
+          )}
+        </button>
+      </Tooltip>
 
       <pre className="bg-custom-background-90 text-custom-text-100 rounded-lg p-8 pl-9 pr-4">
         <NodeViewContent as="code" className="whitespace-[pre-wrap]" />
diff --git a/packages/editor/core/src/ui/extensions/index.tsx b/packages/editor/core/src/ui/extensions/index.tsx
index f6afdfbc16..425ad89b00 100644
--- a/packages/editor/core/src/ui/extensions/index.tsx
+++ b/packages/editor/core/src/ui/extensions/index.tsx
@@ -113,7 +113,7 @@ export const CoreEditorExtensions = ({
   }),
   TaskItem.configure({
     HTMLAttributes: {
-      class: "flex",
+      class: "relative",
     },
     nested: true,
   }),
diff --git a/packages/editor/core/src/ui/read-only/extensions.tsx b/packages/editor/core/src/ui/read-only/extensions.tsx
index 33853e9b1b..3f0cd98c3c 100644
--- a/packages/editor/core/src/ui/read-only/extensions.tsx
+++ b/packages/editor/core/src/ui/read-only/extensions.tsx
@@ -79,7 +79,7 @@ export const CoreReadOnlyEditorExtensions = (mentionConfig: {
   }),
   TaskItem.configure({
     HTMLAttributes: {
-      class: "flex pointer-events-none",
+      class: "relative pointer-events-none",
     },
     nested: true,
   }),
diff --git a/packages/editor/document-editor/package.json b/packages/editor/document-editor/package.json
index c69d0c2c80..ca2e501e67 100644
--- a/packages/editor/document-editor/package.json
+++ b/packages/editor/document-editor/package.json
@@ -36,7 +36,7 @@
     "@tiptap/core": "^2.1.13",
     "@tiptap/pm": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
-    "lucide-react": "^0.309.0",
+    "lucide-react": "^0.378.0",
     "react-popper": "^2.3.0",
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.1"
diff --git a/packages/editor/extensions/package.json b/packages/editor/extensions/package.json
index dfab06cdea..8c36087291 100644
--- a/packages/editor/extensions/package.json
+++ b/packages/editor/extensions/package.json
@@ -34,7 +34,7 @@
     "@tiptap/pm": "^2.1.13",
     "@tiptap/react": "^2.1.13",
     "@tiptap/suggestion": "^2.1.13",
-    "lucide-react": "^0.294.0",
+    "lucide-react": "^0.378.0",
     "tippy.js": "^6.3.7"
   },
   "devDependencies": {
diff --git a/packages/editor/rich-text-editor/package.json b/packages/editor/rich-text-editor/package.json
index fe1f29e1d5..6e596e925b 100644
--- a/packages/editor/rich-text-editor/package.json
+++ b/packages/editor/rich-text-editor/package.json
@@ -32,7 +32,7 @@
     "@plane/editor-core": "*",
     "@plane/editor-extensions": "*",
     "@tiptap/core": "^2.1.13",
-    "lucide-react": "^0.294.0"
+    "lucide-react": "^0.378.0"
   },
   "devDependencies": {
     "@types/node": "18.15.3",
diff --git a/packages/types/src/module/module_filters.d.ts b/packages/types/src/module/module_filters.d.ts
index 297c8046cd..e22ac152a5 100644
--- a/packages/types/src/module/module_filters.d.ts
+++ b/packages/types/src/module/module_filters.d.ts
@@ -8,7 +8,8 @@ export type TModuleOrderByOptions =
   | "target_date"
   | "-target_date"
   | "created_at"
-  | "-created_at";
+  | "-created_at"
+  | "sort_order";
 
 export type TModuleLayoutOptions = "list" | "board" | "gantt";
 
diff --git a/space/package.json b/space/package.json
index 9b05e573e9..c9c69512f2 100644
--- a/space/package.json
+++ b/space/package.json
@@ -29,7 +29,7 @@
     "dotenv": "^16.3.1",
     "js-cookie": "^3.0.1",
     "lowlight": "^2.9.0",
-    "lucide-react": "^0.294.0",
+    "lucide-react": "^0.378.0",
     "mobx": "^6.10.0",
     "mobx-react-lite": "^4.0.3",
     "next": "^14.0.3",
diff --git a/web/components/command-palette/command-palette.tsx b/web/components/command-palette/command-palette.tsx
index 00de628b7d..37056a96f2 100644
--- a/web/components/command-palette/command-palette.tsx
+++ b/web/components/command-palette/command-palette.tsx
@@ -200,6 +200,11 @@ export const CommandPalette: FC = observer(() => {
 
       const keyPressed = key.toLowerCase();
       const cmdClicked = ctrlKey || metaKey;
+
+      if (cmdClicked && keyPressed === "k" && !isAnyModalOpen) {
+        e.preventDefault();
+        toggleCommandPaletteModal(true);
+      }
       // if on input, textarea or editor, don't do anything
       if (
         e.target instanceof HTMLTextAreaElement ||
@@ -209,10 +214,7 @@ export const CommandPalette: FC = observer(() => {
         return;
 
       if (cmdClicked) {
-        if (keyPressed === "k") {
-          e.preventDefault();
-          toggleCommandPaletteModal(true);
-        } else if (keyPressed === "c" && altKey) {
+        if (keyPressed === "c" && altKey) {
           e.preventDefault();
           copyIssueUrlToClipboard();
         } else if (keyPressed === "b") {
diff --git a/web/components/cycles/cycles-view.tsx b/web/components/cycles/cycles-view.tsx
index ddb45b5e52..7f71892e99 100644
--- a/web/components/cycles/cycles-view.tsx
+++ b/web/components/cycles/cycles-view.tsx
@@ -26,7 +26,7 @@ export const CyclesView: FC<ICyclesView> = observer((props) => {
   const { getFilteredCycleIds, getFilteredCompletedCycleIds, loader } = useCycle();
   const { searchQuery } = useCycleFilter();
   // derived values
-  const filteredCycleIds = getFilteredCycleIds(projectId);
+  const filteredCycleIds = getFilteredCycleIds(projectId, layout === "gantt");
   const filteredCompletedCycleIds = getFilteredCompletedCycleIds(projectId);
 
   if (loader || !filteredCycleIds)
diff --git a/web/components/cycles/gantt-chart/cycles-list-layout.tsx b/web/components/cycles/gantt-chart/cycles-list-layout.tsx
index 6d84f73f06..e4d85cf4bf 100644
--- a/web/components/cycles/gantt-chart/cycles-list-layout.tsx
+++ b/web/components/cycles/gantt-chart/cycles-list-layout.tsx
@@ -61,7 +61,7 @@ export const CyclesListGanttChartView: FC<Props> = observer((props) => {
         enableBlockLeftResize={false}
         enableBlockRightResize={false}
         enableBlockMove={false}
-        enableReorder={false}
+        enableReorder
       />
     </div>
   );
diff --git a/web/components/gantt-chart/chart/main-content.tsx b/web/components/gantt-chart/chart/main-content.tsx
index 99ea6c94e9..2f5abc8863 100644
--- a/web/components/gantt-chart/chart/main-content.tsx
+++ b/web/components/gantt-chart/chart/main-content.tsx
@@ -1,4 +1,6 @@
-import { useRef } from "react";
+import { useEffect, useRef } from "react";
+import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
+import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
 import { observer } from "mobx-react";
 // hooks
 // components
@@ -62,6 +64,20 @@ export const GanttChartMainContent: React.FC<Props> = observer((props) => {
   const ganttContainerRef = useRef<HTMLDivElement>(null);
   // chart hook
   const { currentView, currentViewData } = useGanttChart();
+
+  // Enable Auto Scroll for Ganttlist
+  useEffect(() => {
+    const element = ganttContainerRef.current;
+
+    if (!element) return;
+
+    return combine(
+      autoScrollForElements({
+        element,
+        getAllowedAxis: () => "vertical",
+      })
+    );
+  }, [ganttContainerRef?.current]);
   // handling scroll functionality
   const onScroll = (e: React.UIEvent<HTMLDivElement, UIEvent>) => {
     const { clientWidth, scrollLeft, scrollWidth } = e.currentTarget;
diff --git a/web/components/gantt-chart/sidebar/cycles/block.tsx b/web/components/gantt-chart/sidebar/cycles/block.tsx
index e9543e3672..1119e2e9ca 100644
--- a/web/components/gantt-chart/sidebar/cycles/block.tsx
+++ b/web/components/gantt-chart/sidebar/cycles/block.tsx
@@ -1,4 +1,4 @@
-import { DraggableProvided, DraggableStateSnapshot } from "@hello-pangea/dnd";
+import { MutableRefObject } from "react";
 import { observer } from "mobx-react";
 import { MoreVertical } from "lucide-react";
 // hooks
@@ -16,12 +16,12 @@ import { findTotalDaysInRange } from "@/helpers/date-time.helper";
 type Props = {
   block: IGanttBlock;
   enableReorder: boolean;
-  provided: DraggableProvided;
-  snapshot: DraggableStateSnapshot;
+  isDragging: boolean;
+  dragHandleRef: MutableRefObject<HTMLButtonElement | null>;
 };
 
 export const CyclesSidebarBlock: React.FC<Props> = observer((props) => {
-  const { block, enableReorder, provided, snapshot } = props;
+  const { block, enableReorder, isDragging, dragHandleRef } = props;
   // store hooks
   const { updateActiveBlockId, isBlockActive } = useGanttChart();
 
@@ -30,12 +30,10 @@ export const CyclesSidebarBlock: React.FC<Props> = observer((props) => {
   return (
     <div
       className={cn({
-        "rounded bg-custom-background-80": snapshot.isDragging,
+        "rounded bg-custom-background-80": isDragging,
       })}
       onMouseEnter={() => updateActiveBlockId(block.id)}
       onMouseLeave={() => updateActiveBlockId(null)}
-      ref={provided.innerRef}
-      {...provided.draggableProps}
     >
       <div
         id={`sidebar-block-${block.id}`}
@@ -50,7 +48,7 @@ export const CyclesSidebarBlock: React.FC<Props> = observer((props) => {
           <button
             type="button"
             className="flex flex-shrink-0 rounded p-0.5 text-custom-sidebar-text-200 opacity-0 group-hover:opacity-100"
-            {...provided.dragHandleProps}
+            ref={dragHandleRef}
           >
             <MoreVertical className="h-3.5 w-3.5" />
             <MoreVertical className="-ml-5 h-3.5 w-3.5" />
diff --git a/web/components/gantt-chart/sidebar/cycles/sidebar.tsx b/web/components/gantt-chart/sidebar/cycles/sidebar.tsx
index dd33419d7f..e0bee915b6 100644
--- a/web/components/gantt-chart/sidebar/cycles/sidebar.tsx
+++ b/web/components/gantt-chart/sidebar/cycles/sidebar.tsx
@@ -1,8 +1,10 @@
-import { DragDropContext, Draggable, DropResult, Droppable } from "@hello-pangea/dnd";
+import { MutableRefObject } from "react";
 // ui
 import { Loader } from "@plane/ui";
 // components
 import { IBlockUpdateData, IGanttBlock } from "@/components/gantt-chart/types";
+import { GanttDnDHOC } from "../gantt-dnd-HOC";
+import { handleOrderChange } from "../utils";
 import { CyclesSidebarBlock } from "./block";
 // types
 
@@ -16,85 +18,43 @@ type Props = {
 export const CycleGanttSidebar: React.FC<Props> = (props) => {
   const { blockUpdateHandler, blocks, enableReorder } = props;
 
-  const handleOrderChange = (result: DropResult) => {
-    if (!blocks) return;
-
-    const { source, destination } = result;
-
-    // return if dropped outside the list
-    if (!destination) return;
-
-    // return if dropped on the same index
-    if (source.index === destination.index) return;
-
-    let updatedSortOrder = blocks[source.index].sort_order;
-
-    // update the sort order to the lowest if dropped at the top
-    if (destination.index === 0) updatedSortOrder = blocks[0].sort_order - 1000;
-    // update the sort order to the highest if dropped at the bottom
-    else if (destination.index === blocks.length - 1) updatedSortOrder = blocks[blocks.length - 1].sort_order + 1000;
-    // update the sort order to the average of the two adjacent blocks if dropped in between
-    else {
-      const destinationSortingOrder = blocks[destination.index].sort_order;
-      const relativeDestinationSortingOrder =
-        source.index < destination.index
-          ? blocks[destination.index + 1].sort_order
-          : blocks[destination.index - 1].sort_order;
-
-      updatedSortOrder = (destinationSortingOrder + relativeDestinationSortingOrder) / 2;
-    }
-
-    // extract the element from the source index and insert it at the destination index without updating the entire array
-    const removedElement = blocks.splice(source.index, 1)[0];
-    blocks.splice(destination.index, 0, removedElement);
-
-    // call the block update handler with the updated sort order, new and old index
-    blockUpdateHandler(removedElement.data, {
-      sort_order: {
-        destinationIndex: destination.index,
-        newSortOrder: updatedSortOrder,
-        sourceIndex: source.index,
-      },
-    });
+  const handleOnDrop = (
+    draggingBlockId: string | undefined,
+    droppedBlockId: string | undefined,
+    dropAtEndOfList: boolean
+  ) => {
+    handleOrderChange(draggingBlockId, droppedBlockId, dropAtEndOfList, blocks, blockUpdateHandler);
   };
 
   return (
-    <DragDropContext onDragEnd={handleOrderChange}>
-      <Droppable droppableId="gantt-sidebar">
-        {(droppableProvided) => (
-          <div className="h-full" ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
-            <>
-              {blocks ? (
-                blocks.map((block, index) => (
-                  <Draggable
-                    key={`sidebar-block-${block.id}`}
-                    draggableId={`sidebar-block-${block.id}`}
-                    index={index}
-                    isDragDisabled={!enableReorder}
-                  >
-                    {(provided, snapshot) => (
-                      <CyclesSidebarBlock
-                        block={block}
-                        enableReorder={enableReorder}
-                        provided={provided}
-                        snapshot={snapshot}
-                      />
-                    )}
-                  </Draggable>
-                ))
-              ) : (
-                <Loader className="space-y-3 pr-2">
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                </Loader>
-              )}
-              {droppableProvided.placeholder}
-            </>
-          </div>
-        )}
-      </Droppable>
-    </DragDropContext>
+    <div className="h-full">
+      {blocks ? (
+        blocks.map((block, index) => (
+          <GanttDnDHOC
+            key={block.id}
+            id={block.id}
+            isLastChild={index === blocks.length - 1}
+            isDragEnabled={enableReorder}
+            onDrop={handleOnDrop}
+          >
+            {(isDragging: boolean, dragHandleRef: MutableRefObject<HTMLButtonElement | null>) => (
+              <CyclesSidebarBlock
+                block={block}
+                enableReorder={enableReorder}
+                isDragging={isDragging}
+                dragHandleRef={dragHandleRef}
+              />
+            )}
+          </GanttDnDHOC>
+        ))
+      ) : (
+        <Loader className="space-y-3 pr-2">
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+        </Loader>
+      )}
+    </div>
   );
 };
diff --git a/web/components/gantt-chart/sidebar/gantt-dnd-HOC.tsx b/web/components/gantt-chart/sidebar/gantt-dnd-HOC.tsx
new file mode 100644
index 0000000000..a337a9fa8a
--- /dev/null
+++ b/web/components/gantt-chart/sidebar/gantt-dnd-HOC.tsx
@@ -0,0 +1,104 @@
+import { MutableRefObject, useEffect, useRef, useState } from "react";
+import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
+import { draggable, dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
+import { attachInstruction, extractInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item";
+import { observer } from "mobx-react";
+import { DropIndicator } from "@plane/ui";
+import { HIGHLIGHT_WITH_LINE, highlightIssueOnDrop } from "@/components/issues/issue-layouts/utils";
+import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
+
+type Props = {
+  id: string;
+  isLastChild: boolean;
+  isDragEnabled: boolean;
+  children: (isDragging: boolean, dragHandleRef: MutableRefObject<HTMLButtonElement | null>) => JSX.Element;
+  onDrop: (draggingBlockId: string | undefined, droppedBlockId: string | undefined, dropAtEndOfList: boolean) => void;
+};
+
+export const GanttDnDHOC = observer((props: Props) => {
+  const { id, isLastChild, children, onDrop, isDragEnabled } = props;
+  // states
+  const [isDragging, setIsDragging] = useState(false);
+  const [instruction, setInstruction] = useState<"DRAG_OVER" | "DRAG_BELOW" | undefined>(undefined);
+  // refs
+  const blockRef = useRef<HTMLDivElement | null>(null);
+  const dragHandleRef = useRef<HTMLButtonElement | null>(null);
+
+  useEffect(() => {
+    const element = blockRef.current;
+    const dragHandleElement = dragHandleRef.current;
+
+    if (!element) return;
+
+    return combine(
+      draggable({
+        element,
+        canDrag: () => isDragEnabled,
+        dragHandle: dragHandleElement ?? undefined,
+        getInitialData: () => ({ id }),
+        onDragStart: () => {
+          setIsDragging(true);
+        },
+        onDrop: () => {
+          setIsDragging(false);
+        },
+      }),
+      dropTargetForElements({
+        element,
+        canDrop: ({ source }) => source?.data?.id !== id,
+        getData: ({ input, element }) => {
+          const data = { id };
+
+          // attach instruction for last in list
+          return attachInstruction(data, {
+            input,
+            element,
+            currentLevel: 0,
+            indentPerLevel: 0,
+            mode: isLastChild ? "last-in-group" : "standard",
+          });
+        },
+        onDrag: ({ self }) => {
+          const extractedInstruction = extractInstruction(self?.data)?.type;
+          // check if the highlight is to be shown above or below
+          setInstruction(
+            extractedInstruction
+              ? extractedInstruction === "reorder-below" && isLastChild
+                ? "DRAG_BELOW"
+                : "DRAG_OVER"
+              : undefined
+          );
+        },
+        onDragLeave: () => {
+          setInstruction(undefined);
+        },
+        onDrop: ({ self, source }) => {
+          setInstruction(undefined);
+          const extractedInstruction = extractInstruction(self?.data)?.type;
+          const currentInstruction = extractedInstruction
+            ? extractedInstruction === "reorder-below" && isLastChild
+              ? "DRAG_BELOW"
+              : "DRAG_OVER"
+            : undefined;
+          if (!currentInstruction) return;
+
+          const sourceId = source?.data?.id as string | undefined;
+          const destinationId = self?.data?.id as string | undefined;
+
+          onDrop(sourceId, destinationId, currentInstruction === "DRAG_BELOW");
+          highlightIssueOnDrop(source?.element?.id, false, true);
+        },
+      })
+    );
+  }, [blockRef?.current, dragHandleRef?.current, isLastChild, onDrop]);
+
+  useOutsideClickDetector(blockRef, () => blockRef?.current?.classList?.remove(HIGHLIGHT_WITH_LINE));
+
+  return (
+    <div id={`issue-draggable-${id}`} className={"relative"} ref={blockRef}>
+      <DropIndicator classNames="absolute top-0" isVisible={instruction === "DRAG_OVER"} />
+      {children(isDragging, dragHandleRef)}
+      {isLastChild && <DropIndicator isVisible={instruction === "DRAG_BELOW"} />}
+    </div>
+  );
+});
diff --git a/web/components/gantt-chart/sidebar/index.ts b/web/components/gantt-chart/sidebar/index.ts
index 8a068a7c50..ef9bfb5cbf 100644
--- a/web/components/gantt-chart/sidebar/index.ts
+++ b/web/components/gantt-chart/sidebar/index.ts
@@ -1,5 +1,4 @@
 export * from "./cycles";
 export * from "./issues";
 export * from "./modules";
-export * from "./project-views";
 export * from "./root";
diff --git a/web/components/gantt-chart/sidebar/issues/block.tsx b/web/components/gantt-chart/sidebar/issues/block.tsx
index bd84af92c4..6fbd6cbc2b 100644
--- a/web/components/gantt-chart/sidebar/issues/block.tsx
+++ b/web/components/gantt-chart/sidebar/issues/block.tsx
@@ -1,4 +1,4 @@
-import { DraggableProvided, DraggableStateSnapshot } from "@hello-pangea/dnd";
+import React, { MutableRefObject } from "react";
 import { observer } from "mobx-react";
 import { MoreVertical } from "lucide-react";
 // hooks
@@ -17,12 +17,12 @@ import { IGanttBlock } from "../../types";
 type Props = {
   block: IGanttBlock;
   enableReorder: boolean;
-  provided: DraggableProvided;
-  snapshot: DraggableStateSnapshot;
+  isDragging: boolean;
+  dragHandleRef: MutableRefObject<HTMLButtonElement | null>;
 };
 
-export const IssuesSidebarBlock: React.FC<Props> = observer((props) => {
-  const { block, enableReorder, provided, snapshot } = props;
+export const IssuesSidebarBlock = observer((props: Props) => {
+  const { block, enableReorder, isDragging, dragHandleRef } = props;
   // store hooks
   const { updateActiveBlockId, isBlockActive } = useGanttChart();
   const { getIsIssuePeeked } = useIssueDetail();
@@ -32,15 +32,13 @@ export const IssuesSidebarBlock: React.FC<Props> = observer((props) => {
   return (
     <div
       className={cn({
-        "rounded bg-custom-background-80": snapshot.isDragging,
+        "rounded bg-custom-background-80": isDragging,
         "rounded-l border border-r-0 border-custom-primary-70 hover:border-custom-primary-70": getIsIssuePeeked(
           block.data.id
         ),
       })}
       onMouseEnter={() => updateActiveBlockId(block.id)}
       onMouseLeave={() => updateActiveBlockId(null)}
-      ref={provided.innerRef}
-      {...provided.draggableProps}
     >
       <div
         className={cn("group w-full flex items-center gap-2 pl-2 pr-4", {
@@ -54,7 +52,7 @@ export const IssuesSidebarBlock: React.FC<Props> = observer((props) => {
           <button
             type="button"
             className="flex flex-shrink-0 rounded p-0.5 text-custom-sidebar-text-200 opacity-0 group-hover:opacity-100"
-            {...provided.dragHandleProps}
+            ref={dragHandleRef}
           >
             <MoreVertical className="h-3.5 w-3.5" />
             <MoreVertical className="-ml-5 h-3.5 w-3.5" />
diff --git a/web/components/gantt-chart/sidebar/issues/sidebar.tsx b/web/components/gantt-chart/sidebar/issues/sidebar.tsx
index 7528333f0c..7da30216d4 100644
--- a/web/components/gantt-chart/sidebar/issues/sidebar.tsx
+++ b/web/components/gantt-chart/sidebar/issues/sidebar.tsx
@@ -1,9 +1,11 @@
-import { DragDropContext, Draggable, Droppable, DropResult } from "@hello-pangea/dnd";
+import { MutableRefObject } from "react";
 // components
 // ui
 import { Loader } from "@plane/ui";
 // types
 import { IGanttBlock, IBlockUpdateData } from "@/components/gantt-chart/types";
+import { GanttDnDHOC } from "../gantt-dnd-HOC";
+import { handleOrderChange } from "../utils";
 import { IssuesSidebarBlock } from "./block";
 
 type Props = {
@@ -16,92 +18,50 @@ type Props = {
 export const IssueGanttSidebar: React.FC<Props> = (props) => {
   const { blockUpdateHandler, blocks, enableReorder, showAllBlocks = false } = props;
 
-  const handleOrderChange = (result: DropResult) => {
-    if (!blocks) return;
-
-    const { source, destination } = result;
-
-    // return if dropped outside the list
-    if (!destination) return;
-
-    // return if dropped on the same index
-    if (source.index === destination.index) return;
-
-    let updatedSortOrder = blocks[source.index].sort_order;
-
-    // update the sort order to the lowest if dropped at the top
-    if (destination.index === 0) updatedSortOrder = blocks[0].sort_order - 1000;
-    // update the sort order to the highest if dropped at the bottom
-    else if (destination.index === blocks.length - 1) updatedSortOrder = blocks[blocks.length - 1].sort_order + 1000;
-    // update the sort order to the average of the two adjacent blocks if dropped in between
-    else {
-      const destinationSortingOrder = blocks[destination.index].sort_order;
-      const relativeDestinationSortingOrder =
-        source.index < destination.index
-          ? blocks[destination.index + 1].sort_order
-          : blocks[destination.index - 1].sort_order;
-
-      updatedSortOrder = (destinationSortingOrder + relativeDestinationSortingOrder) / 2;
-    }
-
-    // extract the element from the source index and insert it at the destination index without updating the entire array
-    const removedElement = blocks.splice(source.index, 1)[0];
-    blocks.splice(destination.index, 0, removedElement);
-
-    // call the block update handler with the updated sort order, new and old index
-    blockUpdateHandler(removedElement.data, {
-      sort_order: {
-        destinationIndex: destination.index,
-        newSortOrder: updatedSortOrder,
-        sourceIndex: source.index,
-      },
-    });
+  const handleOnDrop = (
+    draggingBlockId: string | undefined,
+    droppedBlockId: string | undefined,
+    dropAtEndOfList: boolean
+  ) => {
+    handleOrderChange(draggingBlockId, droppedBlockId, dropAtEndOfList, blocks, blockUpdateHandler);
   };
 
   return (
-    <DragDropContext onDragEnd={handleOrderChange}>
-      <Droppable droppableId="gantt-sidebar">
-        {(droppableProvided) => (
-          <div ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
-            <>
-              {blocks ? (
-                blocks.map((block, index) => {
-                  const isBlockVisibleOnSidebar = block.start_date && block.target_date;
+    <div>
+      {blocks ? (
+        blocks.map((block, index) => {
+          const isBlockVisibleOnSidebar = block.start_date && block.target_date;
 
-                  // hide the block if it doesn't have start and target dates and showAllBlocks is false
-                  if (!showAllBlocks && !isBlockVisibleOnSidebar) return;
+          // hide the block if it doesn't have start and target dates and showAllBlocks is false
+          if (!showAllBlocks && !isBlockVisibleOnSidebar) return;
 
-                  return (
-                    <Draggable
-                      key={`sidebar-block-${block.id}`}
-                      draggableId={`sidebar-block-${block.id}`}
-                      index={index}
-                      isDragDisabled={!enableReorder}
-                    >
-                      {(provided, snapshot) => (
-                        <IssuesSidebarBlock
-                          block={block}
-                          enableReorder={enableReorder}
-                          provided={provided}
-                          snapshot={snapshot}
-                        />
-                      )}
-                    </Draggable>
-                  );
-                })
-              ) : (
-                <Loader className="space-y-3 pr-2">
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                </Loader>
+          return (
+            <GanttDnDHOC
+              key={block.id}
+              id={block.id}
+              isLastChild={index === blocks.length - 1}
+              isDragEnabled={enableReorder}
+              onDrop={handleOnDrop}
+            >
+              {(isDragging: boolean, dragHandleRef: MutableRefObject<HTMLButtonElement | null>) => (
+                <IssuesSidebarBlock
+                  block={block}
+                  enableReorder={enableReorder}
+                  isDragging={isDragging}
+                  dragHandleRef={dragHandleRef}
+                />
               )}
-              {droppableProvided.placeholder}
-            </>
-          </div>
-        )}
-      </Droppable>
-    </DragDropContext>
+            </GanttDnDHOC>
+          );
+        })
+      ) : (
+        <Loader className="space-y-3 pr-2">
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+        </Loader>
+      )}
+    </div>
   );
 };
diff --git a/web/components/gantt-chart/sidebar/modules/block.tsx b/web/components/gantt-chart/sidebar/modules/block.tsx
index 525d217169..e79a654019 100644
--- a/web/components/gantt-chart/sidebar/modules/block.tsx
+++ b/web/components/gantt-chart/sidebar/modules/block.tsx
@@ -1,4 +1,4 @@
-import { DraggableProvided, DraggableStateSnapshot } from "@hello-pangea/dnd";
+import { MutableRefObject } from "react";
 import { observer } from "mobx-react";
 import { MoreVertical } from "lucide-react";
 // hooks
@@ -16,12 +16,12 @@ import { findTotalDaysInRange } from "@/helpers/date-time.helper";
 type Props = {
   block: IGanttBlock;
   enableReorder: boolean;
-  provided: DraggableProvided;
-  snapshot: DraggableStateSnapshot;
+  isDragging: boolean;
+  dragHandleRef: MutableRefObject<HTMLButtonElement | null>;
 };
 
 export const ModulesSidebarBlock: React.FC<Props> = observer((props) => {
-  const { block, enableReorder, provided, snapshot } = props;
+  const { block, enableReorder, isDragging, dragHandleRef } = props;
   // store hooks
   const { updateActiveBlockId, isBlockActive } = useGanttChart();
 
@@ -30,12 +30,10 @@ export const ModulesSidebarBlock: React.FC<Props> = observer((props) => {
   return (
     <div
       className={cn({
-        "rounded bg-custom-background-80": snapshot.isDragging,
+        "rounded bg-custom-background-80": isDragging,
       })}
       onMouseEnter={() => updateActiveBlockId(block.id)}
       onMouseLeave={() => updateActiveBlockId(null)}
-      ref={provided.innerRef}
-      {...provided.draggableProps}
     >
       <div
         id={`sidebar-block-${block.id}`}
@@ -50,7 +48,7 @@ export const ModulesSidebarBlock: React.FC<Props> = observer((props) => {
           <button
             type="button"
             className="flex flex-shrink-0 rounded p-0.5 text-custom-sidebar-text-200 opacity-0 group-hover:opacity-100"
-            {...provided.dragHandleProps}
+            ref={dragHandleRef}
           >
             <MoreVertical className="h-3.5 w-3.5" />
             <MoreVertical className="-ml-5 h-3.5 w-3.5" />
diff --git a/web/components/gantt-chart/sidebar/modules/sidebar.tsx b/web/components/gantt-chart/sidebar/modules/sidebar.tsx
index fd9478ffe9..e162d25170 100644
--- a/web/components/gantt-chart/sidebar/modules/sidebar.tsx
+++ b/web/components/gantt-chart/sidebar/modules/sidebar.tsx
@@ -1,8 +1,10 @@
-import { DragDropContext, Draggable, Droppable, DropResult } from "@hello-pangea/dnd";
+import { MutableRefObject } from "react";
 // ui
 import { Loader } from "@plane/ui";
 // components
 import { IBlockUpdateData, IGanttBlock } from "@/components/gantt-chart";
+import { GanttDnDHOC } from "../gantt-dnd-HOC";
+import { handleOrderChange } from "../utils";
 import { ModulesSidebarBlock } from "./block";
 // types
 
@@ -16,85 +18,43 @@ type Props = {
 export const ModuleGanttSidebar: React.FC<Props> = (props) => {
   const { blockUpdateHandler, blocks, enableReorder } = props;
 
-  const handleOrderChange = (result: DropResult) => {
-    if (!blocks) return;
-
-    const { source, destination } = result;
-
-    // return if dropped outside the list
-    if (!destination) return;
-
-    // return if dropped on the same index
-    if (source.index === destination.index) return;
-
-    let updatedSortOrder = blocks[source.index].sort_order;
-
-    // update the sort order to the lowest if dropped at the top
-    if (destination.index === 0) updatedSortOrder = blocks[0].sort_order - 1000;
-    // update the sort order to the highest if dropped at the bottom
-    else if (destination.index === blocks.length - 1) updatedSortOrder = blocks[blocks.length - 1].sort_order + 1000;
-    // update the sort order to the average of the two adjacent blocks if dropped in between
-    else {
-      const destinationSortingOrder = blocks[destination.index].sort_order;
-      const relativeDestinationSortingOrder =
-        source.index < destination.index
-          ? blocks[destination.index + 1].sort_order
-          : blocks[destination.index - 1].sort_order;
-
-      updatedSortOrder = (destinationSortingOrder + relativeDestinationSortingOrder) / 2;
-    }
-
-    // extract the element from the source index and insert it at the destination index without updating the entire array
-    const removedElement = blocks.splice(source.index, 1)[0];
-    blocks.splice(destination.index, 0, removedElement);
-
-    // call the block update handler with the updated sort order, new and old index
-    blockUpdateHandler(removedElement.data, {
-      sort_order: {
-        destinationIndex: destination.index,
-        newSortOrder: updatedSortOrder,
-        sourceIndex: source.index,
-      },
-    });
+  const handleOnDrop = (
+    draggingBlockId: string | undefined,
+    droppedBlockId: string | undefined,
+    dropAtEndOfList: boolean
+  ) => {
+    handleOrderChange(draggingBlockId, droppedBlockId, dropAtEndOfList, blocks, blockUpdateHandler);
   };
 
   return (
-    <DragDropContext onDragEnd={handleOrderChange}>
-      <Droppable droppableId="gantt-sidebar">
-        {(droppableProvided) => (
-          <div className="h-full" ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
-            <>
-              {blocks ? (
-                blocks.map((block, index) => (
-                  <Draggable
-                    key={`sidebar-block-${block.id}`}
-                    draggableId={`sidebar-block-${block.id}`}
-                    index={index}
-                    isDragDisabled={!enableReorder}
-                  >
-                    {(provided, snapshot) => (
-                      <ModulesSidebarBlock
-                        block={block}
-                        enableReorder={enableReorder}
-                        provided={provided}
-                        snapshot={snapshot}
-                      />
-                    )}
-                  </Draggable>
-                ))
-              ) : (
-                <Loader className="space-y-3 pr-2">
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                </Loader>
-              )}
-              {droppableProvided.placeholder}
-            </>
-          </div>
-        )}
-      </Droppable>
-    </DragDropContext>
+    <div className="h-full">
+      {blocks ? (
+        blocks.map((block, index) => (
+          <GanttDnDHOC
+            key={block.id}
+            id={block.id}
+            isLastChild={index === blocks.length - 1}
+            isDragEnabled={enableReorder}
+            onDrop={handleOnDrop}
+          >
+            {(isDragging: boolean, dragHandleRef: MutableRefObject<HTMLButtonElement | null>) => (
+              <ModulesSidebarBlock
+                block={block}
+                enableReorder={enableReorder}
+                isDragging={isDragging}
+                dragHandleRef={dragHandleRef}
+              />
+            )}
+          </GanttDnDHOC>
+        ))
+      ) : (
+        <Loader className="space-y-3 pr-2">
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+          <Loader.Item height="34px" />
+        </Loader>
+      )}
+    </div>
   );
 };
diff --git a/web/components/gantt-chart/sidebar/project-views.tsx b/web/components/gantt-chart/sidebar/project-views.tsx
deleted file mode 100644
index d46acfe29a..0000000000
--- a/web/components/gantt-chart/sidebar/project-views.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { DragDropContext, Draggable, Droppable, DropResult } from "@hello-pangea/dnd";
-// ui
-import { Loader } from "@plane/ui";
-// components
-import { IBlockUpdateData, IGanttBlock } from "@/components/gantt-chart/types";
-import { IssuesSidebarBlock } from "./issues/block";
-// types
-
-type Props = {
-  title: string;
-  blockUpdateHandler: (block: any, payload: IBlockUpdateData) => void;
-  blocks: IGanttBlock[] | null;
-  enableReorder: boolean;
-  enableQuickIssueCreate?: boolean;
-};
-
-export const ProjectViewGanttSidebar: React.FC<Props> = (props) => {
-  const { blockUpdateHandler, blocks, enableReorder } = props;
-
-  const handleOrderChange = (result: DropResult) => {
-    if (!blocks) return;
-
-    const { source, destination } = result;
-
-    // return if dropped outside the list
-    if (!destination) return;
-
-    // return if dropped on the same index
-    if (source.index === destination.index) return;
-
-    let updatedSortOrder = blocks[source.index].sort_order;
-
-    // update the sort order to the lowest if dropped at the top
-    if (destination.index === 0) updatedSortOrder = blocks[0].sort_order - 1000;
-    // update the sort order to the highest if dropped at the bottom
-    else if (destination.index === blocks.length - 1) updatedSortOrder = blocks[blocks.length - 1].sort_order + 1000;
-    // update the sort order to the average of the two adjacent blocks if dropped in between
-    else {
-      const destinationSortingOrder = blocks[destination.index].sort_order;
-      const relativeDestinationSortingOrder =
-        source.index < destination.index
-          ? blocks[destination.index + 1].sort_order
-          : blocks[destination.index - 1].sort_order;
-
-      updatedSortOrder = (destinationSortingOrder + relativeDestinationSortingOrder) / 2;
-    }
-
-    // extract the element from the source index and insert it at the destination index without updating the entire array
-    const removedElement = blocks.splice(source.index, 1)[0];
-    blocks.splice(destination.index, 0, removedElement);
-
-    // call the block update handler with the updated sort order, new and old index
-    blockUpdateHandler(removedElement.data, {
-      sort_order: {
-        destinationIndex: destination.index,
-        newSortOrder: updatedSortOrder,
-        sourceIndex: source.index,
-      },
-    });
-  };
-
-  return (
-    <DragDropContext onDragEnd={handleOrderChange}>
-      <Droppable droppableId="gantt-sidebar">
-        {(droppableProvided) => (
-          <div
-            className="mt-3 max-h-full overflow-y-auto pl-2.5"
-            ref={droppableProvided.innerRef}
-            {...droppableProvided.droppableProps}
-          >
-            <>
-              {blocks ? (
-                blocks.map((block, index) => (
-                  <Draggable
-                    key={`sidebar-block-${block.id}`}
-                    draggableId={`sidebar-block-${block.id}`}
-                    index={index}
-                    isDragDisabled={!enableReorder}
-                  >
-                    {(provided, snapshot) => (
-                      <IssuesSidebarBlock
-                        block={block}
-                        enableReorder={enableReorder}
-                        provided={provided}
-                        snapshot={snapshot}
-                      />
-                    )}
-                  </Draggable>
-                ))
-              ) : (
-                <Loader className="space-y-3 pr-2">
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                  <Loader.Item height="34px" />
-                </Loader>
-              )}
-              {droppableProvided.placeholder}
-            </>
-          </div>
-        )}
-      </Droppable>
-    </DragDropContext>
-  );
-};
diff --git a/web/components/gantt-chart/sidebar/root.tsx b/web/components/gantt-chart/sidebar/root.tsx
index 287a668066..762e741c73 100644
--- a/web/components/gantt-chart/sidebar/root.tsx
+++ b/web/components/gantt-chart/sidebar/root.tsx
@@ -34,7 +34,7 @@ export const GanttChartSidebar: React.FC<Props> = (props) => {
         <h6>Duration</h6>
       </div>
 
-      <div className="min-h-full h-max bg-custom-background-100 overflow-x-hidden overflow-y-auto">
+      <div className="min-h-full h-max bg-custom-background-100 overflow-hidden">
         {sidebarToRender && sidebarToRender({ title, blockUpdateHandler, blocks, enableReorder })}
       </div>
       {quickAdd ? quickAdd : null}
diff --git a/web/components/gantt-chart/sidebar/utils.ts b/web/components/gantt-chart/sidebar/utils.ts
new file mode 100644
index 0000000000..765c0357fe
--- /dev/null
+++ b/web/components/gantt-chart/sidebar/utils.ts
@@ -0,0 +1,42 @@
+import { IBlockUpdateData, IGanttBlock } from "../types";
+
+export const handleOrderChange = (
+  draggingBlockId: string | undefined,
+  droppedBlockId: string | undefined,
+  dropAtEndOfList: boolean,
+  blocks: IGanttBlock[] | null,
+  blockUpdateHandler: (block: any, payload: IBlockUpdateData) => void
+) => {
+  if (!blocks || !draggingBlockId || !droppedBlockId) return;
+
+  const sourceBlockIndex = blocks.findIndex((block) => block.id === draggingBlockId);
+  const destinationBlockIndex = dropAtEndOfList
+    ? blocks.length
+    : blocks.findIndex((block) => block.id === droppedBlockId);
+
+  // return if dropped outside the list
+  if (sourceBlockIndex === -1 || destinationBlockIndex === -1 || sourceBlockIndex === destinationBlockIndex) return;
+
+  let updatedSortOrder = blocks[sourceBlockIndex].sort_order;
+
+  // update the sort order to the lowest if dropped at the top
+  if (destinationBlockIndex === 0) updatedSortOrder = blocks[0].sort_order - 1000;
+  // update the sort order to the highest if dropped at the bottom
+  else if (destinationBlockIndex === blocks.length) updatedSortOrder = blocks[blocks.length - 1].sort_order + 1000;
+  // update the sort order to the average of the two adjacent blocks if dropped in between
+  else {
+    const destinationSortingOrder = blocks[destinationBlockIndex].sort_order;
+    const relativeDestinationSortingOrder = blocks[destinationBlockIndex - 1].sort_order;
+
+    updatedSortOrder = (destinationSortingOrder + relativeDestinationSortingOrder) / 2;
+  }
+
+  // call the block update handler with the updated sort order, new and old index
+  blockUpdateHandler(blocks[sourceBlockIndex].data, {
+    sort_order: {
+      destinationIndex: destinationBlockIndex,
+      newSortOrder: updatedSortOrder,
+      sourceIndex: sourceBlockIndex,
+    },
+  });
+};
diff --git a/web/components/inbox/content/root.tsx b/web/components/inbox/content/root.tsx
index 7874b74a51..0049807cd5 100644
--- a/web/components/inbox/content/root.tsx
+++ b/web/components/inbox/content/root.tsx
@@ -30,7 +30,11 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
       : null,
     workspaceSlug && projectId && inboxIssueId
       ? () => fetchInboxIssueById(workspaceSlug, projectId, inboxIssueId)
-      : null
+      : null,
+    {
+      revalidateOnFocus: false,
+      revalidateIfStale: false,
+    }
   );
 
   const isEditable = !!currentProjectRole && currentProjectRole >= EUserProjectRoles.MEMBER;
diff --git a/web/components/inbox/inbox-filter/applied-filters/state.tsx b/web/components/inbox/inbox-filter/applied-filters/state.tsx
index e4f7f5fbdb..0a4d39c17e 100644
--- a/web/components/inbox/inbox-filter/applied-filters/state.tsx
+++ b/web/components/inbox/inbox-filter/applied-filters/state.tsx
@@ -21,7 +21,7 @@ export const InboxIssueAppliedFiltersState: FC = observer(() => {
   if (filteredValues.length === 0) return <></>;
   return (
     <div className="relative flex flex-wrap items-center gap-2 rounded-md border border-custom-border-200 px-2 py-1">
-      <div className="text-xs text-custom-text-200">Status</div>
+      <div className="text-xs text-custom-text-200">State</div>
       {filteredValues.map((value) => {
         const optionDetail = currentOptionDetail(value);
         if (!optionDetail) return <></>;
diff --git a/web/components/issues/issue-layouts/kanban/block.tsx b/web/components/issues/issue-layouts/kanban/block.tsx
index 752cb670c9..eadbc0acfd 100644
--- a/web/components/issues/issue-layouts/kanban/block.tsx
+++ b/web/components/issues/issue-layouts/kanban/block.tsx
@@ -6,6 +6,7 @@ import { TIssue, IIssueDisplayProperties, IIssueMap } from "@plane/types";
 // hooks
 import { ControlLink, DropIndicator, TOAST_TYPE, Tooltip, setToast } from "@plane/ui";
 import RenderIfVisible from "@/components/core/render-if-visible-HOC";
+import { HIGHLIGHT_CLASS } from "@/components/issues/issue-layouts/utils";
 import { cn } from "@/helpers/common.helper";
 import { useApplication, useIssueDetail, useKanbanView, useProject } from "@/hooks/store";
 import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
@@ -133,7 +134,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = observer((props) => {
   const isDragAllowed = !isDragDisabled && !issue?.tempId && canEditIssueProperties;
 
   useOutsideClickDetector(cardRef, () => {
-    cardRef?.current?.classList?.remove("highlight");
+    cardRef?.current?.classList?.remove(HIGHLIGHT_CLASS);
   });
 
   // Make Issue block both as as Draggable and,
diff --git a/web/components/issues/issue-layouts/kanban/kanban-group.tsx b/web/components/issues/issue-layouts/kanban/kanban-group.tsx
index c9e04c819d..87f0c2f3f8 100644
--- a/web/components/issues/issue-layouts/kanban/kanban-group.tsx
+++ b/web/components/issues/issue-layouts/kanban/kanban-group.tsx
@@ -13,6 +13,7 @@ import {
   TIssueGroupByOptions,
   TIssueOrderByOptions,
 } from "@plane/types";
+import { highlightIssueOnDrop } from "@/components/issues/issue-layouts/utils";
 import { ISSUE_ORDER_BY_OPTIONS } from "@/constants/issue";
 // helpers
 import { cn } from "@/helpers/common.helper";
@@ -20,12 +21,7 @@ import { cn } from "@/helpers/common.helper";
 import { useProjectState } from "@/hooks/store";
 //components
 import { TRenderQuickActions } from "../list/list-view-types";
-import {
-  KanbanDropLocation,
-  getSourceFromDropPayload,
-  getDestinationFromDropPayload,
-  highlightIssueOnDrop,
-} from "./utils";
+import { KanbanDropLocation, getSourceFromDropPayload, getDestinationFromDropPayload } from "./utils";
 import { KanbanIssueBlocksList, KanBanQuickAddIssueForm } from ".";
 
 interface IKanbanGroup {
diff --git a/web/components/issues/issue-layouts/kanban/utils.ts b/web/components/issues/issue-layouts/kanban/utils.ts
index cf4745f63b..ece8d77a3c 100644
--- a/web/components/issues/issue-layouts/kanban/utils.ts
+++ b/web/components/issues/issue-layouts/kanban/utils.ts
@@ -1,5 +1,4 @@
 import pull from "lodash/pull";
-import scrollIntoView from "smooth-scroll-into-view-if-needed";
 import { IPragmaticDropPayload, TIssue, TIssueGroupByOptions } from "@plane/types";
 import { ISSUE_FILTER_DEFAULT_DATA } from "@/store/issue/helpers/issue-helper.store";
 
@@ -212,18 +211,3 @@ export const handleDragDrop = async (
     );
   }
 };
-
-/**
- * This Method finds the DOM element with elementId, scrolls to it and highlights the issue block
- * @param elementId
- * @param shouldScrollIntoView
- */
-export const highlightIssueOnDrop = (elementId: string | undefined, shouldScrollIntoView = true) => {
-  setTimeout(async () => {
-    const sourceElementId = elementId ?? "";
-    const sourceElement = document.getElementById(sourceElementId);
-    sourceElement?.classList?.add("highlight");
-    if (shouldScrollIntoView && sourceElement)
-      await scrollIntoView(sourceElement, { behavior: "smooth", block: "center", duration: 1500 });
-  }, 200);
-};
diff --git a/web/components/issues/issue-layouts/list/block-root.tsx b/web/components/issues/issue-layouts/list/block-root.tsx
new file mode 100644
index 0000000000..a311d643a7
--- /dev/null
+++ b/web/components/issues/issue-layouts/list/block-root.tsx
@@ -0,0 +1,89 @@
+import React, { FC, MutableRefObject, useState } from "react";
+import { observer } from "mobx-react";
+import { IIssueDisplayProperties, TIssue, TIssueMap } from "@plane/types";
+// components
+import RenderIfVisible from "@/components/core/render-if-visible-HOC";
+import { IssueBlock } from "@/components/issues/issue-layouts/list";
+// hooks
+import { useIssueDetail } from "@/hooks/store";
+// types
+import { TRenderQuickActions } from "./list-view-types";
+
+type Props = {
+  issueIds: string[];
+  issueId: string;
+  issuesMap: TIssueMap;
+  updateIssue: ((projectId: string, issueId: string, data: Partial<TIssue>) => Promise<void>) | undefined;
+  quickActions: TRenderQuickActions;
+  canEditProperties: (projectId: string | undefined) => boolean;
+  displayProperties: IIssueDisplayProperties | undefined;
+  nestingLevel: number;
+  spacingLeft?: number;
+  containerRef: MutableRefObject<HTMLDivElement | null>;
+};
+
+export const IssueBlockRoot: FC<Props> = observer((props) => {
+  const {
+    issueIds,
+    issueId,
+    issuesMap,
+    updateIssue,
+    quickActions,
+    canEditProperties,
+    displayProperties,
+    nestingLevel,
+    spacingLeft = 14,
+    containerRef,
+  } = props;
+  // states
+  const [isExpanded, setExpanded] = useState<boolean>(false);
+  // store hooks
+  const { subIssues: subIssuesStore } = useIssueDetail();
+
+  if (!issueId) return null;
+
+  const subIssues = subIssuesStore.subIssuesByIssueId(issueId);
+  return (
+    <>
+      <RenderIfVisible
+        key={`${issueId}`}
+        defaultHeight="3rem"
+        root={containerRef}
+        classNames="relative border-b border-b-custom-border-200 last:border-b-transparent"
+        changingReference={issueIds}
+      >
+        <IssueBlock
+          issueId={issueId}
+          issuesMap={issuesMap}
+          updateIssue={updateIssue}
+          quickActions={quickActions}
+          canEditProperties={canEditProperties}
+          displayProperties={displayProperties}
+          isExpanded={isExpanded}
+          setExpanded={setExpanded}
+          nestingLevel={nestingLevel}
+          spacingLeft={spacingLeft}
+        />
+      </RenderIfVisible>
+
+      {isExpanded &&
+        subIssues &&
+        subIssues.length > 0 &&
+        subIssues.map((subIssueId: string) => (
+          <IssueBlockRoot
+            key={`${subIssueId}`}
+            issueIds={issueIds}
+            issueId={subIssueId}
+            issuesMap={issuesMap}
+            updateIssue={updateIssue}
+            quickActions={quickActions}
+            canEditProperties={canEditProperties}
+            displayProperties={displayProperties}
+            nestingLevel={nestingLevel + 1}
+            spacingLeft={spacingLeft + (displayProperties?.key ? 19 : 0)}
+            containerRef={containerRef}
+          />
+        ))}
+    </>
+  );
+});
diff --git a/web/components/issues/issue-layouts/list/block.tsx b/web/components/issues/issue-layouts/list/block.tsx
index b34b834732..075323a41c 100644
--- a/web/components/issues/issue-layouts/list/block.tsx
+++ b/web/components/issues/issue-layouts/list/block.tsx
@@ -1,15 +1,18 @@
-import { useRef } from "react";
+import { Dispatch, MouseEvent, SetStateAction, useRef } from "react";
 import { observer } from "mobx-react-lite";
+import { ChevronRight } from "lucide-react";
+// types
 import { TIssue, IIssueDisplayProperties, TIssueMap } from "@plane/types";
 // ui
 import { Spinner, Tooltip, ControlLink } from "@plane/ui";
+// components
+import { IssueProperties } from "@/components/issues/issue-layouts/properties";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
 import { useApplication, useIssueDetail, useProject } from "@/hooks/store";
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // types
-import { IssueProperties } from "../properties/all-properties";
 import { TRenderQuickActions } from "./list-view-types";
 
 interface IssueBlockProps {
@@ -19,18 +22,35 @@ interface IssueBlockProps {
   quickActions: TRenderQuickActions;
   displayProperties: IIssueDisplayProperties | undefined;
   canEditProperties: (projectId: string | undefined) => boolean;
+  nestingLevel: number;
+  spacingLeft?: number;
+  isExpanded: boolean;
+  setExpanded: Dispatch<SetStateAction<boolean>>;
 }
 
 export const IssueBlock: React.FC<IssueBlockProps> = observer((props: IssueBlockProps) => {
-  const { issuesMap, issueId, updateIssue, quickActions, displayProperties, canEditProperties } = props;
+  const {
+    issuesMap,
+    issueId,
+    updateIssue,
+    quickActions,
+    displayProperties,
+    canEditProperties,
+    nestingLevel,
+    spacingLeft = 14,
+    isExpanded,
+    setExpanded,
+  } = props;
   // refs
   const parentRef = useRef(null);
   // hooks
   const {
     router: { workspaceSlug },
   } = useApplication();
+
+  // store hooks
   const { getProjectIdentifierById } = useProject();
-  const { getIsIssuePeeked, setPeekIssue } = useIssueDetail();
+  const { getIsIssuePeeked, setPeekIssue, subIssues: subIssuesStore } = useIssueDetail();
 
   const handleIssuePeekOverview = (issue: TIssue) =>
     workspaceSlug &&
@@ -47,28 +67,52 @@ export const IssueBlock: React.FC<IssueBlockProps> = observer((props: IssueBlock
   const canEditIssueProperties = canEditProperties(issue.project_id);
   const projectIdentifier = getProjectIdentifierById(issue.project_id);
 
+  const paddingLeft = `${spacingLeft}px`;
+
+  const handleToggleExpand = (e: MouseEvent<HTMLButtonElement>) => {
+    e.stopPropagation();
+    e.preventDefault();
+    if (nestingLevel >= 3) {
+      handleIssuePeekOverview(issue);
+    } else {
+      setExpanded((prevState) => {
+        if (!prevState && workspaceSlug && issue)
+          subIssuesStore.fetchSubIssues(workspaceSlug.toString(), issue.project_id, issue.id);
+        return !prevState;
+      });
+    }
+  };
+
   return (
     <div
       ref={parentRef}
       className={cn(
-        "min-h-[52px] relative flex flex-col md:flex-row md:items-center gap-3 bg-custom-background-100 p-3 text-sm",
+        "min-h-[52px] relative flex flex-col md:flex-row md:items-center gap-3 bg-custom-background-100 p-3 pl-8 text-sm",
         {
           "border border-custom-primary-70 hover:border-custom-primary-70": getIsIssuePeeked(issue.id),
           "last:border-b-transparent": !getIsIssuePeeked(issue.id),
         }
       )}
     >
-      <div className="flex w-full truncate">
+      <div className="flex w-full truncate" style={issue.parent_id && nestingLevel !== 0 ? { paddingLeft } : {}}>
         <div className="flex flex-grow items-center gap-3 truncate">
-          {displayProperties && displayProperties?.key && (
-            <div className="flex-shrink-0 text-xs font-medium text-custom-text-300">
-              {projectIdentifier}-{issue.sequence_id}
-            </div>
-          )}
+          <div className="flex items-center gap-1.5">
+            <button
+              className="flex items-center justify-center h-5 w-5 cursor-pointer rounded-sm text-custom-text-400  hover:text-custom-text-300"
+              onClick={handleToggleExpand}
+            >
+              <ChevronRight className={`h-4 w-4 ${isExpanded ? "rotate-90" : ""}`} />
+            </button>
+            {displayProperties && displayProperties?.key && (
+              <div className="flex-shrink-0 text-xs font-medium text-custom-text-300">
+                {projectIdentifier}-{issue.sequence_id}
+              </div>
+            )}
 
-          {issue?.tempId !== undefined && (
-            <div className="absolute left-0 top-0 z-[99999] h-full w-full animate-pulse bg-custom-background-100/20" />
-          )}
+            {issue?.tempId !== undefined && (
+              <div className="absolute left-0 top-0 z-[99999] h-full w-full animate-pulse bg-custom-background-100/20" />
+            )}
+          </div>
 
           {issue?.is_draft ? (
             <Tooltip tooltipContent={issue.name} isMobile={isMobile}>
diff --git a/web/components/issues/issue-layouts/list/blocks-list.tsx b/web/components/issues/issue-layouts/list/blocks-list.tsx
index 1e1751b762..b8e5df1d85 100644
--- a/web/components/issues/issue-layouts/list/blocks-list.tsx
+++ b/web/components/issues/issue-layouts/list/blocks-list.tsx
@@ -1,10 +1,9 @@
 import { FC, MutableRefObject } from "react";
 // components
 import { TGroupedIssues, TIssue, IIssueDisplayProperties, TIssueMap, TUnGroupedIssues } from "@plane/types";
-import RenderIfVisible from "@/components/core/render-if-visible-HOC";
-import { IssueBlock } from "@/components/issues";
-import { TRenderQuickActions } from "./list-view-types";
+import { IssueBlockRoot } from "@/components/issues/issue-layouts/list";
 // types
+import { TRenderQuickActions } from "./list-view-types";
 
 interface Props {
   issueIds: TGroupedIssues | TUnGroupedIssues | any;
@@ -22,27 +21,21 @@ export const IssueBlocksList: FC<Props> = (props) => {
   return (
     <div className="relative h-full w-full">
       {issueIds && issueIds.length > 0 ? (
-        issueIds.map((issueId: string) => {
-          if (!issueId) return null;
-          return (
-            <RenderIfVisible
-              key={`${issueId}`}
-              defaultHeight="3rem"
-              root={containerRef}
-              classNames="relative border-b border-b-custom-border-200 last:border-b-transparent"
-              changingReference={issueIds}
-            >
-              <IssueBlock
-                issueId={issueId}
-                issuesMap={issuesMap}
-                updateIssue={updateIssue}
-                quickActions={quickActions}
-                canEditProperties={canEditProperties}
-                displayProperties={displayProperties}
-              />
-            </RenderIfVisible>
-          );
-        })
+        issueIds.map((issueId: string) => (
+          <IssueBlockRoot
+            key={`${issueId}`}
+            issueIds={issueIds}
+            issueId={issueId}
+            issuesMap={issuesMap}
+            updateIssue={updateIssue}
+            quickActions={quickActions}
+            canEditProperties={canEditProperties}
+            displayProperties={displayProperties}
+            nestingLevel={0}
+            spacingLeft={0}
+            containerRef={containerRef}
+          />
+        ))
       ) : (
         <div className="bg-custom-background-100 p-3 text-sm text-custom-text-400">No issues</div>
       )}
diff --git a/web/components/issues/issue-layouts/list/index.ts b/web/components/issues/issue-layouts/list/index.ts
index c245a2cca4..26c125b515 100644
--- a/web/components/issues/issue-layouts/list/index.ts
+++ b/web/components/issues/issue-layouts/list/index.ts
@@ -1,4 +1,5 @@
 export * from "./roots";
+export * from "./block-root";
 export * from "./block";
 export * from "./roots";
 export * from "./blocks-list";
diff --git a/web/components/issues/issue-layouts/properties/index.ts b/web/components/issues/issue-layouts/properties/index.ts
index 95f3ce21fd..8bdc3ea3f7 100644
--- a/web/components/issues/issue-layouts/properties/index.ts
+++ b/web/components/issues/issue-layouts/properties/index.ts
@@ -1 +1,2 @@
 export * from "./labels";
+export * from "./all-properties";
diff --git a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
index 83dbe57a70..84e2ae4854 100644
--- a/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
+++ b/web/components/issues/issue-layouts/spreadsheet/issue-row.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, MutableRefObject, SetStateAction, useRef, useState } from "react";
+import { Dispatch, MouseEvent, MutableRefObject, SetStateAction, useRef, useState } from "react";
 import { observer } from "mobx-react-lite";
 import { useRouter } from "next/router";
 // icons
@@ -33,6 +33,7 @@ interface Props {
   containerRef: MutableRefObject<HTMLTableElement | null>;
   issueIds: string[];
   spreadsheetColumnsList: (keyof IIssueDisplayProperties)[];
+  spacingLeft?: number;
 }
 
 export const SpreadsheetIssueRow = observer((props: Props) => {
@@ -49,6 +50,7 @@ export const SpreadsheetIssueRow = observer((props: Props) => {
     containerRef,
     issueIds,
     spreadsheetColumnsList,
+    spacingLeft = 14,
   } = props;
 
   const [isExpanded, setExpanded] = useState<boolean>(false);
@@ -72,6 +74,7 @@ export const SpreadsheetIssueRow = observer((props: Props) => {
           quickActions={quickActions}
           canEditProperties={canEditProperties}
           nestingLevel={nestingLevel}
+          spacingLeft={spacingLeft}
           isEstimateEnabled={isEstimateEnabled}
           updateIssue={updateIssue}
           portalElement={portalElement}
@@ -93,6 +96,7 @@ export const SpreadsheetIssueRow = observer((props: Props) => {
             quickActions={quickActions}
             canEditProperties={canEditProperties}
             nestingLevel={nestingLevel + 1}
+            spacingLeft={spacingLeft + (displayProperties.key ? 16 : 28)}
             isEstimateEnabled={isEstimateEnabled}
             updateIssue={updateIssue}
             portalElement={portalElement}
@@ -119,6 +123,7 @@ interface IssueRowDetailsProps {
   isExpanded: boolean;
   setExpanded: Dispatch<SetStateAction<boolean>>;
   spreadsheetColumnsList: (keyof IIssueDisplayProperties)[];
+  spacingLeft?: number;
 }
 
 const IssueRowDetails = observer((props: IssueRowDetailsProps) => {
@@ -135,6 +140,7 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {
     isExpanded,
     setExpanded,
     spreadsheetColumnsList,
+    spacingLeft = 14,
   } = props;
   // states
   const [isMenuActive, setIsMenuActive] = useState(false);
@@ -161,22 +167,14 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {
 
   const issueDetail = issue.getIssueById(issueId);
 
-  const paddingLeft = `${nestingLevel * 54}px`;
+  const paddingLeft = `${spacingLeft}px`;
 
   useOutsideClickDetector(menuActionRef, () => setIsMenuActive(false));
 
-  const handleToggleExpand = () => {
-    setExpanded((prevState) => {
-      if (!prevState && workspaceSlug && issueDetail)
-        subIssuesStore.fetchSubIssues(workspaceSlug.toString(), issueDetail.project_id, issueDetail.id);
-      return !prevState;
-    });
-  };
-
   const customActionButton = (
     <div
       ref={menuActionRef}
-      className={`w-full cursor-pointer rounded p-1 text-custom-sidebar-text-400 hover:bg-custom-background-80 ${
+      className={`flex items-center h-full w-full cursor-pointer rounded p-1 text-custom-sidebar-text-400 hover:bg-custom-background-80 ${
         isMenuActive ? "bg-custom-background-80 text-custom-text-100" : "text-custom-text-200"
       }`}
       onClick={() => setIsMenuActive(!isMenuActive)}
@@ -186,76 +184,85 @@ const IssueRowDetails = observer((props: IssueRowDetailsProps) => {
   );
   if (!issueDetail) return null;
 
+  const handleToggleExpand = (e: MouseEvent<HTMLButtonElement>) => {
+    e.stopPropagation();
+    e.preventDefault();
+    if (nestingLevel >= 3) {
+      handleIssuePeekOverview(issueDetail);
+    } else {
+      setExpanded((prevState) => {
+        if (!prevState && workspaceSlug && issueDetail)
+          subIssuesStore.fetchSubIssues(workspaceSlug.toString(), issueDetail.project_id, issueDetail.id);
+        return !prevState;
+      });
+    }
+  };
+
   const disableUserActions = !canEditProperties(issueDetail.project_id);
 
   return (
     <>
-      <td
-        ref={cellRef}
-        id={`issue-${issueDetail.id}`}
-        className={cn(
-          "group sticky left-0 h-11 w-[28rem] flex items-center bg-custom-background-100 text-sm after:absolute border-r-[0.5px] z-10 border-custom-border-200",
-          {
-            "border-b-[0.5px]": !getIsIssuePeeked(issueDetail.id),
-            "border border-custom-primary-70 hover:border-custom-primary-70": getIsIssuePeeked(issueDetail.id),
-            "shadow-[8px_22px_22px_10px_rgba(0,0,0,0.05)]": isScrolled.current,
-          }
-        )}
-        tabIndex={0}
-      >
-        <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="key">
-          <div
-            className="flex min-w-min items-center gap-1.5 px-4 py-2.5 pr-0"
-            style={issueDetail.parent_id && nestingLevel !== 0 ? { paddingLeft } : {}}
-          >
-            <div className="relative flex cursor-pointer items-center text-center text-xs hover:text-custom-text-100">
-              <span
-                className={`flex items-center justify-center font-medium group-hover:opacity-0 ${
-                  isMenuActive ? "opacity-0" : "opacity-100"
-                }`}
-              >
-                {getProjectIdentifierById(issueDetail.project_id)}-{issueDetail.sequence_id}
-              </span>
-
-              <div className={`absolute left-2.5 top-0 hidden group-hover:block ${isMenuActive ? "!block" : ""}`}>
-                {quickActions({
-                  issue: issueDetail,
-                  parentRef: cellRef,
-                  customActionButton,
-                  portalElement: portalElement.current,
-                })}
-              </div>
-            </div>
-
-            {issueDetail.sub_issues_count > 0 && (
-              <div className="flex h-6 w-6 items-center justify-center">
-                <button
-                  className="h-5 w-5 cursor-pointer rounded-sm hover:bg-custom-background-90 hover:text-custom-text-100"
-                  onClick={() => handleToggleExpand()}
-                >
-                  <ChevronRight className={`h-3.5 w-3.5 ${isExpanded ? "rotate-90" : ""}`} />
-                </button>
-              </div>
-            )}
-          </div>
-        </WithDisplayPropertiesHOC>
+      <td ref={cellRef} id={`issue-${issueDetail.id}`} tabIndex={0}>
         <ControlLink
           id={`issue-${issueId}`}
           href={`/${workspaceSlug}/projects/${issueDetail.project_id}/issues/${issueId}`}
           target="_blank"
           onClick={() => handleIssuePeekOverview(issueDetail)}
-          className="clickable w-full line-clamp-1 cursor-pointer text-sm text-custom-text-100"
+          className={cn(
+            "group clickable cursor-pointer sticky left-0 h-11 w-[28rem] flex items-center bg-custom-background-100 text-sm after:absolute border-r-[0.5px] z-10 border-custom-border-200",
+            {
+              "border-b-[0.5px]": !getIsIssuePeeked(issueDetail.id),
+              "border border-custom-primary-70 hover:border-custom-primary-70": getIsIssuePeeked(issueDetail.id),
+              "shadow-[8px_22px_22px_10px_rgba(0,0,0,0.05)]": isScrolled.current,
+            }
+          )}
           disabled={!!issueDetail?.tempId}
         >
-          <div className="w-full overflow-hidden">
-            <Tooltip tooltipContent={issueDetail.name} isMobile={isMobile}>
-              <div
-                className="h-full w-full cursor-pointer truncate px-4 text-left text-[0.825rem] text-custom-text-100 focus:outline-none"
-                tabIndex={-1}
-              >
-                {issueDetail.name}
+          <div
+            className="flex min-w-min items-center gap-1 px-4 py-2.5 pr-0"
+            style={issueDetail.parent_id && nestingLevel !== 0 ? { paddingLeft } : {}}
+          >
+            <div className="flex h-5 w-5 items-center justify-center">
+              {issueDetail.sub_issues_count > 0 && (
+                <button
+                  className="flex items-center justify-center h-5 w-5 cursor-pointer rounded-sm text-custom-text-400 hover:text-custom-text-300"
+                  onClick={handleToggleExpand}
+                >
+                  <ChevronRight className={`h-4 w-4 ${isExpanded ? "rotate-90" : ""}`} />
+                </button>
+              )}
+            </div>
+
+            <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="key">
+              <div className="relative flex cursor-pointer items-center text-center text-xs hover:text-custom-text-100">
+                <p className={`flex items-center justify-center font-medium leading-7`}>
+                  {getProjectIdentifierById(issueDetail.project_id)}-{issueDetail.sequence_id}
+                </p>
               </div>
-            </Tooltip>
+            </WithDisplayPropertiesHOC>
+          </div>
+
+          <div className="flex items-center gap-2 justify-between h-full w-full pr-4 truncate">
+            <div className="w-full line-clamp-1 text-sm text-custom-text-100">
+              <div className="w-full overflow-hidden">
+                <Tooltip tooltipContent={issueDetail.name} isMobile={isMobile}>
+                  <div
+                    className="h-full w-full cursor-pointer truncate px-4 text-left text-[0.825rem] text-custom-text-100 focus:outline-none"
+                    tabIndex={-1}
+                  >
+                    {issueDetail.name}
+                  </div>
+                </Tooltip>
+              </div>
+            </div>
+            <div className={`hidden group-hover:block ${isMenuActive ? "!block" : ""}`}>
+              {quickActions({
+                issue: issueDetail,
+                parentRef: cellRef,
+                customActionButton,
+                portalElement: portalElement.current,
+              })}
+            </div>
           </div>
         </ControlLink>
       </td>
diff --git a/web/components/issues/issue-layouts/utils.tsx b/web/components/issues/issue-layouts/utils.tsx
index 12025a6820..b306a7752d 100644
--- a/web/components/issues/issue-layouts/utils.tsx
+++ b/web/components/issues/issue-layouts/utils.tsx
@@ -1,3 +1,4 @@
+import scrollIntoView from "smooth-scroll-into-view-if-needed";
 import { ContrastIcon } from "lucide-react";
 import { GroupByColumnTypes, IGroupByColumn, TCycleGroups } from "@plane/types";
 import { Avatar, CycleGroupIcon, DiceIcon, PriorityIcon, StateGroupIcon } from "@plane/ui";
@@ -16,6 +17,9 @@ import { IStateStore } from "@/store/state.store";
 // constants
 // types
 
+export const HIGHLIGHT_CLASS = "highlight";
+export const HIGHLIGHT_WITH_LINE = "highlight-with-line";
+
 export const isWorkspaceLevel = (type: EIssuesStoreType) =>
   [EIssuesStoreType.PROFILE, EIssuesStoreType.GLOBAL].includes(type) ? true : false;
 
@@ -240,3 +244,22 @@ const getCreatedByColumns = (member: IMemberRootStore) => {
     };
   });
 };
+
+/**
+ * This Method finds the DOM element with elementId, scrolls to it and highlights the issue block
+ * @param elementId
+ * @param shouldScrollIntoView
+ */
+export const highlightIssueOnDrop = (
+  elementId: string | undefined,
+  shouldScrollIntoView = true,
+  shouldHighLightWithLine = false
+) => {
+  setTimeout(async () => {
+    const sourceElementId = elementId ?? "";
+    const sourceElement = document.getElementById(sourceElementId);
+    sourceElement?.classList?.add(shouldHighLightWithLine ? HIGHLIGHT_WITH_LINE : HIGHLIGHT_CLASS);
+    if (shouldScrollIntoView && sourceElement)
+      await scrollIntoView(sourceElement, { behavior: "smooth", block: "center", duration: 1500 });
+  }, 200);
+};
diff --git a/web/components/modules/applied-filters/root.tsx b/web/components/modules/applied-filters/root.tsx
index 3011df0847..e48b8562f4 100644
--- a/web/components/modules/applied-filters/root.tsx
+++ b/web/components/modules/applied-filters/root.tsx
@@ -1,5 +1,5 @@
 import { X } from "lucide-react";
-import { TModuleFilters } from "@plane/types";
+import { TModuleDisplayFilters, TModuleFilters } from "@plane/types";
 // components
 import { AppliedDateFilters, AppliedMembersFilters, AppliedStatusFilters } from "@/components/modules";
 // helpers
@@ -8,19 +8,30 @@ import { replaceUnderscoreIfSnakeCase } from "@/helpers/string.helper";
 
 type Props = {
   appliedFilters: TModuleFilters;
+  isFavoriteFilterApplied?: boolean;
   handleClearAllFilters: () => void;
+  handleDisplayFiltersUpdate?: (updatedDisplayProperties: Partial<TModuleDisplayFilters>) => void;
   handleRemoveFilter: (key: keyof TModuleFilters, value: string | null) => void;
   alwaysAllowEditing?: boolean;
+  isArchived?: boolean;
 };
 
 const MEMBERS_FILTERS = ["lead", "members"];
 const DATE_FILTERS = ["start_date", "target_date"];
 
 export const ModuleAppliedFiltersList: React.FC<Props> = (props) => {
-  const { appliedFilters, handleClearAllFilters, handleRemoveFilter, alwaysAllowEditing } = props;
+  const {
+    appliedFilters,
+    isFavoriteFilterApplied,
+    handleClearAllFilters,
+    handleRemoveFilter,
+    handleDisplayFiltersUpdate,
+    alwaysAllowEditing,
+    isArchived = false,
+  } = props;
 
-  if (!appliedFilters) return null;
-  if (Object.keys(appliedFilters).length === 0) return null;
+  if (!appliedFilters && !isFavoriteFilterApplied) return null;
+  if (Object.keys(appliedFilters).length === 0 && !isFavoriteFilterApplied) return null;
 
   const isEditingAllowed = alwaysAllowEditing;
 
@@ -73,6 +84,33 @@ export const ModuleAppliedFiltersList: React.FC<Props> = (props) => {
           </div>
         );
       })}
+      {!isArchived && isFavoriteFilterApplied && (
+        <div
+          key="module_display_filters"
+          className="flex flex-wrap items-center gap-2 rounded-md border border-custom-border-200 px-2 py-1 capitalize"
+        >
+          <div className="flex flex-wrap items-center gap-1.5">
+            <span className="text-xs text-custom-text-300">Modules</span>
+            <div className="flex items-center gap-1 rounded p-1 text-xs bg-custom-background-80">
+              Favorite
+              {isEditingAllowed && (
+                <button
+                  type="button"
+                  className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+                  onClick={() =>
+                    handleDisplayFiltersUpdate &&
+                    handleDisplayFiltersUpdate({
+                      favorites: !isFavoriteFilterApplied,
+                    })
+                  }
+                >
+                  <X size={10} strokeWidth={2} />
+                </button>
+              )}
+            </div>
+          </div>
+        </div>
+      )}
       {isEditingAllowed && (
         <button
           type="button"
diff --git a/web/components/modules/archived-modules/root.tsx b/web/components/modules/archived-modules/root.tsx
index d697f15b55..9abf4f87d5 100644
--- a/web/components/modules/archived-modules/root.tsx
+++ b/web/components/modules/archived-modules/root.tsx
@@ -64,6 +64,7 @@ export const ArchivedModuleLayoutRoot: React.FC = observer(() => {
             handleClearAllFilters={() => clearAllFilters(projectId.toString(), "archived")}
             handleRemoveFilter={handleRemoveFilter}
             alwaysAllowEditing
+            isArchived
           />
         </div>
       )}
diff --git a/web/components/modules/dropdowns/order-by.tsx b/web/components/modules/dropdowns/order-by.tsx
index d6fd3548b2..cecda8e888 100644
--- a/web/components/modules/dropdowns/order-by.tsx
+++ b/web/components/modules/dropdowns/order-by.tsx
@@ -19,6 +19,7 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
   const orderByDetails = MODULE_ORDER_BY_OPTIONS.find((option) => value?.includes(option.key));
 
   const isDescending = value?.[0] === "-";
+  const isManual = value?.includes("sort_order");
 
   return (
     <CustomMenu
@@ -38,7 +39,7 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
           key={option.key}
           className="flex items-center justify-between gap-2"
           onClick={() => {
-            if (isDescending) onChange(`-${option.key}` as TModuleOrderByOptions);
+            if (isDescending && !isManual) onChange(`-${option.key}` as TModuleOrderByOptions);
             else onChange(option.key);
           }}
         >
@@ -46,25 +47,29 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
           {value?.includes(option.key) && <Check className="h-3 w-3" />}
         </CustomMenu.MenuItem>
       ))}
-      <hr className="my-2 border-custom-border-200" />
-      <CustomMenu.MenuItem
-        className="flex items-center justify-between gap-2"
-        onClick={() => {
-          if (isDescending) onChange(value.slice(1) as TModuleOrderByOptions);
-        }}
-      >
-        Ascending
-        {!isDescending && <Check className="h-3 w-3" />}
-      </CustomMenu.MenuItem>
-      <CustomMenu.MenuItem
-        className="flex items-center justify-between gap-2"
-        onClick={() => {
-          if (!isDescending) onChange(`-${value}` as TModuleOrderByOptions);
-        }}
-      >
-        Descending
-        {isDescending && <Check className="h-3 w-3" />}
-      </CustomMenu.MenuItem>
+      {!isManual && (
+        <>
+          <hr className="my-2 border-custom-border-200" />
+          <CustomMenu.MenuItem
+            className="flex items-center justify-between gap-2"
+            onClick={() => {
+              if (isDescending) onChange(value.slice(1) as TModuleOrderByOptions);
+            }}
+          >
+            Ascending
+            {!isDescending && <Check className="h-3 w-3" />}
+          </CustomMenu.MenuItem>
+          <CustomMenu.MenuItem
+            className="flex items-center justify-between gap-2"
+            onClick={() => {
+              if (!isDescending) onChange(`-${value}` as TModuleOrderByOptions);
+            }}
+          >
+            Descending
+            {isDescending && <Check className="h-3 w-3" />}
+          </CustomMenu.MenuItem>
+        </>
+      )}
     </CustomMenu>
   );
 };
diff --git a/web/components/modules/gantt-chart/modules-list-layout.tsx b/web/components/modules/gantt-chart/modules-list-layout.tsx
index f0db46033d..27768fba99 100644
--- a/web/components/modules/gantt-chart/modules-list-layout.tsx
+++ b/web/components/modules/gantt-chart/modules-list-layout.tsx
@@ -6,7 +6,7 @@ import { IModule } from "@plane/types";
 import { GanttChartRoot, IBlockUpdateData, ModuleGanttSidebar } from "@/components/gantt-chart";
 import { ModuleGanttBlock } from "@/components/modules";
 import { getDate } from "@/helpers/date-time.helper";
-import { useModule, useProject } from "@/hooks/store";
+import { useModule, useModuleFilter, useProject } from "@/hooks/store";
 // types
 
 export const ModulesListGanttChartView: React.FC = observer(() => {
@@ -16,6 +16,7 @@ export const ModulesListGanttChartView: React.FC = observer(() => {
   // store
   const { currentProjectDetails } = useProject();
   const { getFilteredModuleIds, moduleMap, updateModuleDetails } = useModule();
+  const { currentProjectDisplayFilters: displayFilters } = useModuleFilter();
   // derived values
   const filteredModuleIds = projectId ? getFilteredModuleIds(projectId.toString()) : undefined;
 
@@ -54,7 +55,7 @@ export const ModulesListGanttChartView: React.FC = observer(() => {
         enableBlockLeftResize={isAllowed}
         enableBlockRightResize={isAllowed}
         enableBlockMove={isAllowed}
-        enableReorder={isAllowed}
+        enableReorder={isAllowed && displayFilters?.order_by === "sort_order"}
         enableAddBlock={isAllowed}
         showAllBlocks
       />
diff --git a/web/components/modules/module-view-header.tsx b/web/components/modules/module-view-header.tsx
index 2432cc0020..426bca68c3 100644
--- a/web/components/modules/module-view-header.tsx
+++ b/web/components/modules/module-view-header.tsx
@@ -84,7 +84,7 @@ export const ModuleViewHeader: FC = observer(() => {
     if (isSearchOpen && searchQuery.trim() === "") setIsSearchOpen(false);
   });
 
-  const isFiltersApplied = calculateTotalFilters(filters ?? {}) !== 0;
+  const isFiltersApplied = calculateTotalFilters(filters ?? {}) !== 0 || displayFilters?.favorites;
 
   return (
     <div className="hidden h-full sm:flex items-center gap-3 self-end">
diff --git a/web/components/modules/modules-list-view.tsx b/web/components/modules/modules-list-view.tsx
index 6a82fddd43..36de22d6c9 100644
--- a/web/components/modules/modules-list-view.tsx
+++ b/web/components/modules/modules-list-view.tsx
@@ -4,13 +4,7 @@ import { useRouter } from "next/router";
 // components
 import { ListLayout } from "@/components/core/list";
 import { EmptyState } from "@/components/empty-state";
-import {
-  ModuleCardItem,
-  ModuleListItem,
-  ModulePeekOverview,
-  ModuleViewHeader,
-  ModulesListGanttChartView,
-} from "@/components/modules";
+import { ModuleCardItem, ModuleListItem, ModulePeekOverview, ModulesListGanttChartView } from "@/components/modules";
 import { CycleModuleBoardLayout, CycleModuleListLayout, GanttLayoutLoader } from "@/components/ui";
 // constants
 import { EmptyStateType } from "@/constants/empty-state";
@@ -73,12 +67,6 @@ export const ModulesListView: React.FC = observer(() => {
 
   return (
     <>
-      <div className="h-[50px] flex-shrink-0 w-full border-b border-custom-border-200 px-6 relative flex items-center gap-4 justify-between">
-        <div className="flex items-center">
-          <span className="block text-sm font-medium">Module name</span>
-        </div>
-        <ModuleViewHeader />
-      </div>
       {displayFilters?.layout === "list" && (
         <div className="h-full overflow-y-auto">
           <div className="flex h-full w-full justify-between">
diff --git a/web/components/pages/pages-list-main-content.tsx b/web/components/pages/pages-list-main-content.tsx
index 60e11dd8ce..ae01085d68 100644
--- a/web/components/pages/pages-list-main-content.tsx
+++ b/web/components/pages/pages-list-main-content.tsx
@@ -8,7 +8,7 @@ import { PageLoader } from "@/components/pages";
 // constants
 import { EmptyStateType } from "@/constants/empty-state";
 // hooks
-import { useProjectPages } from "@/hooks/store";
+import { useApplication, useProjectPages } from "@/hooks/store";
 // assets
 import AllFiltersImage from "public/empty-state/pages/all-filters.svg";
 import NameFilterImage from "public/empty-state/pages/name-filter.svg";
@@ -23,6 +23,7 @@ export const PagesListMainContent: React.FC<Props> = observer((props) => {
   const { children, pageType, projectId } = props;
   // store hooks
   const { loader, getCurrentProjectFilteredPageIds, getCurrentProjectPageIds, filters } = useProjectPages(projectId);
+  const { commandPalette: commandPaletteStore } = useApplication();
   // derived values
   const pageIds = getCurrentProjectPageIds(pageType);
   const filteredPageIds = getCurrentProjectFilteredPageIds(pageType);
@@ -30,8 +31,24 @@ export const PagesListMainContent: React.FC<Props> = observer((props) => {
   if (loader === "init-loader") return <PageLoader />;
   // if no pages exist in the active page type
   if (pageIds?.length === 0) {
-    if (pageType === "public") return <EmptyState type={EmptyStateType.PROJECT_PAGE_PUBLIC} />;
-    if (pageType === "private") return <EmptyState type={EmptyStateType.PROJECT_PAGE_PRIVATE} />;
+    if (pageType === "public")
+      return (
+        <EmptyState
+          type={EmptyStateType.PROJECT_PAGE_PUBLIC}
+          primaryButtonOnClick={() => {
+            commandPaletteStore.toggleCreatePageModal(true);
+          }}
+        />
+      );
+    if (pageType === "private")
+      return (
+        <EmptyState
+          type={EmptyStateType.PROJECT_PAGE_PRIVATE}
+          primaryButtonOnClick={() => {
+            commandPaletteStore.toggleCreatePageModal(true);
+          }}
+        />
+      );
     if (pageType === "archived") return <EmptyState type={EmptyStateType.PROJECT_PAGE_ARCHIVED} />;
   }
   // if no pages match the filter criteria
diff --git a/web/components/project/create-project-form.tsx b/web/components/project/create-project-form.tsx
index 8fa1b390f6..7fc8419fe7 100644
--- a/web/components/project/create-project-form.tsx
+++ b/web/components/project/create-project-form.tsx
@@ -365,7 +365,7 @@ export const CreateProjectForm: FC<Props> = observer((props) => {
               render={({ field: { value, onChange } }) => {
                 if (value === undefined || value === null || typeof value === "string")
                   return (
-                    <div className="h-7 flex-shrink-0" tabIndex={5}>
+                    <div className="flex-shrink-0" tabIndex={5}>
                       <MemberDropdown
                         value={value}
                         onChange={(lead) => onChange(lead === value ? null : lead)}
diff --git a/web/constants/empty-state.ts b/web/constants/empty-state.ts
index 5c48b1992c..bae2990981 100644
--- a/web/constants/empty-state.ts
+++ b/web/constants/empty-state.ts
@@ -501,12 +501,22 @@ const emptyStateDetails = {
     title: "No private pages yet",
     description: "Keep your private thoughts here. When you're ready to share, the team's just a click away.",
     path: "/empty-state/pages/private",
+    primaryButton: {
+      text: "Create your first page",
+    },
+    accessType: "project",
+    access: EUserProjectRoles.MEMBER,
   },
   [EmptyStateType.PROJECT_PAGE_PUBLIC]: {
     key: EmptyStateType.PROJECT_PAGE_PUBLIC,
     title: "No public pages yet",
     description: "See pages shared with everyone in your project right here.",
     path: "/empty-state/pages/public",
+    primaryButton: {
+      text: "Create your first page",
+    },
+    accessType: "project",
+    access: EUserProjectRoles.MEMBER,
   },
   [EmptyStateType.PROJECT_PAGE_ARCHIVED]: {
     key: EmptyStateType.PROJECT_PAGE_ARCHIVED,
diff --git a/web/constants/module.ts b/web/constants/module.ts
index 544e810ac6..bfec73dae0 100644
--- a/web/constants/module.ts
+++ b/web/constants/module.ts
@@ -92,4 +92,8 @@ export const MODULE_ORDER_BY_OPTIONS: { key: TModuleOrderByOptions; label: strin
     key: "created_at",
     label: "Created date",
   },
+  {
+    key: "sort_order",
+    label: "Manual",
+  },
 ];
diff --git a/web/helpers/cycle.helper.ts b/web/helpers/cycle.helper.ts
index 97cb7348c0..889487dad4 100644
--- a/web/helpers/cycle.helper.ts
+++ b/web/helpers/cycle.helper.ts
@@ -9,7 +9,7 @@ import { satisfiesDateFilter } from "@/helpers/filter.helper";
  * @param {ICycle[]} cycles
  * @returns {ICycle[]}
  */
-export const orderCycles = (cycles: ICycle[]): ICycle[] => {
+export const orderCycles = (cycles: ICycle[], sortByManual: boolean): ICycle[] => {
   if (cycles.length === 0) return [];
 
   const acceptedStatuses = ["current", "upcoming", "draft"];
@@ -22,10 +22,12 @@ export const orderCycles = (cycles: ICycle[]): ICycle[] => {
   };
 
   let filteredCycles = cycles.filter((c) => acceptedStatuses.includes(c.status?.toLowerCase() ?? ""));
-  filteredCycles = sortBy(filteredCycles, [
-    (c) => STATUS_ORDER[c.status?.toLowerCase() ?? ""],
-    (c) => (c.status?.toLowerCase() === "upcoming" ? c.start_date : c.name.toLowerCase()),
-  ]);
+  if (sortByManual) filteredCycles = sortBy(filteredCycles, [(c) => c.sort_order]);
+  else
+    filteredCycles = sortBy(filteredCycles, [
+      (c) => STATUS_ORDER[c.status?.toLowerCase() ?? ""],
+      (c) => (c.status?.toLowerCase() === "upcoming" ? c.start_date : c.name.toLowerCase()),
+    ]);
 
   return filteredCycles;
 };
diff --git a/web/helpers/module.helper.ts b/web/helpers/module.helper.ts
index 14e7f04889..456cdfc8bb 100644
--- a/web/helpers/module.helper.ts
+++ b/web/helpers/module.helper.ts
@@ -35,6 +35,7 @@ export const orderModules = (modules: IModule[], orderByKey: TModuleOrderByOptio
   if (orderByKey === "created_at") orderedModules = sortBy(modules, [(m) => m.created_at]);
   if (orderByKey === "-created_at") orderedModules = sortBy(modules, [(m) => !m.created_at]);
 
+  if (orderByKey === "sort_order") orderedModules = sortBy(modules, [(m) => m.sort_order]);
   return orderedModules;
 };
 
diff --git a/web/package.json b/web/package.json
index 246ccf6ddf..4be72c5a5f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.1.3",
-    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.0.3",
+    "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.3.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@blueprintjs/popover2": "^1.13.3",
     "@headlessui/react": "^1.7.3",
@@ -40,7 +40,7 @@
     "dotenv": "^16.0.3",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.368.0",
+    "lucide-react": "^0.378.0",
     "mobx": "^6.10.0",
     "mobx-react": "^9.1.0",
     "mobx-utils": "^6.0.8",
@@ -80,4 +80,4 @@
     "tsconfig": "*",
     "typescript": "4.7.4"
   }
-}
+}
\ No newline at end of file
diff --git a/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx b/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
index 22973347f6..85be0c1400 100644
--- a/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
+++ b/web/pages/[workspaceSlug]/projects/[projectId]/modules/index.tsx
@@ -7,7 +7,7 @@ import { TModuleFilters } from "@plane/types";
 import { PageHead } from "@/components/core";
 import { EmptyState } from "@/components/empty-state";
 import { ModulesListHeader } from "@/components/headers";
-import { ModuleAppliedFiltersList, ModulesListView } from "@/components/modules";
+import { ModuleViewHeader, ModuleAppliedFiltersList, ModulesListView } from "@/components/modules";
 // types
 // hooks
 import ModulesListMobileHeader from "@/components/modules/moduels-list-mobile-header";
@@ -22,7 +22,8 @@ const ProjectModulesPage: NextPageWithLayout = observer(() => {
   const { workspaceSlug, projectId } = router.query;
   // store
   const { getProjectById, currentProjectDetails } = useProject();
-  const { currentProjectFilters, clearAllFilters, updateFilters } = useModuleFilter();
+  const { currentProjectFilters, currentProjectDisplayFilters, clearAllFilters, updateFilters, updateDisplayFilters } =
+    useModuleFilter();
   // derived values
   const project = projectId ? getProjectById(projectId.toString()) : undefined;
   const pageTitle = project?.name ? `${project?.name} - Modules` : undefined;
@@ -57,12 +58,23 @@ const ProjectModulesPage: NextPageWithLayout = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="h-full w-full flex flex-col">
-        {calculateTotalFilters(currentProjectFilters ?? {}) !== 0 && (
+        <div className="h-[50px] flex-shrink-0 w-full border-b border-custom-border-200 px-6 relative flex items-center gap-4 justify-between">
+          <div className="flex items-center">
+            <span className="block text-sm font-medium">Module name</span>
+          </div>
+          <ModuleViewHeader />
+        </div>
+        {(calculateTotalFilters(currentProjectFilters ?? {}) !== 0 || currentProjectDisplayFilters?.favorites) && (
           <div className="border-b border-custom-border-200 px-5 py-3">
             <ModuleAppliedFiltersList
               appliedFilters={currentProjectFilters ?? {}}
+              isFavoriteFilterApplied={currentProjectDisplayFilters?.favorites ?? false}
               handleClearAllFilters={() => clearAllFilters(`${projectId}`)}
               handleRemoveFilter={handleRemoveFilter}
+              handleDisplayFiltersUpdate={(val) => {
+                if (!projectId) return;
+                updateDisplayFilters(projectId.toString(), val);
+              }}
               alwaysAllowEditing
             />
           </div>
diff --git a/web/store/cycle.store.ts b/web/store/cycle.store.ts
index f56e9f47e1..1784a013b3 100644
--- a/web/store/cycle.store.ts
+++ b/web/store/cycle.store.ts
@@ -32,7 +32,7 @@ export interface ICycleStore {
   currentProjectActiveCycleId: string | null;
   currentProjectArchivedCycleIds: string[] | null;
   // computed actions
-  getFilteredCycleIds: (projectId: string) => string[] | null;
+  getFilteredCycleIds: (projectId: string, sortByManual: boolean) => string[] | null;
   getFilteredCompletedCycleIds: (projectId: string) => string[] | null;
   getFilteredArchivedCycleIds: (projectId: string) => string[] | null;
   getCycleById: (cycleId: string) => ICycle | null;
@@ -228,7 +228,7 @@ export class CycleStore implements ICycleStore {
    * @param {TCycleFilters} filters
    * @returns {string[] | null}
    */
-  getFilteredCycleIds = computedFn((projectId: string) => {
+  getFilteredCycleIds = computedFn((projectId: string, sortByManual: boolean) => {
     const filters = this.rootStore.cycleFilter.getFiltersByProjectId(projectId);
     const searchQuery = this.rootStore.cycleFilter.searchQuery;
     if (!this.fetchedMap[projectId]) return null;
@@ -239,7 +239,7 @@ export class CycleStore implements ICycleStore {
         c.name.toLowerCase().includes(searchQuery.toLowerCase()) &&
         shouldFilterCycle(c, filters ?? {})
     );
-    cycles = orderCycles(cycles);
+    cycles = orderCycles(cycles, sortByManual);
     const cycleIds = cycles.map((c) => c.id);
     return cycleIds;
   });
diff --git a/web/store/module_filter.store.ts b/web/store/module_filter.store.ts
index 8d9315671f..ca5886541e 100644
--- a/web/store/module_filter.store.ts
+++ b/web/store/module_filter.store.ts
@@ -177,6 +177,7 @@ export class ModuleFilterStore implements IModuleFilterStore {
   clearAllFilters = (projectId: string, state: keyof TModuleFiltersByState = "default") => {
     runInAction(() => {
       this.filters[projectId][state] = {};
+      this.displayFilters[projectId].favorites = false;
     });
   };
 }
diff --git a/web/styles/globals.css b/web/styles/globals.css
index c3f7a0baf2..b27d3ef453 100644
--- a/web/styles/globals.css
+++ b/web/styles/globals.css
@@ -636,4 +636,8 @@ div.web-view-spinner div.bar12 {
 /* highlight class */
 .highlight {
   border: 1px solid rgb(var(--color-primary-100)) !important;
+}
+.highlight-with-line {
+  border-left: 5px solid rgb(var(--color-primary-100)) !important;
+  background: rgb(var(--color-background-80));
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index f75802bc4b..781dfb487e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,10 +29,10 @@
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@atlaskit/pragmatic-drag-and-drop-auto-scroll@^1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop-auto-scroll/-/pragmatic-drag-and-drop-auto-scroll-1.0.3.tgz#bb088a3d8eb77d9454dfdead433e594c5f793dae"
-  integrity sha512-gfXwzQZRsWSLd/88IRNKwf2e5r3smZlDGLopg5tFkSqsL03VDHgd6wch6OfPhRK2kSCrT1uXv5n9hOpVBu678g==
+"@atlaskit/pragmatic-drag-and-drop-auto-scroll@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@atlaskit/pragmatic-drag-and-drop-auto-scroll/-/pragmatic-drag-and-drop-auto-scroll-1.3.0.tgz#6af382a2d75924f5f0699ebf1b348e2ea8d5a2cd"
+  integrity sha512-8wjKAI5qSrLojt8ZJ2WhoS5P75oBu5g0yMpAnTDgfqFyQnkt5Uc1txCRWpG26SS1mv19nm8ak9XHF2DOugVfpw==
   dependencies:
     "@atlaskit/pragmatic-drag-and-drop" "^1.1.0"
     "@babel/runtime" "^7.0.0"
@@ -5896,20 +5896,10 @@ lru-cache@^6.0.0:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484"
   integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==
 
-lucide-react@^0.294.0:
-  version "0.294.0"
-  resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.294.0.tgz#dc406e1e7e2f722cf93218fe5b31cf3c95778817"
-  integrity sha512-V7o0/VECSGbLHn3/1O67FUgBwWB+hmzshrgDVRJQhMh8uj5D3HBuIvhuAmQTtlupILSplwIZg5FTc4tTKMA2SA==
-
-lucide-react@^0.309.0:
-  version "0.309.0"
-  resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.309.0.tgz#7369893cb4b074a0a0b1d3acdc6fd9a8bdb5add1"
-  integrity sha512-zNVPczuwFrCfksZH3zbd1UDE6/WYhYAdbe2k7CImVyPAkXLgIwbs6eXQ4loigqDnUFjyFYCI5jZ1y10Kqal0dg==
-
-lucide-react@^0.368.0:
-  version "0.368.0"
-  resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.368.0.tgz#3c0ee63f4f7d30ae63b621b2b8f04f9e409ee6e7"
-  integrity sha512-soryVrCjheZs8rbXKdINw9B8iPi5OajBJZMJ1HORig89ljcOcEokKKAgGbg3QWxSXel7JwHOfDFUdDHAKyUAMw==
+lucide-react@^0.378.0:
+  version "0.378.0"
+  resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.378.0.tgz#232acb99c6baedfa90959a2c0dd11327b058bde8"
+  integrity sha512-u6EPU8juLUk9ytRcyapkWI18epAv3RU+6+TC23ivjR0e+glWKBobFeSgRwOIJihzktILQuy6E0E80P2jVTDR5g==
 
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
