diff --git a/grails-app/controllers/au/org/ala/alerts/AdminController.groovy b/grails-app/controllers/au/org/ala/alerts/AdminController.groovy
index 6c37901c..92438e81 100644
--- a/grails-app/controllers/au/org/ala/alerts/AdminController.groovy
+++ b/grails-app/controllers/au/org/ala/alerts/AdminController.groovy
@@ -741,6 +741,27 @@ class AdminController {
         }
     }
 
+    /**
+     * Reset the previous / current results stored in QueryResult
+     * @return
+     */
+    @AlaSecured(value = ['ROLE_ADMIN'], anyRole = true)
+    @Transactional
+    def resetQueryResult() {
+        try{
+            def id = params.id.toInteger()
+            if(id){
+                queryResultService.reset(id)
+                render([status: 0, message: "Query result has been reset"] as JSON)
+            } else {
+                render([status: 1, message: "Missing ID"] as JSON)
+            }
+        } catch (Exception e) {
+            render([status: 1, message: "Error in resetting query result: ${e.message}"] as JSON)
+        }
+    }
+
+
     @AlaSecured(value = ['ROLE_ADMIN', 'ROLE_BIOSECURITY_ADMIN'], anyRole = true, redirectController = 'notification', redirectAction = 'myAlerts', message = "You don't have permission to view that page.")
     def listBiosecurityAuditCSV() {
         def result = [:]
diff --git a/grails-app/controllers/au/org/ala/alerts/WebserviceController.groovy b/grails-app/controllers/au/org/ala/alerts/WebserviceController.groovy
index 78ccf24b..79aa2530 100644
--- a/grails-app/controllers/au/org/ala/alerts/WebserviceController.groovy
+++ b/grails-app/controllers/au/org/ala/alerts/WebserviceController.groovy
@@ -39,6 +39,7 @@ import static io.swagger.v3.oas.annotations.enums.ParameterIn.HEADER
 class WebserviceController {
 
     def queryService
+    def queryResultService
     def userService
     def notificationService
     def biosecurityService
@@ -364,6 +365,7 @@ class WebserviceController {
         redirectIfSupplied(params)
     }
 
+
     @Operation(
             method = "POST",
             tags = "alerts",
diff --git a/grails-app/domain/au/org/ala/alerts/QueryResult.groovy b/grails-app/domain/au/org/ala/alerts/QueryResult.groovy
index 5b0ed08c..56e983c8 100644
--- a/grails-app/domain/au/org/ala/alerts/QueryResult.groovy
+++ b/grails-app/domain/au/org/ala/alerts/QueryResult.groovy
@@ -1,7 +1,5 @@
 package au.org.ala.alerts
 
-import com.jayway.jsonpath.JsonPath
-
 import java.text.SimpleDateFormat
 import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
@@ -75,7 +73,7 @@ class QueryResult {
     }
 
     String toString() {
-        "${frequency?.name}: ${lastChanged ? 'Changed' : 'No Change'} on ${lastChecked}"
+        "${frequency?.name}: ${query?.name} : ${id} ${lastChanged ? 'Changed' : 'No Change'} on ${lastChecked}"
     }
 
     Map brief() {
@@ -129,7 +127,6 @@ class QueryResult {
     }
 
     byte[] compress(String json) {
-        //store the last result from the webservice call
         if (json) {
             ByteArrayOutputStream bout = new ByteArrayOutputStream()
             GZIPOutputStream gzout = new GZIPOutputStream(bout)
diff --git a/grails-app/jobs/ala/postie/HourlyQueriesJob.groovy b/grails-app/jobs/ala/postie/HourlyQueriesJob.groovy
index c9066e7f..9ee3392a 100644
--- a/grails-app/jobs/ala/postie/HourlyQueriesJob.groovy
+++ b/grails-app/jobs/ala/postie/HourlyQueriesJob.groovy
@@ -1,5 +1,8 @@
 package ala.postie
 
+import grails.plugins.schwartz.monitor.listener.QuartzJobListener
+import org.quartz.JobExecutionContext
+
 class HourlyQueriesJob {
 
     static triggers = {
@@ -11,6 +14,6 @@ class HourlyQueriesJob {
     def execute() {
         log.info("****** Starting hourly update ****** " + new Date())
         notificationService.execQueryForFrequency('hourly')
-        log.info("****** Finished hourly update ******" + new Date())
+        log.info("****** Finished hourly update ****** " + new Date())
     }
 }
\ No newline at end of file
diff --git a/grails-app/services/au/org/ala/alerts/DiffService.groovy b/grails-app/services/au/org/ala/alerts/DiffService.groovy
index c6ee8b61..202b0645 100644
--- a/grails-app/services/au/org/ala/alerts/DiffService.groovy
+++ b/grails-app/services/au/org/ala/alerts/DiffService.groovy
@@ -68,21 +68,23 @@ class DiffService {
         // The following check is determined by the last propertyValue, since it overwrites the previous one
 
         queryResult.propertyValues.each { pv ->
-            log.debug("[QUERY " + queryResult.query.id + "] " +
-                    " Has changed check:" + pv.propertyPath.name
-                    + ", value:" + pv.currentValue
-                    + ", previous:" + pv.previousValue
-                    + ", fireWhenNotZero:" + pv.propertyPath.fireWhenNotZero
-                    + ", fireWhenChange:" + pv.propertyPath.fireWhenChange
-            )
-
-            // Two different types of queries: Biocache and Blog/News
-            // Biocache: totalRecords and last_loaded_records
-            // Blog/News: last_blog_id
-            if (pv.propertyPath.fireWhenNotZero) {
-                changed = pv.currentValue?.toInteger() ?: 0 > 0
-            } else if (pv.propertyPath.fireWhenChange) {
-                changed = pv.previousValue != pv.currentValue
+            if (pv) {
+                log.debug("[QUERY " + queryResult.query.id + "] " +
+                        " Has changed check:" + pv.propertyPath.name
+                        + ", value:" + pv.currentValue
+                        + ", previous:" + pv.previousValue
+                        + ", fireWhenNotZero:" + pv.propertyPath.fireWhenNotZero
+                        + ", fireWhenChange:" + pv.propertyPath.fireWhenChange
+                )
+
+                // Two different types of queries: Biocache and Blog/News
+                // Biocache: totalRecords and last_loaded_records
+                // Blog/News: last_blog_id
+                if (pv.propertyPath.fireWhenNotZero) {
+                    changed = pv.currentValue?.toInteger() ?: 0 > 0
+                } else if (pv?.propertyPath.fireWhenChange) {
+                    changed = pv.previousValue != pv.currentValue
+                }
             }
         }
 
diff --git a/grails-app/services/au/org/ala/alerts/ImageService.groovy b/grails-app/services/au/org/ala/alerts/ImageService.groovy
index e82573b9..23158786 100644
--- a/grails-app/services/au/org/ala/alerts/ImageService.groovy
+++ b/grails-app/services/au/org/ala/alerts/ImageService.groovy
@@ -33,10 +33,12 @@ class ImageService {
         def dataResourceInfos = collectionService.findResourceByUids(collectionUrl, drIds)
         drIds.each { id ->
             def dataResourceInfo = dataResourceInfos[id]
-            groupedByDataResource[id].each { record ->
-                record["dataResourceInfo"] = [:]
-                record["dataResourceInfo"].lastUpdated = dataResourceInfo.lastUpdated
-                record["dataResourceInfo"].alaPublicUrl = dataResourceInfo.alaPublicUrl
+            if (dataResourceInfo) {
+                groupedByDataResource[id].each { record ->
+                    record["dataResourceInfo"] = [:]
+                    record["dataResourceInfo"].lastUpdated = dataResourceInfo.lastUpdated
+                    record["dataResourceInfo"].alaPublicUrl = dataResourceInfo.alaPublicUrl
+                }
             }
         }
         return groupedByDataResource
diff --git a/grails-app/services/au/org/ala/alerts/NotificationService.groovy b/grails-app/services/au/org/ala/alerts/NotificationService.groovy
index f3a60627..1dfb3a02 100644
--- a/grails-app/services/au/org/ala/alerts/NotificationService.groovy
+++ b/grails-app/services/au/org/ala/alerts/NotificationService.groovy
@@ -164,12 +164,17 @@ class NotificationService {
             def duration = TimeCategory.minus(endTime, startTime)
             qr.addLog("Time cost: ${duration}")
             if(!dryRun) {
-                QueryResult.withTransaction {
-                    if (!qr.save(validate: true, flush: true)) {
-                        qr.errors.allErrors.each {
-                            log.error(it)
+                try {
+                    QueryResult.withTransaction {
+                        if (!qr.save(validate: true)) {
+                            qr.errors.allErrors.each {
+                                log.error(it)
+                            }
                         }
                     }
+                } catch (Exception e) {
+                    //todo check why sometimes scheduler cannot save the queryresult
+                    log.error("An unexpected error occurred in saving queryresult: ${qr}", e)
                 }
             }
             else {
@@ -646,10 +651,9 @@ class NotificationService {
         log.debug("Checking frequency : " + frequencyName)
         Date now = new Date()
         Frequency frequency = Frequency.findByName(frequencyName)
-        execQueryForFrequency(frequency, sendEmails)
-        //update the frequency last checked
-        frequency = Frequency.findByName(frequencyName)
         if (frequency) {
+            execQueryForFrequency(frequency, sendEmails)
+            //update the frequency last checked
             frequency.lastChecked = now
             Frequency.withTransaction {
                 if (!frequency.save(validate: true, flush: true)) {
diff --git a/grails-app/services/au/org/ala/alerts/QueryResultService.groovy b/grails-app/services/au/org/ala/alerts/QueryResultService.groovy
index 07ffaac7..f529237a 100644
--- a/grails-app/services/au/org/ala/alerts/QueryResultService.groovy
+++ b/grails-app/services/au/org/ala/alerts/QueryResultService.groovy
@@ -14,6 +14,8 @@
 
 package au.org.ala.alerts
 
+import javax.transaction.Transactional
+
 /**
  * Database service for QueryResult:
  */
@@ -39,4 +41,19 @@ class QueryResultService {
         }
         return qs
     }
+
+    /**
+     * Reset the QueryResult
+     * @param id
+     */
+    def reset(id){
+        QueryResult qs = QueryResult.get(id)
+        if (qs) {
+            qs.previousResult = null
+            qs.lastResult = null
+            qs.hasChanged = false
+            qs.lastChecked = qs.lastChanged = null
+            qs.save(flush:true)
+        }
+    }
 }
diff --git a/grails-app/views/admin/biosecurity.gsp b/grails-app/views/admin/biosecurity.gsp
index eb8279ea..a5a6f5ec 100644
--- a/grails-app/views/admin/biosecurity.gsp
+++ b/grails-app/views/admin/biosecurity.gsp
@@ -212,29 +212,32 @@
         }
 
         function triggerSubscriptions() {
-            let url = "${request.contextPath}/ws/triggerBiosecurityAlerts"
-            $.ajax({
-                url: url,
-                type: 'GET',
-                success: function (data) {
-                    data.forEach(function(item) {
-                        let status = item[0];
-                        let message = item[1];
+            const userInput = prompt(`This action will trigger all alerts. Type ‘yes’ if you understand and wish to proceed. `);
+            if (userInput && userInput.toLowerCase() === 'yes') {
+                let url = "${request.contextPath}/ws/triggerBiosecurityAlerts"
+                $.ajax({
+                    url: url,
+                    type: 'GET',
+                    success: function (data) {
+                        data.forEach(function (item) {
+                            let status = item[0];
+                            let message = item[1];
 
-                        if (status === 0) {
-                            console.info( message);
-                        } else {
-                            console.error(message);
-                        }
-                    });
-                },
-                error: function (xhr, status, error) {
-                    // Handle errors
-                    console.error(xhr.responseText);
-                }
-            });
+                            if (status === 0) {
+                                console.info(message);
+                            } else {
+                                console.error(message);
+                            }
+                        });
+                    },
+                    error: function (xhr, status, error) {
+                        // Handle errors
+                        console.error(xhr.responseText);
+                    }
+                });
 
-            alert("Subscriptions have been triggered. Monitor the console logs for progress updates.")
+                alert("Subscriptions have been triggered. Monitor the console logs for progress updates.")
+            }
         }
 
         // Initialize popovers again after any records are loaded by Ajax
diff --git a/grails-app/views/admin/query.gsp b/grails-app/views/admin/query.gsp
index ac62c3d7..ace1b356 100644
--- a/grails-app/views/admin/query.gsp
+++ b/grails-app/views/admin/query.gsp
@@ -19,6 +19,30 @@
                 $(target).collapse('toggle');
             });
         });
+
+        function resetResultsInDB(id) {
+            const userInput = prompt(`This action will reset the previous and current results in the database. Type ‘yes’ if you understand and wish to proceed. `);
+            if (userInput && userInput.toLowerCase() === 'yes') {
+                const numericId = parseInt(id, 10);
+                fetch(`/admin/resetQueryResult?id=`+numericId, {
+                    method: 'GET',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                })
+                .then(response => response.json())
+                .then(data => {
+                    if (data.status === 1) {
+                        alert("Failed:" + data.message);
+                    } else {
+                        alert("Reset successfully.");
+                    }
+                })
+                .catch(error => {
+                    alert('Error occurred while resetting record: ' + error);
+                });
+            }
+        }
     </script>
 
 </head>
@@ -62,9 +86,11 @@
                             <div class="collapse" id="more-${query.id}">
                                 <div class="card card-body">
 
-                                    <div><p class="bg-info"> ${query.baseUrl+query.queryPath}</p></div>
-                                    <i class="fa fa-cog" aria-hidden="true"></i> <i><b>JSON ID path:</b>${query.idJsonPath}  &nbsp; <b>JSON record path:</b>${query.recordJsonPath}</i>
-    %{--                                <div>--}%
+                                    <div><p class="bg-info"><b>Query URL:</b> ${query.baseUrl+query.queryPath}</p>
+                                        <p><i class="fa fa-info-circle" aria-hidden="true" title="The URL MAY be used to build a UI link for this query."></i> <i>ref. ${query.baseUrlForUI}</i></p>
+                                    </div>
+                                    <i class="fa fa-cog" aria-hidden="true"></i> <i><b>JSON record path:</b>${query.recordJsonPath} <b>JSON ID path:</b>${query.idJsonPath}</i>
+                                    %{--                                <div>--}%
     %{--                                    <g:if test="${query.notifications}">--}%
     %{--                                            <g:each var="notification" in="${query.notifications}">--}%
     %{--                                                <li>${notification.user?.email}</li> --}%
@@ -85,18 +111,23 @@
                                                         </g:else>
                                                     </div>
                                                     <div>
-                                                        <b>${queryResult.frequency?.name?.toUpperCase()}</b> query result ID: <g:link controller="queryResult" action="getDetails" params="[id: queryResult.id]" target="_blank"> <span class="badge badge-primary">${queryResult.id}</span></g:link>
-                                                        <br/>
+                                                        <b>${queryResult.frequency?.name?.toUpperCase()}</b>
+                                                        query result ID: <g:link controller="queryResult" action="getDetails" params="[id: queryResult.id]" target="_blank"> <span class="badge badge-primary">${queryResult.id}</span></g:link>
+
                                                         <g:if test="${queryResult?.lastChecked}">
                                                              Last checked: ${queryResult?.lastChecked}&nbsp;&nbsp;
                                                         </g:if>
                                                         <g:link controller="ws" action="getQueryLogs" params="[id: query.id, frequency: queryResult.frequency?.name]" target="_blank">Log</g:link>
-                                                        &nbsp;&nbsp;
+                                                                                                               &nbsp;&nbsp;
                                                         <g:if test="${queryResult?.queryUrlUsed}">
                                                             <a href="${queryResult?.queryUrlUsed}" target="_blank" title="URL for search">
                                                                 Query URL
                                                             </a>
                                                         </g:if>
+                                                        <g:if test="${grailsApplication.config.grails.env != 'production'}">
+                                                        <br/>
+                                                        <b><i class="fa fa-warning" style="color:#c44d34"></i> Resetting the previous and current results of this record to help testers identify new records.</b><button class="btn btn-primary" onclick="resetResultsInDB(${queryResult.id})">Reset</button>
+                                                        </g:if>
                                                         <br/>
                                                         Subscribers:${query.countSubscribers(queryResult.frequency?.name)}
                                                     </div>
@@ -132,21 +163,19 @@
                                                                     %>
                                                                     <input type="hidden" name="queryId" value="${query.id}" />
                                                                     <input type="hidden" name="frequency" value="${queryResult.frequency?.name}" />
-                                                                    <label for="checkDate">Run the query against the given date, and email new records
-                                                                        <i class="fa fa-info-circle" aria-hidden="true" style="color: #c44d34;"
-                                                                           title="It may be set as starting from that date, ending on that date, spanning a period around that date, or not used at all."></i>
-                                                                        The date range associated with the given date is determined by the
-
+                                                                    <label for="checkDate">Run the
                                                                         <g:if test="${queryResult?.queryUrlUsed}">
-                                                                            <a href="${queryResult?.queryUrlUsed}" target="_blank" title="URL for search">
-                                                                                <i class="fa fa-search" aria-hidden="true"></i> query
-                                                                            </a>
-                                                                        </g:if>
+                                                                            <a href="${queryResult?.queryUrlUsed}" target="_blank" title="URL for search"><i class="fa fa-link" aria-hidden="true"></i> query</a>
+                                                                         </g:if>
                                                                         <g:else>
-                                                                             query
+                                                                            query
                                                                         </g:else>
+                                                                         against the given date <i class="fa fa-info-circle" aria-hidden="true" style="color: #c44d34;"
+                                                                                                  title="It may be set as starting from that date, ending on that date, spanning a period around that date, or not used at all."></i>
+                                                                        , and email new records. The date range associated with the given date is determined by the query.
+
                                                                      </label>
-                                                                     <input type="date" id="checkDate" name="checkDate"value="${today}" class="form-control" />
+                                                                     <input type="date" id="checkDate" name="checkDate" value="${today}" class="form-control" />
                                                                     <button type="submit" class="btn btn-info mb-2">Email me, No DB update</button>
                                                                 </g:form>
                                                             </div>
diff --git a/grails-app/views/email/_footer.gsp b/grails-app/views/email/_footer.gsp
index 39c3edbd..8408eee4 100644
--- a/grails-app/views/email/_footer.gsp
+++ b/grails-app/views/email/_footer.gsp
@@ -1,12 +1,12 @@
 <!-- Footer Section -->
 <tr>
-    <td style="padding: 35px 70px 35px 70px;background-color: #C44D34;color: #fff;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;;text-align: center;">
+    <td style="padding: 35px 70px 35px 70px;background-color: #C44D34;color: #fff;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;;text-align: center;">
         <p>The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.</p>
         <p>We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.</p>
     </td>
 </tr>
 <tr>
-    <td style="padding: 35px 70px 5px 70px;background-color: #ffffff;color: #000;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
+    <td style="padding: 35px 70px 5px 70px;background-color: #ffffff;color: #000;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
         <p>
             <a href="https://www.education.gov.au/national-collaborative-research-infrastructure-strategy-ncris"><img loading="lazy"  src="${grailsApplication.config.grails.serverURL}/assets/email/NCRIS_150px-150x109.jpg" alt="NCRIS logo" width="125" height="90"></a>&nbsp;
         &nbsp;<a href="https://csiro.au/"><img loading="lazy" src="${grailsApplication.config.grails.serverURL}/assets/email/CSIRO_Solid_RGB-150x150.png" alt="CSIRO logo" width="90" height="90"></a>&nbsp;
diff --git a/grails-app/views/email/_unsubscribe.gsp b/grails-app/views/email/_unsubscribe.gsp
index bf17c941..534a4a54 100644
--- a/grails-app/views/email/_unsubscribe.gsp
+++ b/grails-app/views/email/_unsubscribe.gsp
@@ -1,5 +1,5 @@
 <tr >
-    <td style="padding: 5px 70px 10px 70px;background-color: #ffffff;color: #000;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
+    <td style="padding: 5px 70px 10px 70px;background-color: #ffffff;color: #000;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
         <g:message code="email.unsubscribe.query" args="[unsubscribeOne, queryName]" />
         <br>
         <a href="${stopNotification}"><g:message code="alert.manage" /></a>
diff --git a/grails-app/views/email/annotations.gsp b/grails-app/views/email/annotations.gsp
index 68bbc9b5..ecdfe89e 100644
--- a/grails-app/views/email/annotations.gsp
+++ b/grails-app/views/email/annotations.gsp
@@ -10,11 +10,11 @@
 </head>
 <style>
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -25,13 +25,13 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td  align="center" background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td  align="center" background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
                     </td>
@@ -39,38 +39,47 @@
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                         <g:set var="occurrencelink" value="${query.baseUrlForUI}/occurrences/${oc.uuid}"></g:set>
                         <g:set var="assertionlink" value="${query.baseUrl}/occurrences/${oc.uuid}/assertions"></g:set>
                         <table style="width: 100%">
                             <tr style="vertical-align: top;">
                                 <td style="width: 37%">
-                                    <a href="${occurrencelink}" style="color: #C44D34;text-decoration: none;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                        <g:if test="${ oc.scientificName?:oc.vernacularName ?: oc.raw_raw_scientificName}">
-                                            <strong>${i+1}. <em>${oc.scientificName?: oc.vernacularName ?: oc.raw_raw_scientificName }</em></strong>
-                                        </g:if>
-                                    </a>
-                                    <p style="padding-left: 15px;">
-                                        <g:if test="${oc.taxonRankID > 5000}"><i></g:if>
-                                        ${oc.vernacularName}<br/>
-                                        <g:if test="${oc.taxonRankID > 5000}"></i></g:if>
-                                        ${oc.stateProvince}<br/>
-                                        Family: ${oc.family}<br/>
-                                        <g:if test="${oc.dataProviderName}">
-                                            Source: ${oc.dataProviderName}
-                                        </g:if>
-                                    </p>
-
+                                     <table>
+                                        <tr>
+                                            <td style="white-space: nowrap; vertical-align: top; text-align: right; padding-right: 10px;">
+                                            <strong>${i+1}. </strong>
+                                            </td>
+                                             <td style="vertical-align: top;">
+                                                 <a href="${occurrencelink}" style="color: #003A70;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                                    <strong><em>${oc.scientificName?: oc.vernacularName ?: oc.raw_raw_scientificName }</em></strong>
+                                                 </a>
+                                                 <p>
+                                                    <g:if test="${oc.vernacularName}">
+                                                         ${oc.vernacularName}<br/>
+                                                    </g:if>
+                                                     <g:if test="${oc.stateProvince}">
+                                                         ${oc.stateProvince}<br/>
+                                                     </g:if>
+                                                     <g:if test="${oc.family}">
+                                                         Family: ${oc.family}<br/>
+                                                     </g:if>
+                                                     <g:if test="${oc.dataProviderName}">
+                                                         Source: ${oc.dataProviderName}
+                                                     </g:if>
+                                                 </p>
+                                             </td>
+                                        </tr>
+                                     </table>
                                 </td>
-                                <td class="annotation" nowrap="nowrap" style="width: 30%; word-wrap: break-word; white-space: normal;">
+                                <td class="annotation" nowrap="nowrap" style="width: 30%; padding-left:10px;padding-top:8px; word-wrap: break-word; white-space: normal;">
                                     <g:if test="${oc.user_assertions?.size() > 0}">
                                         <%
                                             def latestAssertion = oc.user_assertions[0] // Get the first (latest) assertion
                                         %>
                                         <b>Comment:</b><br/>
                                         <i>${StringUtils.abbreviate(latestAssertion.comment, 100)}</i>
-                                        <br>-<b>${latestAssertion.userDisplayName}
-                                            <g:if test="${latestAssertion.created}">,&nbsp;
+                                        <br>-<b>${latestAssertion.userDisplayName}<g:if test="${latestAssertion.created}">,&nbsp;
                                                     <%
                                                         try {
                                                             def parsedDate = Date.parse("yyyy-MM-dd'T'HH:mm:ss'Z'", latestAssertion.created)
diff --git a/grails-app/views/email/biocache.gsp b/grails-app/views/email/biocache.gsp
index 1448b583..ade013ab 100644
--- a/grails-app/views/email/biocache.gsp
+++ b/grails-app/views/email/biocache.gsp
@@ -13,11 +13,11 @@
         color: #003A70;
     }
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table style="width: 100%; background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table style="width: 650px; background-color: #ffffff; font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table style="width: 650px; background-color: #ffffff; font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -28,13 +28,13 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
                     </td>
@@ -42,21 +42,25 @@
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                         <g:set var="occurrencelink" value="${query.baseUrlForUI}/occurrences/${oc.uuid}"></g:set>
                         <g:set var="assertionlink" value="${query.baseUrl}/occurrences/${oc.uuid}/assertions"></g:set>
                         <table style="width: 100%">
                             <tr style="vertical-align: top;">
                                 <td style="width: 37%">
                                     <g:if test="${oc.scientificName?: oc.vernacularName ?: oc.raw_raw_scientificName}">
-                                        <strong>${i+1}. <em><a href="${occurrencelink}">${oc.scientificName?: oc.vernacularName ?: oc.raw_raw_scientificName}</a></em></strong>
+                                        <strong>${i+1}. <em><a href="${occurrencelink}" style="color: #003A70;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">${oc.scientificName?: oc.vernacularName ?: oc.raw_raw_scientificName}</a></em></strong>
                                     </g:if>
                                     <p style="padding-left: 15px;">
-                                        <g:if test="${oc.taxonRankID > 5000}"><i></g:if>
-                                        ${oc.scientificName}<br/>
-                                        <g:if test="${oc.taxonRankID > 5000}"></i></g:if>
-                                        ${oc.stateProvince}<br/>
-                                        Family: ${oc.family}<br/>
+                                        <g:if test="${oc.vernacularName}">
+                                            ${oc.vernacularName}<br/>
+                                        </g:if>
+                                        <g:if test="${oc.stateProvince}">
+                                            ${oc.stateProvince}<br/>
+                                        </g:if>
+                                        <g:if test="${oc.family}">
+                                            Family: ${oc.family}<br/>
+                                        </g:if>
                                         <g:if test="${oc.dataProviderName}">
                                             Source: ${oc.dataProviderName}
                                         </g:if>
diff --git a/grails-app/views/email/biocacheImages.gsp b/grails-app/views/email/biocacheImages.gsp
index a158e6e6..0ff2f541 100644
--- a/grails-app/views/email/biocacheImages.gsp
+++ b/grails-app/views/email/biocacheImages.gsp
@@ -25,23 +25,22 @@
     }
 
     .info-button {
-        border: 1pt solid #003A70;
+        border: 1pt solid #C44D34;
         text-decoration: none;
         font-size: 14px;
         padding: 10px 15px 10px 15px;
+        color: black;
+        border-radius: 8px;
     }
 
-    a {
-        color: #003A70;
-    }
     </style>
 </head>
 
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -52,16 +51,16 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td height="120" style="color:white;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <g:set var="totalRecords" value="${records.values().sum { it.size() }}" />
                         <div>
-                        ${totalRecords} ${totalRecords == 1 ? ' record with image ' : ' records with image'} ${totalRecords == 1 ? 'has' : 'have'} been added
+                        ${totalRecords} ${totalRecords == 1 ? ' record with images ' : ' records with images'} ${totalRecords == 1 ? 'has' : 'have'} been added
                         </div>
                         <br/>
                         <div>
@@ -72,7 +71,7 @@
             <!-- Records Section -->
                 <g:each status="i" in="${records.keySet()}" var="dataResourceId">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                             <g:set var="occurrences" value="${records[dataResourceId]}" />
                             <g:set var="dataResourceName" value="${occurrences[0]?.dataResourceName?:dataResourceId}" />
                             <g:set var="dataResourcePublicUrl" value="${occurrences[0]?.dataResourceInfo?.alaPublicUrl}" />
@@ -81,7 +80,7 @@
                             <table style="width: 100%">
                                 <tr>
                                     <td colspan="4">
-                                        <h3>Dataset: <a href="${dataResourcePublicUrl}">${dataResourceName}</a></h3>
+                                        <h3>Dataset: <a href="${dataResourcePublicUrl}" style="color: #003A70;text-decoration: none;">${dataResourceName}</a></h3>
                                         <g:if test="${occurrences[0]?.dataResourceInfo?.lastUpdated}">
                                             <%
                                                 try {
@@ -100,14 +99,14 @@
                                         <tr>
                                     </g:if>
                                     <td style="width: 25%; vertical-align: top;">
-                                        <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}">
+                                        <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}" style="color: #003A70;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
                                             <img src="${oc.smallImageUrl}" alt="${message(code:"biocache.images.alt.image", args:[oc.scientificName])}" style="vertical-align: top; width:150px; height:150px;border-radius: 6px;line-height: 100%;"/></a>
                                         <br/>
-                                        <i>${oc.scientificName} <br>
+                                        <i>${oc.scientificName}</i><br>
                                             <g:if test="${oc.eventDate}">
                                              ${new SimpleDateFormat("dd MMM yyyy").format(oc.eventDate)}
                                             </g:if>
-                                        </i>
+
                                     </td>
                                     <g:if test="${(j + 1) % 4 == 0 || j + 1 == occurrences.size()}">
                                         </tr>
diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp
index 8980b8a7..3498dad7 100644
--- a/grails-app/views/email/biosecurity.gsp
+++ b/grails-app/views/email/biosecurity.gsp
@@ -8,29 +8,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>${title}</title>
 </head>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-<table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+<table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
-                    <td align="center" style="padding: 20px; background-color: #fff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                        <a href="https://www.ala.org.au" target="_blank" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                    <td align="center" style="padding: 20px; background-color: #fff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                        <a href="https://www.ala.org.au" target="_blank" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
                             <img src="${grailsApplication.config.grails.serverURL + '/assets/email/logo-dark.png'}" height="60" alt="Logo" style="display: block;border: 0;line-height: 100%;">
                         </a>
                     </td>
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td align="center" bgcolor="#B53929" background="${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png" width="620" height="120" style="color:white;background-color:#B53929;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td align="center" bgcolor="#B53929" background="${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png" width="620" height="120" style="color:white;background-color:#B53929;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">Biosecurity Alerts</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                         <p style="font-size: 16px; color: #fff;">Alerts service for new ALA records listing potential invasive species</p>
                     </td>
                 </tr>
                 <tr>
-                    <td align="center" style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td align="center" style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} new ${totalRecords == 1 ? 'record' : 'records'} for
                         </div>
                         <div>
@@ -45,11 +45,11 @@
                 <g:each status="i" in="${records}" var="oc">
                 <g:set var="link" value="${query.baseUrlForUI}/occurrences/${oc.uuid}"></g:set>
                 <tr>
-                    <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+                    <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                             <tr>
-                                <td width="46%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                    <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}" style="color: #C44D34;text-decoration: none;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                <td width="46%" valign="top" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                    <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}" style="color: #C44D34;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
                                         <strong>${i+1}. <em>${oc.scientificName ?: 'N/A'}</em></strong>
                                     </a>
                                     <p style="font-size: 13px; color: #212121;padding-left: 15px;">
@@ -79,12 +79,12 @@
                                         </g:if>
                                     </p>
                                 </td>
-                                <td width="28%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                    <a href="https://www.google.com/maps/place/${oc.latLong}" target="_blank" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                <td width="28%" valign="top" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                    <a href="https://www.google.com/maps/place/${oc.latLong}" target="_blank" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
                                         <img src="https://maps.googleapis.com/maps/api/staticmap?center=${oc.latLong}&markers=|${oc.latLong}&zoom=12&size=150x150&maptype=roadmap&key=${grailsApplication.config.getProperty('google.apikey')}" alt="Map Image" style="width: 150px;height: 150px;display: block;border: 0;line-height: 100%;border-radius: 6px;">
                                     </a>
                                 </td>
-                                <td width="26%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                <td width="26%" valign="top" style="font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
                                     <g:set var="imageUrl" value="${oc.imageUrls?.get(0) ?: oc.thumbnailUrl ?: oc.smallImageUrl}" />
                                     <g:if test="${imageUrl}">
                                         <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}">
@@ -103,19 +103,19 @@
                 </tr>
                 </g:each>
                 <tr>
-                    <td style="padding: 35px 70px 35px 70px;background-color: #C44D34;color: #fff;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
+                    <td style="padding: 35px 70px 35px 70px;background-color: #C44D34;color: #fff;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
                         <p>If you notice a record has been misidentified, we encourage you to use your expertise to improve the quality of Australia's biosecurity data.</p>
                         <p>Please either annotate the record in the provider platform itself or notify us at <a href="mailto:biosecurity@ala.org.au" style="color: #f2f2f2; font-weight: 700;">biosecurity@ala.org.au</a> for assistance.</p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="padding: 35px 70px 35px 70px;background-color: #000000;color: #fff;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;;text-align: center;">
+                    <td style="padding: 35px 70px 35px 70px;background-color: #000000;color: #fff;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;;text-align: center;">
                         <p>The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.</p>
                         <p>We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.</p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="padding: 35px 70px 35px 70px;background-color: #ffffff;color: #000;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
+                    <td style="padding: 35px 70px 35px 70px;background-color: #ffffff;color: #000;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.43;text-align: center;">
                         <p>
                             <a href="https://www.education.gov.au/national-collaborative-research-infrastructure-strategy-ncris"><img loading="lazy"  src="${grailsApplication.config.grails.serverURL}/assets/email/NCRIS_150px-150x109.jpg" alt="NCRIS logo" width="125" height="90"></a>&nbsp;
                             &nbsp;<a href="https://csiro.au/"><img loading="lazy" src="${grailsApplication.config.grails.serverURL}/assets/email/CSIRO_Solid_RGB-150x150.png" alt="CSIRO logo" width="90" height="90"></a>&nbsp;
diff --git a/grails-app/views/email/blogs.gsp b/grails-app/views/email/blogs.gsp
index 9723bf5e..193b4319 100644
--- a/grails-app/views/email/blogs.gsp
+++ b/grails-app/views/email/blogs.gsp
@@ -12,16 +12,16 @@
     <title>${title}</title>
   </head>
   <body style="background-color: #f4f4f4;padding: 0;line-height: 1.5;-webkit-font-smoothing: antialiased;-webkit-text-size-adjust: 100%;-ms-text-size-adjust: 100%;width: 100% !important;margin: 0 !important;">
-    <div class="main-shadow-div default-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Arial, sans-serif;font-size: 16px;font-weight: 500;line-height: 1.42;letter-spacing: -0.4px;mso-table-lspace: 0;mso-table-rspace: 0;box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);width: 100%;max-width: 620px;margin: 20px auto 0;">
+    <div class="main-shadow-div default-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Roboto, sans-serif;font-size: 16px;font-weight: 500;line-height: 1.42;letter-spacing: -0.4px;mso-table-lspace: 0;mso-table-rspace: 0;box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);width: 100%;max-width: 620px;margin: 20px auto 0;">
       <div class="center-white-div" style="display: flex;vertical-align: top;justify-content: center;align-items: center;background-color: #ffffff;padding: 20px 20px 10px 20px;">
         <a href="https://www.ala.org.au" style="text-decoration: none;">
         <img src="${grailsApplication.config.grails.serverURL + '/assets/email/logo-dark.png'}" height="60" alt="" style="border: 0;line-height: 100%;outline: 0;">
         </a>
       </div>
       <div class="background-image-div padding " style="padding: 20px 10px 20px 10px;vertical-align: top; text-align:center;background-image: url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);">
-        <div class="default-font large-white-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Arial, sans-serif;font-size: 24px;font-weight: 700;line-height: 1.42;letter-spacing: -0.4px;color: #ffffff;">Latest ALA Blog Updates</div>
+        <div class="default-font large-white-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Roboto, sans-serif;font-size: 24px;font-weight: 700;line-height: 1.42;letter-spacing: -0.4px;color: #ffffff;">Latest ALA Blog Updates</div>
         <br>
-        <div class="default-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Arial, sans-serif;font-size: 16px;font-weight: 500;line-height: 1.42;letter-spacing: -0.4px;color: #ffffff;">
+        <div class="default-font" style="vertical-align: top;font-family: 'Lato', Helvetica, Roboto, sans-serif;font-size: 16px;font-weight: 500;line-height: 1.42;letter-spacing: -0.4px;color: #ffffff;">
           <b>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</b>
         </div>
       </div>
diff --git a/grails-app/views/email/dataresource.gsp b/grails-app/views/email/dataresource.gsp
index 1f6c095b..a170eb06 100644
--- a/grails-app/views/email/dataresource.gsp
+++ b/grails-app/views/email/dataresource.gsp
@@ -10,21 +10,23 @@
 </head>
 <style>
     .info-button {
-        border: 1pt solid #003A70; /* Flamingo color */
+        border: 1pt solid #C44D34;
         text-decoration: none;
         font-size: 14px;
         padding: 10px 15px 10px 15px;
+        color: black;
+        border-radius: 5px;
     }
 
      a {
          color: #003A70;
      }
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -35,16 +37,16 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} ${totalRecords == 1 ? 'dataset' : 'datasets'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
-                        <div>
+                        <div style="padding-top: 20px;">
                             <a class="btn info-button" href="${moreInfo}"><g:message code="datasets.view.details.of.the.added" /></a>
                         </div>
                     </td>
@@ -52,39 +54,44 @@
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                             <g:set var="oclink" value="${grailsApplication.config.collectory.baseURL}/public/show/${oc.uid}"></g:set>
                             <table style="width: 100%">
                                 <tr style="vertical-align: top;">
                                     <td style="width: 70%">
-                                        <a href="${oclink}" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                            <strong>${i+1}. <em>${oc.label}</em></strong>
-                                        </a>
-
-                                        <p style="padding-left: 15px;">
-                                            <g:if test="${oc.count}">
-                                                Total records: ${oc.count}<br/>
-                                            </g:if>
-
-                                            <g:if test="${oc.details?.licenseType}">
-                                                Licence: ${oc.details?.licenseType}<br/>
-                                            </g:if>
-                                            <g:if test="${oc.details?.resourceType}">
-                                                Content type: ${oc.details?.resourceType}<br/>
-                                            </g:if>
-
-
-                                            <br/>
-                                            <g:if test="${oc.details?.pubShortDescription}">
-                                                ${StringUtils.abbreviate(oc.details?.pubShortDescription, 200)}<br/>
-                                            </g:if>
-                                            <g:else>
-                                                <g:if test="${oc.details?.pubDescription}">
-                                                    ${StringUtils.abbreviate(oc.details?.pubDescription, 200)}<br/>
-                                                </g:if>
-                                            </g:else>
-                                        </p>
+                                        <table>
+                                            <tr>
+                                                <td style="white-space: nowrap; vertical-align: top; text-align: right; padding-right: 10px;">
+                                                    <strong>${i+1}. </strong>
+                                                </td>
+                                                <td style="vertical-align: top;">
+                                                    <a href="${oclink}" style="color: #003A70;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                                        <strong><em>${oc.label}</em></strong>
+                                                    </a>
+                                                    <p>
+                                                        <g:if test="${oc.count}">
+                                                            Total records: ${oc.count}<br/>
+                                                        </g:if>
 
+                                                        <g:if test="${oc.details?.licenseType}">
+                                                            Licence: ${oc.details?.licenseType}<br/>
+                                                        </g:if>
+                                                        <g:if test="${oc.details?.resourceType}">
+                                                            Content type: ${oc.details?.resourceType}<br/>
+                                                        </g:if>
+                                                        <br/>
+                                                        <g:if test="${oc.details?.pubShortDescription}">
+                                                            ${StringUtils.abbreviate(oc.details?.pubShortDescription, 200)}<br/>
+                                                        </g:if>
+                                                        <g:else>
+                                                            <g:if test="${oc.details?.pubDescription}">
+                                                                ${StringUtils.abbreviate(oc.details?.pubDescription, 200)}<br/>
+                                                            </g:if>
+                                                        </g:else>
+                                                    </p>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </td>
                                     <td style="width: 33%; text-align: right;" >
 
diff --git a/grails-app/views/email/datasets.gsp b/grails-app/views/email/datasets.gsp
index 0f86dd7e..83cbe7cd 100644
--- a/grails-app/views/email/datasets.gsp
+++ b/grails-app/views/email/datasets.gsp
@@ -13,11 +13,11 @@ a {
     color: #003A70;
 }
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -28,13 +28,13 @@ a {
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} ${totalRecords == 1 ? 'dataset' : 'datasets'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
                     </td>
@@ -42,38 +42,41 @@ a {
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                             <g:set var="oclink" value="${oc.details?.alaPublicUrl}"></g:set>
                             <table style="width: 100%">
                                 <tr style="vertical-align: top;">
                                     <td style="width: 70%">
-                                        <strong>${i+1}.</strong>
-                                        <a href="${oclink}" style="color: #003A70;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                                <strong><em>${oc.name}</em></strong>
-                                        </a>
-                                        <p style="padding-left: 15px;">
-
-                                            <g:if test="${oc.details?.licenseType}">
-                                                Licence: ${oc.details?.licenseType}<br/>
-                                            </g:if>
-                                            <g:if test="${oc.details?.resourceType}">
-                                                Content type: ${oc.details?.resourceType}<br/>
-                                            </g:if>
-
-
-                                            <br/>
-                                            <g:if test="${oc.details?.pubShortDescription}">
-                                                ${StringUtils.abbreviate(oc.details?.pubShortDescription, 200)}
-                                                <br/>
-                                            </g:if>
-                                            <g:else>
-                                                <g:if test="${oc.details?.pubDescription}">
-                                                    ${StringUtils.abbreviate(oc.details?.pubDescription, 200)}
-                                                    <br/>
-                                                </g:if>
-                                            </g:else>
-                                        </p>
-
+                                        <table>
+                                            <tr>
+                                                <td style="white-space: nowrap; vertical-align: top; text-align: right; padding-right: 10px;">
+                                                    <strong>${i+1}. </strong>
+                                                </td>
+                                                <td style="vertical-align: top;">
+                                                    <a href="${oclink}" style="color: #003A70;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                                        <strong><em>${oc.name}</em></strong>
+                                                    </a>
+                                                    <p>
+                                                        <g:if test="${oc.details?.licenseType}">
+                                                            Licence: ${oc.details?.licenseType}<br/>
+                                                        </g:if>
+                                                        <g:if test="${oc.details?.resourceType}">
+                                                            Content type: ${oc.details?.resourceType}<br/>
+                                                        </g:if>
+                                                        <g:if test="${oc.details?.pubShortDescription}">
+                                                            ${StringUtils.abbreviate(oc.details?.pubShortDescription, 200)}
+                                                            <br/>
+                                                        </g:if>
+                                                        <g:else>
+                                                            <g:if test="${oc.details?.pubDescription}">
+                                                                ${StringUtils.abbreviate(oc.details?.pubDescription, 200)}
+                                                                <br/>
+                                                            </g:if>
+                                                        </g:else>
+                                                    </p>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </td>
                                     <td style="width: 33%; text-align: right;" >
                                         <g:if test="${oc.image != null}">
diff --git a/grails-app/views/email/layers.gsp b/grails-app/views/email/layers.gsp
index 27fe21aa..595ed05f 100644
--- a/grails-app/views/email/layers.gsp
+++ b/grails-app/views/email/layers.gsp
@@ -9,12 +9,16 @@
   <title><g:message code="alert.title" args="[query.resourceName]" /></title>
 </head>
 <style>
+  a {
+    color: #003A70;
+    text-decoration: none;
+  }
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
   <tr>
-    <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-      <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+    <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+      <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
         <!-- Logo -->
         <tr>
           <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -25,13 +29,13 @@
         </tr>
         <!-- Header -->
         <tr>
-          <td  align="center"  background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+          <td  align="center"  background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-position: top center;background-size: cover;background-repeat: no-repeat">
             <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
             <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
           </td>
         </tr>
         <tr>
-          <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+          <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
             <div> ${totalRecords} ${totalRecords == 1 ? 'spatial layer ' : 'spatial layers'} ${totalRecords == 1 ? 'has' : 'have'} been updated
             </div>
           </td>
@@ -39,43 +43,43 @@
       <!-- Records Section -->
         <g:each status="i" in="${records}" var="oc">
           <tr>
-            <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+            <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
               <g:set var="oclink" value="${oc.source_link}"></g:set>
               <table style="width: 100%">
                 <tr style="vertical-align: top;">
                   <td style="width: 70%">
-                    <a href="${oclink}" style="color: #C44D34;text-decoration: none;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                      <strong>${i+1}. <em>${oc.displayname}</em></strong>
+                    <a href="${oclink}" style="color: #003A70;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                      <strong>${i+1}. <strong>${oc.displayname}</strong></strong>
                     </a>
                     <p style="padding-left: 15px;">
                       <g:if test="${oc.keywords}">
-                        Keywords: <i>${oc.keywords}</i><br/>
+                        Keywords: ${oc.keywords}<br/>
                       </g:if>
                       <g:if test="${oc.source}">
-                        Source: <i>${oc.source}</i><br/>
+                        Source: ${oc.source}<br/>
                       </g:if>
                       <g:if test="${oc.minlatitude != null && oc.minlongitude != null && oc.maxlatitude != null && oc.maxlongitude != null}">
-                        Extents: <i>Latitude ${oc.minlatitude} to ${oc.maxlatitude}, Longitude ${oc.minlongitude} to ${oc.maxlongitude}</i><br/>
+                        Extents: Latitude ${oc.minlatitude} to ${oc.maxlatitude}, Longitude ${oc.minlongitude} to ${oc.maxlongitude}<br/>
                       </g:if>
                       <g:if test="${oc.licence_notes}">
-                        Licence: <a href="${oc.licence_link}">${oc.licence_notes}</a><br/>
+                        Licence: <a href="${oc.licence_link}" style="color: #003A70;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">${oc.licence_notes}</a><br/>
                       </g:if>
                       <br/>
                       <g:if test="${oc.description}">
-                        Description: <i>${oc.description}</i><br/>
+                        Description: ${oc.description}<br/>
                       </g:if>
                     </p>
 
                   </td>
                   <td style="width: 33%; text-align: left; padding-left: 30px;" >
                     <g:if test="${oc.dt_added}">
-                      Date added: <i>${new SimpleDateFormat("dd MMM yyyy").format(oc.dt_added)}</i><br/>
+                      Date added: ${new SimpleDateFormat("dd MMM yyyy").format(oc.dt_added)}<br/>
                     </g:if>
                     <g:if test="${oc.type}">
-                      Layer type: <i>${oc.type}</i><br/>
+                      Layer type: ${oc.type}<br/>
                     </g:if>
                     <g:if test="${oc.classification1}">
-                      Classification: <i>${oc.classification1}</i><br/>
+                      Classification: ${oc.classification1}<br/>
                     </g:if>
                   </td>
                 </tr>
diff --git a/grails-app/views/email/myAnnotations.gsp b/grails-app/views/email/myAnnotations.gsp
index f75e5607..62f5153f 100644
--- a/grails-app/views/email/myAnnotations.gsp
+++ b/grails-app/views/email/myAnnotations.gsp
@@ -10,11 +10,11 @@
 </head>
 <style>
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table  cellpadding="0" cellspacing="0" width="100%" style="border:0; background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse; ">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="border:0; background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="border:0; background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -25,13 +25,13 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td  align="center" background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png"  height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td  align="center" background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png"  height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
                     </td>
@@ -39,31 +39,42 @@
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
-                        <g:set var="occurrencelink" value="${query.baseUrlForUI}/occurrences/${oc.uid}"></g:set>
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <g:set var="occurrencelink" value="${query.baseUrlForUI}/occurrences/${oc.uuid}"></g:set>
                         <g:set var="assertionlink" value="${query.baseUrl}/occurrences/${oc.uuid}/assertions"></g:set>
                         <table style="width: 100%">
                             <tr style="vertical-align: top;">
                                 <td style="width: 33%">
 
-                                    <a href="${occurrencelink}" style="color: #C44D34;text-decoration: none;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                     <g:if test="${oc.scientificName?:oc.vernacularName ?: oc.raw_raw_scientificName}">
-                                       <strong>${i+1}. <em>${oc.scientificName?:oc.vernacularName ?: oc.raw_raw_scientificName }</em></strong>
-                                     </g:if>
-                                    </a>
-                                    <p style="padding-left: 15px;">
-                                        <g:if test="${oc.taxonRankID > 5000}"><i></g:if>
-                                        ${oc.vernacularName}<br/>
-                                        <g:if test="${oc.taxonRankID > 5000}"></i></g:if>
-                                        ${oc.stateProvince}<br/>
-                                        Family: ${oc.family}<br/>
-                                        <g:if test="${oc.dataProviderName}">
-                                           Source: ${oc.dataProviderName}
-                                        </g:if>
-                                    </p>
-
+                                    <table>
+                                        <tr>
+                                            <td style="white-space: nowrap; vertical-align: top; text-align: right; padding-right: 10px;">
+                                            <strong>${i+1}. </strong>
+                                            </td>
+                                            <td style="vertical-align: top;">
+                                            <a href="${occurrencelink}" style="color: #003A70;text-decoration: none;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+                                                <g:if test="${oc.scientificName?:oc.vernacularName ?: oc.raw_raw_scientificName}">
+                                                    <strong><em>${oc.scientificName?:oc.vernacularName ?: oc.raw_raw_scientificName }</em></strong>
+                                                </g:if>
+                                            </a>
+                                            <p>
+                                                <g:if test="${oc.vernacularName}">
+                                                    ${oc.vernacularName}<br/>
+                                                </g:if>
+                                                <g:if test="${oc.stateProvince}">
+                                                    ${oc.stateProvince}<br/>
+                                                </g:if>
+                                                <g:if test="${oc.family}">
+                                                    Family: ${oc.family}<br/>
+                                                </g:if>
+                                                <g:if test="${oc.dataProviderName}">
+                                                    Source: ${oc.dataProviderName}
+                                                </g:if>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </td>
-                                <td class="annotation" nowrap="nowrap" style="width: 34%;word-wrap: break-word; white-space: normal;font-family: 'Arial', sans-serif;font-size: 12px;line-height: 1.5;">
+                                <td class="annotation" nowrap="nowrap" style="padding-left:10px;padding-top:8px;width: 34%;word-wrap: break-word; white-space: normal;font-family: 'Roboto', sans-serif;font-size: 12px;line-height: 1.5;">
                                     <g:if test="${oc.processed_assertions?.size() > 0}">
                                         <%
                                             def latestAssertion = oc.processed_assertions[0] // Get the first (latest) assertion
diff --git a/grails-app/views/email/specieslist.gsp b/grails-app/views/email/specieslist.gsp
index df26b4dd..c5c96489 100644
--- a/grails-app/views/email/specieslist.gsp
+++ b/grails-app/views/email/specieslist.gsp
@@ -13,11 +13,11 @@ a {
     color: #003A70;
 }
 </style>
-<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+<body style="background-color: #f4f4f4;margin: 0;padding: 0;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;border-spacing: 0;border-collapse: collapse;">
     <tr>
-        <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+        <td align="center" style="padding: 20px;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td style="text-align: center; padding: 20px; background-color: #fff;">
@@ -28,13 +28,13 @@ a {
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
+                    <td background="${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png" width="620" height="120" style="color:white;background-color:#003A70;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/banner-ocean.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">ALA Alerts - ${query.name}</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMM yyyy").format(new Date())}</strong></p>
                     </td>
                 </tr>
                 <tr>
-                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Arial', sans-serif;font-size: 22px;line-height: 1.5;">
+                    <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <div> ${totalRecords} ${totalRecords == 1 ? ' species list' : ' species lists'} ${totalRecords == 1 ? 'has' : 'have'} been updated
                         </div>
                     </td>
@@ -42,12 +42,12 @@ a {
             <!-- Records Section -->
                 <g:each status="i" in="${records}" var="oc">
                     <tr>
-                        <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 14px;line-height: 1.5;">
+                        <td style="padding: 20px;background-color: white;font-family: 'Roboto', sans-serif;font-size: 14px;line-height: 1.5;">
                             <g:set var="oclink" value="${query.baseUrlForUI}/speciesListItem/list/${oc.dataResourceUid}"></g:set>
                             <table style="width: 100%">
                                 <tr style="vertical-align: top;">
                                     <td style="width: 70%">
-                                                <strong>${i+1}.<a href="${oclink}" style="color: #003A70;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;"> <em>${oc.listName}</em> </a></strong>
+                                                <strong>${i+1}. <a href="${oclink}" style="color: #003A70;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.5;"><em>${oc.listName}</em> </a></strong>
                                         <p style="padding-left: 15px;">
                                             <%
                                                 // Initialize a list to collect tags
@@ -56,8 +56,9 @@ a {
                                                 if (oc.isThreatened) tags << "Threatened"
                                                 if (oc.isInvasive) tags << "Invasive"
                                             %>
-
-                                            Tags: ${tags ? tags.join(', ') : ''} <br/>
+                                            <g:if test="${tags.size() > 0}">
+                                                Tags: ${tags.join(', ')} <br/>
+                                            </g:if>
 
                                             <g:if test="${oc.listType}">
                                                 Type: ${oc.listType}<br/>
diff --git a/grails-app/views/email/specieslists.gsp b/grails-app/views/email/specieslists.gsp
index 8fb7584a..06fc4e38 100644
--- a/grails-app/views/email/specieslists.gsp
+++ b/grails-app/views/email/specieslists.gsp
@@ -9,7 +9,7 @@
     <p><a href="${moreInfo}"><g:message code="datasets.view.details.of.the.added" /></a></p>
 
     <style type="text/css">
-    	body { font-family:Arial; }
+    	body { font-family:Roboto; }
     	table { border-collapse: collapse; border: 1px solid #CCC; padding:2px; }
 		td, th { border: 1px solid #CCC; padding:4px; }
         img { max-width:150px; max-height:150px; }
diff --git a/grails-app/views/notification/myAlerts.gsp b/grails-app/views/notification/myAlerts.gsp
index a43a18b9..3287a1f9 100644
--- a/grails-app/views/notification/myAlerts.gsp
+++ b/grails-app/views/notification/myAlerts.gsp
@@ -17,19 +17,29 @@
                 $('[data-toggle="tooltip"]').tooltip()
             })
         </script>
+
+        <style>
+            .query-cb {
+                height: 40px; /* Define the height of the input */
+                padding: 0 20px; /* Add padding for internal spacing */
+                border: 1px solid #000; /* Add a border for visibility */
+                border-radius: 20px; /* Set radius to half of the height */
+                outline: none; /* Remove focus outline */
+                box-sizing: border-box; /* Ensure padding doesn't affect size */
+            }
+        </style>
     </head>
     <body>
       <div id="content">
           <header id="page-header">
               <div class="inner row-fluid">
                   <div class="content">
-                      <h1>
+                      <h2>
                           <g:message code="my.alerts.h1" args="[userPrefix]" />
                           <g:if test="${user.locked}">
-                              &nbsp;
                               <i class="fa fa-lock" data-toggle="tooltip" data-placement="bottom" title="${g.message(code:'my.alerts.user.isLocked.title')}"></i>
                           </g:if>
-                      </h1>
+                      </h2>
                   </div>
                   <div>
                       <% if (request.isUserInRole("ROLE_ADMIN")) { %>
@@ -50,112 +60,139 @@
           </g:if>
           <div id="page-body" role="main">
                 <g:set var="userId">${user.userId}</g:set>
-                <h3>
-                  <g:message code="my.alerts.send.me.alerts" />
+                <div>
+                  <p>
+                  Manage your ALA alerts, send to : ${user.email}
+                  </p>
+                  <p>
+                  <b>Send me alerts:</b>
                   <g:select name="userFrequency" from="${frequencies}" id="userFrequency" value="${user?.frequency?.name}" optionKey="name"
                             optionValue="${ { name->g.message(code: 'frequency.' + name) } }"
-                  />
-                </h3>
-            <div class="row">
-                <div class="col-md-6">
-                    <table>
-                        <tbody>
-                        <g:each in="${enabledQueries}" status="i" var="query">
-                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-                                <td class="queryDescription">
-                                  <h3>${query.name}</h3>
-                                  ${query.description}
-                                </td>
-                                <td class="queryActions">
-                                    <div class="switch" data-on="danger">
-                                        <input id="${query.id}" class="query-cb" name="field2"  type="checkbox" checked />
-                                    </div>
-                                </td>
-                            </tr>
-                        </g:each>
-                        <g:each in="${disabledQueries}" status="i" var="query">
-                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
-                                <td class="queryDescription">
-                                  <h3>${query.name}</h3>
-                                  ${query.description}
-                                </td>
-                                <td class="queryActions">
-                                    <div class="switch" data-on="danger" >
-                                        <input  id="${query.id}" class="query-cb" name="field2"  type="checkbox" />
-                                    </div>
-                                </td>
-                            </tr>
-                        </g:each>
+                  /> &nbsp;
+                  This setting applies to all your active ALA alerts, including standard and custom alerts.
+                    </p>
+                </div>
+              <!-- Main Content starts -->
+              <div class="row">
+                      <ul class="nav nav-tabs" id="alertTabs" role="tablist">
+                          <li class="nav-item active" role="presentation">
+                              <a class="nav-link " id="standard-alerts-tab"  data-toggle="tab" href="#standard-alerts" role="tab" aria-controls="standard-alerts" >Standard Alerts</a>
+                          </li>
+                          <li class="nav-item" role="presentation">
+                              <a class="nav-link" id="custom-alerts-tab" data-toggle="tab" href="#custom-alerts"  role="tab" aria-controls="custom-alerts">Custom Alerts</a>
+                          </li>
+                      </ul>
 
-                        %{--test if my annotation feature is turned on--}%
-                        <g:if test="${myannotation != null}">
-                            <g:set var="myannotationChecked" value="${myannotation.size() != 0}" />
-                            <tr>
-                                <td class="queryDescription">
-                                    <h3>My Annotations</h3>
-                                    Notify me when records I have flagged are updated.
-                                </td>
-                                <td class="queryActions">
-                                    <div class="switch" data-on="danger" >
-                                        <g:if test="${myannotationChecked}">
-                                            <input data-type='myannotation' class="query-cb" name="field2"  type="checkbox" checked/>
-                                        </g:if>
-                                        <g:else>
-                                            <input data-type='myannotation' class="query-cb" name="field2"  type="checkbox" />
-                                        </g:else>
-                                    </div>
-                                </td>
-                            </tr>
-                        </g:if>
+                      <!-- Tabs Content -->
+                      <div class="tab-content" id="alertTabsContent">
+                          <!-- Standard Alerts Tab -->
+                          <div class="tab-pane fade active in" id="standard-alerts" role="tabpanel" aria-labelledby="standard-alerts-tab">
+                            <div class="col-md-7">
+                                <div style="padding-top: 20px;">
+                                Enable alerts to have notifications sent to your email address.
+                                </div>
+                              <table>
+                                  <tbody>
+                                  <g:each in="${enabledQueries}" status="i" var="query">
+                                      <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                                          <td class="queryDescription">
+                                              <h3>${query.name}</h3>
+                                              ${query.description}
+                                          </td>
+                                          <td class="queryActions">
+                                              <div class="switch" data-on="danger">
+                                                  <input id="${query.id}" class="query-cb" name="field2" type="checkbox" checked />
+                                              </div>
+                                          </td>
+                                      </tr>
+                                  </g:each>
+                                  <g:each in="${disabledQueries}" status="i" var="query">
+                                      <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                                          <td class="queryDescription">
+                                              <h3>${query.name}</h3>
+                                              ${query.description}
+                                          </td>
+                                          <td class="queryActions">
+                                              <div class="switch" data-on="danger">
+                                                  <input id="${query.id}" class="query-cb" name="field2" type="checkbox" />
+                                              </div>
+                                          </td>
+                                      </tr>
+                                  </g:each>
 
-                        </tbody>
-                    </table>
-                    <g:if test="${customQueries}">
-                    <hr>
-                    <h2 id="customQueriesHdr"><g:message code="my.alerts.my.custom.alerts" /></h2>
-                    <table>
-                        <tbody id="customQueries">
-                        <g:each in="${customQueries}" status="i" var="query">
-                            <tr class="${(i % 2) == 0 ? 'odd' : 'even'}" id='custom-${query.id}'>
-                                <td class="queryDescription">
-                                  <h3>${query.name}</h3>
-                                  ${query.description}
-                                </td>
-                                <td class="queryActions">
-                                    <a href="javascript:void(0);" class='btn btn-ala deleteButton' id='${query.id}'><g:message code="my.alerts.delete.label" /></a>
-                                </td>
-                            </tr>
-                        </g:each>
-                        </tbody>
-                    </table>
-                    </g:if>
-                 </div>
-                <div class="col-md-6">
-                    <div class="well">
-                        <p><g:message code="my.alerts.enable.to.email" args="[user.email]" /></p>
-                        <p>
-                            <g:message code="my.alerts.sample.list.intro" args="[grailsApplication.config.skin.orgNameShort]" />
-                            <ul>
-                                <li>
-                                    <g:message code="my.alerts.data.resource.desc" args="[grailsApplication.config.collectory.searchURL, grailsApplication.config.collection.searchTitle]" />
-                                </li>
-                                <li>
-                                    <g:message code="my.alerts.species.desc" args="[grailsApplication.config.speciesPages.searchURL, grailsApplication.config.speciesPages.searchTitle]" />
-                                </li>
-                                <li>
-                                    <g:message code="my.alerts.region.desc" args="[grailsApplication.config.regions.searchURL, grailsApplication.config.regions.searchTitle]" />
-                                </li>
-                                <li>
-                                    <g:message code="my.alerts.new.record.desc" args="[grailsApplication.config.occurrence.searchURL, grailsApplication.config.occurrence.searchTitle]" />
-                                </li>
-                            </ul>
-                        </p>
-                        <p>
-                            <g:message code="my.alerts.look.for.btn" />
-                        </p>
-                    </div>
-                </div>
-            </div>
+                                  <g:if test="${myannotation != null}">
+                                      <g:set var="myannotationChecked" value="${myannotation.size() != 0}" />
+                                      <tr>
+                                          <td class="queryDescription">
+                                              <h3>My Annotations</h3>
+                                              Notify me when records I have flagged are updated.
+                                          </td>
+                                          <td class="queryActions">
+                                              <div class="switch" data-on="danger">
+                                                  <g:if test="${myannotationChecked}">
+                                                      <input data-type='myannotation' class="query-cb" name="field2" type="checkbox" checked />
+                                                  </g:if>
+                                                  <g:else>
+                                                      <input data-type='myannotation' class="query-cb" name="field2" type="checkbox" />
+                                                  </g:else>
+                                              </div>
+                                          </td>
+                                      </tr>
+                                  </g:if>
+                                  </tbody>
+                              </table>
+                            </div>
+                          <div class="col-md-5">
+                              <br/>
+                              <div class="well">
+                                  <p>Your can set up specific alerts in various sections of the ALA, including</p>
+                                  <p>
+                                  <ul>
+                                      <li>
+                                          <g:message code="my.alerts.data.resource.desc" args="[grailsApplication.config.collectory.searchURL, grailsApplication.config.collection.searchTitle]" />
+                                      </li>
+                                      <li>
+                                          <g:message code="my.alerts.species.desc" args="[grailsApplication.config.speciesPages.searchURL, grailsApplication.config.speciesPages.searchTitle]" />
+                                      </li>
+                                      <li>
+                                          <g:message code="my.alerts.region.desc" args="[grailsApplication.config.regions.searchURL, grailsApplication.config.regions.searchTitle]" />
+                                      </li>
+                                      <li>
+                                          <g:message code="my.alerts.new.record.desc" args="[grailsApplication.config.occurrence.searchURL, grailsApplication.config.occurrence.searchTitle]" />
+                                      </li>
+                                  </ul>
+                              </p>
+                                  <p>
+                                      <g:message code="my.alerts.look.for.btn" />
+                                  </p>
+                              </div>
+                          </div>
+
+                          </div>
+
+                          <!-- Custom Alerts Tab -->
+                          <div class="tab-pane fade col-md-6" id="custom-alerts" role="tabpanel" aria-labelledby="custom-alerts-tab">
+                              <g:if test="${customQueries}">
+                                  <table>
+                                      <tbody id="customQueries">
+                                      <g:each in="${customQueries}" status="i" var="query">
+                                          <tr class="${(i % 2) == 0 ? 'odd' : 'even'}" id='custom-${query.id}'>
+                                              <td class="queryDescription">
+                                                  <h3>${query.name}</h3>
+                                                  ${query.description}
+                                              </td>
+                                              <td class="queryActions">
+                                                  <a href="javascript:void(0);" class='btn btn-ala deleteButton' id='${query.id}'><g:message code="my.alerts.delete.label" /></a>
+                                              </td>
+                                          </tr>
+                                      </g:each>
+                                      </tbody>
+                                  </table>
+                              </g:if>
+                          </div>
+                      </div>
+                  </div>
+ <!-- end main content -->
           </div>
       </div>
       <asset:javascript src="alerts.js"/>