diff --git a/Marco.Pms.Services/EmailTemplates/forgot-password.html b/Marco.Pms.Services/EmailTemplates/forgot-password.html
index 1d0e81f1..aab7782d 100644
--- a/Marco.Pms.Services/EmailTemplates/forgot-password.html
+++ b/Marco.Pms.Services/EmailTemplates/forgot-password.html
@@ -139,9 +139,7 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
-                                                                        <a class="mx-1 text-green"
+                                                                                       <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
                                                                             <span class="text-blue"
@@ -199,28 +197,6 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">16px
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -301,44 +277,7 @@
                                                                         </p>
                                                                         <p>
 
-                                                                        </p>
-                                                                        <!-- <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Here
-                                                                                are your details:</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Role:
-                                                                                <strong>[Volunteer
-                                                                                    Role]</strong><br>Date & Time:
-                                                                                <strong>[Event
-                                                                                    Date/Time]</strong><br>Location:
-                                                                                <strong>[Location/Online
-                                                                                    Link]</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">We’ll
-                                                                                be in touch with any updates before the
-                                                                                event.</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Looking
-                                                                                forward to working together,<br>{NGO
-                                                                                Name}</span>
-                                                                        </p> -->
+                                                                        </p>                                                                        
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -352,41 +291,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                    
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -423,30 +328,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                  
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -501,40 +383,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/EmailTemplates/full-template.html b/Marco.Pms.Services/EmailTemplates/full-template.html
index 1eeb75a0..1dea3f61 100644
--- a/Marco.Pms.Services/EmailTemplates/full-template.html
+++ b/Marco.Pms.Services/EmailTemplates/full-template.html
@@ -139,8 +139,7 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
+                                                                     
                                                                         <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
@@ -199,29 +198,7 @@
                                                                 </div>
                                                             </td>
                                                         </tr>
-                                                    </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 18px;">Thank
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    </table>                                                   
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -310,43 +287,7 @@
                                                                         <p>
 
                                                                         </p>
-                                                                        <!-- <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 18px;">Here
-                                                                                are your details:</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 18px;">Role:
-                                                                                <strong>[Volunteer
-                                                                                    Role]</strong><br>Date & Time:
-                                                                                <strong>[Event
-                                                                                    Date/Time]</strong><br>Location:
-                                                                                <strong>[Location/Online
-                                                                                    Link]</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 18px;">We’ll
-                                                                                be in touch with any updates before the
-                                                                                event.</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 18px;">Looking
-                                                                                forward to working together,<br>{NGO
-                                                                                Name}</span>
-                                                                        </p> -->
+                                                                        
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -360,41 +301,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                    
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -431,30 +338,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -509,40 +393,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/EmailTemplates/new-user-email.html b/Marco.Pms.Services/EmailTemplates/new-user-email.html
index 43146ab4..9c597f60 100644
--- a/Marco.Pms.Services/EmailTemplates/new-user-email.html
+++ b/Marco.Pms.Services/EmailTemplates/new-user-email.html
@@ -139,8 +139,6 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
                                                                         <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
@@ -199,28 +197,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">16px
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -302,46 +279,6 @@
                                                                                 Delivery
                                                                             </span>
                                                                         </p>
-                                                                        <p>
-
-                                                                        </p>
-                                                                        <!-- <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Here
-                                                                                are your details:</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Role:
-                                                                                <strong>[Volunteer
-                                                                                    Role]</strong><br>Date & Time:
-                                                                                <strong>[Event
-                                                                                    Date/Time]</strong><br>Location:
-                                                                                <strong>[Location/Online
-                                                                                    Link]</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">We’ll
-                                                                                be in touch with any updates before the
-                                                                                event.</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Looking
-                                                                                forward to working together,<br>{NGO
-                                                                                Name}</span>
-                                                                        </p> -->
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -355,41 +292,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                    
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -426,30 +329,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -504,40 +384,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/EmailTemplates/password-change-success.html b/Marco.Pms.Services/EmailTemplates/password-change-success.html
index c77a5f61..2f6466ea 100644
--- a/Marco.Pms.Services/EmailTemplates/password-change-success.html
+++ b/Marco.Pms.Services/EmailTemplates/password-change-success.html
@@ -139,8 +139,7 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
+
                                                                         <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
@@ -199,28 +198,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">16px
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -289,7 +267,8 @@
                                                                        
                                                                         <p style="margin:0;font-size:14px;mso-line-height-alt:25.2px;margin-top: 40px;">
                                                                             <span style="word-break: break-word; font-size:16px;">
-Thank you for joining onFieldWork.com, the
+                                                                                Thank
+                                                                                you for joining onFieldWork.com, the
                                                                                 Tool for Efficient Fieldwork & Project
                                                                                 Delivery
                                                                             </span>
@@ -297,43 +276,7 @@ Thank you for joining onFieldWork.com, the
                                                                         <p>
 
                                                                         </p>
-                                                                        <!-- <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Here
-                                                                                are your details:</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Role:
-                                                                                <strong>[Volunteer
-                                                                                    Role]</strong><br>Date & Time:
-                                                                                <strong>[Event
-                                                                                    Date/Time]</strong><br>Location:
-                                                                                <strong>[Location/Online
-                                                                                    Link]</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">We’ll
-                                                                                be in touch with any updates before the
-                                                                                event.</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Looking
-                                                                                forward to working together,<br>{NGO
-                                                                                Name}</span>
-                                                                        </p> -->
+                                                                       
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -347,41 +290,7 @@ Thank you for joining onFieldWork.com, the
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                   
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -418,30 +327,7 @@ Thank you for joining onFieldWork.com, the
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -496,40 +382,7 @@ Thank you for joining onFieldWork.com, the
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/EmailTemplates/request-demo.html b/Marco.Pms.Services/EmailTemplates/request-demo.html
index 1923de6b..1cdc7f3d 100644
--- a/Marco.Pms.Services/EmailTemplates/request-demo.html
+++ b/Marco.Pms.Services/EmailTemplates/request-demo.html
@@ -139,8 +139,7 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
+
                                                                         <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
@@ -199,28 +198,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Thank
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -277,17 +255,11 @@
                                                                         <h4 style="font-size: 14px; line-height: 140%;"><span style="font-size:16px; line-height: 25.2px; color: #666666;">Here are a few details about our organization: </span></h4>
                                                                         <ul>
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Organization Name:</b> {{ORGANIZATION_NAME}} </span></li>
-                                                                            <!--<p style="font-size: 14px; line-height: 140%;">&nbsp;</p>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Our Eamil:</b> <a href="mailto:{{EMAIL}}">{{EMAIL}}</a> </span></li>
-                                                                            <!--<li style="font-size: 14px; line-height: 140%;">&nbsp;</li>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Contact person:</b> {{CONTACT_NAME}} </span></li>
-                                                                            <!--<p style="font-size: 14px; line-height: 140%;">&nbsp;</p>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Contact Number:</b> {{CONTACT_NUMBER}} </span></li>
-                                                                            <!--<p style="font-size: 14px; line-height: 140%;">&nbsp;</p>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Organization Size:</b> {{ORGANIZATION_SIZE}} </span></li>
-                                                                            <!--<p style="font-size: 14px; line-height: 140%;">&nbsp;</p>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>Industry Name:</b> {{INDUSTRY_NAME}} </span></li>
-                                                                            <!--<p style="font-size: 14px; line-height: 140%;">&nbsp;</p>-->
                                                                             <li style="font-size: 14px; line-height: 140%;"><span style="font-size: 14px; line-height: 25.2px; color: #666666;"><b>About organization:</b> {{ABOUT}} </span></li>
                                                                         </ul>
 
@@ -297,43 +269,7 @@
                                                                             </span>
                                                                         </p>
                                                                        
-                                                                        <!-- <p
-        style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-        <span
-            style="word-break: break-word; font-size:16px;">Here
-            are your details:</span>
-    </p>
-    <p
-        style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-        &nbsp;</p>
-    <p
-        style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-        <span
-            style="word-break: break-word; font-size:16px;">Role:
-            <strong>[Volunteer
-                Role]</strong><br>Date & Time:
-            <strong>[Event
-                Date/Time]</strong><br>Location:
-            <strong>[Location/Online
-                Link]</strong></span>
-    </p>
-    <p
-        style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-        &nbsp;</p>
-    <p
-        style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-        <span
-            style="word-break: break-word; font-size:16px;">We’ll
-            be in touch with any updates before the
-            event.</span>
-    </p>
-    <p
-        style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-        <span
-            style="word-break: break-word; font-size:16px;">Looking
-            forward to working together,<br>{NGO
-            Name}</span>
-    </p> -->
+                                                                       
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -347,41 +283,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                    
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -418,30 +320,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -496,40 +375,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/EmailTemplates/send-otp.html b/Marco.Pms.Services/EmailTemplates/send-otp.html
index 3479e571..7a3db736 100644
--- a/Marco.Pms.Services/EmailTemplates/send-otp.html
+++ b/Marco.Pms.Services/EmailTemplates/send-otp.html
@@ -139,8 +139,6 @@
                                                                         <img src="https://cdn.marcoaiot.com/icons/logos/logo.png"
                                                                              style="display:block;height:auto;border:0;width:25%"
                                                                              width="169" alt title height="auto">
-                                                                        <!-- <span
-                                                                            style="margin-left: 10px;">OnFieldWork.com</span> -->
                                                                         <a class="mx-1 text-green"
                                                                            style="margin-left:10px;color: #71dd37; font-size: 20px;   font-weight: bold;text-decoration: none;"
                                                                            href="/">
@@ -199,28 +197,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-left:60px;padding-right:10px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:14px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:16.8px;color:#fff;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Thank
-                                                                                you for joining onFieldWork.com, the
-                                                                                Tool for Efficient Fieldwork & Project
-                                                                                Delivery</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="image_block block-3" width="100%" border="0"
                                                            cellpadding="0" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -297,43 +274,7 @@
                                                                         <p>
 
                                                                         </p>
-                                                                        <!-- <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Here
-                                                                                are your details:</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Role:
-                                                                                <strong>[Volunteer
-                                                                                    Role]</strong><br>Date & Time:
-                                                                                <strong>[Event
-                                                                                    Date/Time]</strong><br>Location:
-                                                                                <strong>[Location/Online
-                                                                                    Link]</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:19.599999999999998px">
-                                                                            &nbsp;</p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">We’ll
-                                                                                be in touch with any updates before the
-                                                                                event.</span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;mso-line-height-alt:25.2px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size:16px;">Looking
-                                                                                forward to working together,<br>{NGO
-                                                                                Name}</span>
-                                                                        </p> -->
+                                                                       
                                                                     </div>
                                                                 </div>
                                                             </td>
@@ -347,41 +288,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    <!-- <table class="row row-4" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
-                        role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <table class="row-content stack" align="center" border="0" cellpadding="0"
-                                        cellspacing="0" role="presentation"
-                                        style="mso-table-lspace:0;mso-table-rspace:0;border-radius:0;color:#000;width:750px;margin:0 auto"
-                                        width="750">
-                                        <tbody>
-                                            <tr>
-                                                <td class="column column-1" width="100%"
-                                                    style="mso-table-lspace:0;mso-table-rspace:0;font-weight:400;text-align:left;vertical-align:top">
-                                                    <table class="image_block block-1" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0">
-                                                        <tr>
-                                                            <td class="pad" style="width:100%">
-                                                                <div class="alignment" align="center">
-                                                                    <div style="max-width:750px"><img
-                                                                            src="https://d15k2d11r6t6rl.cloudfront.net/pub/r388/l239mmxz/27a/mgu/yoy/trnp03_img_02.png"
-                                                                            style="display:block;height:auto;border:0;width:100%"
-                                                                            width="750" alt title height="auto"></div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table> -->
+                   
                     <table class="row row-5" align="center" width="100%" border="0" cellpadding="0" cellspacing="0"
                            role="presentation" style="mso-table-lspace:0;mso-table-rspace:0">
                         <tbody>
@@ -418,30 +325,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-2" width="100%" border="0"
-                                                        cellpadding="10" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Our
-                                                                                    mailing address:</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;">{company_address}</span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                    
                                                     <table class="social_block block-3" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0">
@@ -496,40 +380,7 @@
                                                             </td>
                                                         </tr>
                                                     </table>
-                                                    <!-- <table class="text_block block-4" width="100%" border="0"
-                                                        cellpadding="0" cellspacing="0" role="presentation"
-                                                        style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
-                                                        <tr>
-                                                            <td class="pad"
-                                                                style="padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px">
-                                                                <div style="font-family:sans-serif">
-                                                                    <div class
-                                                                        style="font-size:12px;font-family:Montserrat,'Trebuchet MS','Lucida Grande','Lucida Sans Unicode','Lucida Sans',Tahoma,sans-serif;mso-line-height-alt:14.399999999999999px;color:#555;line-height:1.2">
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><strong>Want
-                                                                                    to change how you receive this
-                                                                                    email?</strong></span>
-                                                                        </p>
-                                                                        <p
-                                                                            style="margin:0;font-size:14px;text-align:center;mso-line-height-alt:16.8px">
-                                                                            <span
-                                                                                style="word-break: break-word; font-size: 12px;"><a
-                                                                                    href="http://[updateprofile]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">manage
-                                                                                    preference</a> &nbsp; &nbsp;·&nbsp;
-                                                                                &nbsp; <a
-                                                                                    href="http://[globalunsubscribe]/"
-                                                                                    target="_blank" rel="noopener"
-                                                                                    style="color: #555555;">unsubscribe</a></span>
-                                                                        </p>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                        </tr>
-                                                    </table> -->
+                                                   
                                                     <table class="paragraph_block block-5" width="100%" border="0"
                                                            cellpadding="10" cellspacing="0" role="presentation"
                                                            style="mso-table-lspace:0;mso-table-rspace:0;word-break:break-word">
diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index c4fa66e5..e01eaa96 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -56,5 +56,8 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="EmailTemplates\NewFolder\" />
+	</ItemGroup>
 
 </Project>