diff --git a/README.md b/README.md
index da4009f2..56cc1aa0 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # DigiVol   [![Build Status](https://travis-ci.org/AtlasOfLivingAustralia/volunteer-portal.svg?branch=develop)](https://travis-ci.org/AtlasOfLivingAustralia/volunteer-portal)
 
 The [Atlas of Living Australia], in collaboration with the [Australian Museum], developed [DigiVol]
-to harness the power of online volunteers (also known as crowdsourcing) to digitise biodiversity data that is locked up
-in biodiversity collections, field notebooks and survey sheets.
+to harness the power of online volunteers (also known as crowdsourcing) to digitise biodiversity data that is locked 
+up in biodiversity collections, field notebooks and survey sheets.
 
 ## Running
 
@@ -33,7 +33,7 @@ ansible-playbook -i inventories/vagrant --user vagrant --private-key ~/.vagrant.
 
 ## Contributing
 
-DigiVol is a [Grails] v3.2.4 based web application.  It requires [PostgreSQL] for data storage.  Development follows the 
+DigiVol is a [Grails] v5.3 based web application.  It requires [PostgreSQL] v15 for data storage.  Development follows the 
 [git flow] workflow.
 
 For git flow operations you may like to use the `git-flow` command line tools.  Either install [Atlassian SourceTree]
diff --git a/build.gradle b/build.gradle
index 29ecddb8..505ea347 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id "com.dorongold.task-tree" version "2.1.1"
 }
 
-version "6.1.7"
+version "6.1.8"
 group "au.org.ala"
 description "Digivol application"
 
diff --git a/gradle.properties b/gradle.properties
index eee60b5a..9b8dc973 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ springBootVersion=2.7.9
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
-alaAuthVersion=6.0.3
+alaAuthVersion=6.2.0
 
 #grailsWrapperVersion=1.0.0
 gradleWrapperVersion=5.0
diff --git a/grails-app/assets/javascripts/transcribe/wildlifespotter.js b/grails-app/assets/javascripts/transcribe/wildlifespotter.js
index f2d4ae08..dcb64066 100644
--- a/grails-app/assets/javascripts/transcribe/wildlifespotter.js
+++ b/grails-app/assets/javascripts/transcribe/wildlifespotter.js
@@ -18,11 +18,15 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
 
     var selectedIndicies = {};
 
+    // Default save button to disabled until a selection has been made.
+    $('#btnSave').attr('disabled', 'disabled');
+
     // selection
     $('#ct-container').on('click', '.ws-selector', function() {
       var $this = $(this);
       var index = $this.closest('[data-item-index]').data('item-index');
-      toggleIndex(index);
+      var validationtype = $this.data('validationType');
+      toggleIndex(index, validationtype);
     });
 
     $('#ct-container').on('click', '.animalDelete', function() {
@@ -31,16 +35,36 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
       deselectIndex(index);
     });
 
-    function toggleIndex(index) {
+    $('input[name=recordValues\\.0\\.noAnimalsVisible]').change(function() {
+      checkCheckboxValues();
+    });
+
+    $('input[name=recordValues\\.0\\.problemWithImage]').change(function() {
+      checkCheckboxValues();
+    });
+
+    function checkCheckboxValues() {
+      var q1 = $('input[name=recordValues\\.0\\.noAnimalsVisible]:checked').val();
+      var q2 = $('input[name=recordValues\\.0\\.problemWithImage]:checked').val();
+      if (!q1 && !q2) {
+        $('#btnSave').attr('disabled', 'disabled');
+      } else {
+        $('#btnSave').removeAttr('disabled');
+      }
+    }
+
+    function toggleIndex(index, validationType = "speciesWithCount") {
       if (selectedIndicies.hasOwnProperty(index)) {
         deselectIndex(index);
       } else {
-        selectIndex(index);
+        selectIndex(index, validationType);
       }
     }
 
-    function selectIndex(index) {
-      selectedIndicies[index] = { count: 1, notes: '', editorOpen: false};
+    function selectIndex(index, validationType = "speciesWithCount") {
+      var count = 0;
+      if (validationType === "speciesOnly") count = 1;
+      selectedIndicies[index] = { count: count, notes: '', editorOpen: false, init: true};
       syncSelections();
     }
 
@@ -50,7 +74,9 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
     }
 
     function syncSelections() {
-      var usKeys = _.chain(selectedIndicies).keys().filter(function(idx) { return selectedIndicies[idx].count > 0; });
+      var usKeys = _.chain(selectedIndicies).keys().filter(function(idx) {
+        return selectedIndicies[idx].count >= 0;
+      });
       var dataItemIndexes = usKeys.map(function(v,i,l) { return "[data-item-index='"+v+"']"});
       var wsSelectionIndicator = dataItemIndexes.map(function(v,i,l) { return v + " .ws-selected"; });
       var wsSelectorIndicator = dataItemIndexes.map(function(v,i,l) { return v + " .ws-selector"; });
@@ -58,6 +84,7 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
       $(wsSelectorIndicator.value().join(", ")).attr('aria-selected', 'true');
       $('[data-item-index]:not('+ dataItemIndexes.value().join(',') + ') .ws-selected').removeClass('selected').attr('aria-selected', 'false');
       $('[data-item-index]:not('+ dataItemIndexes.value().join(',') + ') .ws-selector').attr('aria-selected', 'false');
+
       var length = usKeys.value().length;
       if (length == 0) {
         hideSelectionPanel();
@@ -83,17 +110,13 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
           return {
             index: v,
             name: wsParams.animals[v].vernacularName,
-            options: _([1,2,3,4,5,6,7,8,9,10]).map(function(opt,i) {
-              return {
-                val: opt,
-                selected: selectedIndicies[v].count == opt ? 'selected' : '',
-                isSelected: selectedIndicies[v].count == opt ? 'true' : 'false'
-              };
-            }),
+            curval: selectedIndicies[v].count,
             comment: selectedIndicies[v].comment
           };
+
         }).sortBy(function(o) { return o.index; }).value()
       };
+
       mu.replaceTemplate(parent, 'status-detail-list-template', templateObj);
 
       parent.show();
@@ -110,14 +133,20 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
       generateFormFields();
     });
 
-    $('#ct-container').on('change', 'select.numAnimals', function() {
+    //$('#ct-container').on('change', 'select.numAnimals', function() {
+    $('#ct-container').on('change', 'input.numAnimals', function() {
       var $this = $(this);
       var idx = $this.closest('[data-item-index]').data('item-index');
       var count = $this.val();
+      // console.log("value change: " + count);
       selectedIndicies[idx].count = parseInt(count);
       generateFormFields();
     });
 
+    $('.input-group-btn-vertical').click(function() {
+      $('#ct-container').trigger("change");
+    });
+
     $('#ct-container').on('click', '.editCommentButton', function() {
       var $this = $(this);
       var idx = $this.closest('[data-item-index]').data('item-index');
@@ -128,6 +157,19 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
       selectedIndicies[idx].editorOpen = true;
     });
 
+    $("#ct-container").on('keydown', '.numAnimals', function(e) {
+      // Allow: backspace, delete, tab, escape, enter and .
+      if ($.inArray(e.keyCode, [46, 8, 9, 27, 13, 110, 190]) !== -1 || (e.keyCode === 65 && e.ctrlKey === true) || (e.keyCode >= 35 && e.keyCode <= 40)) {
+        // console.log("key " + e.keyCode + " allowed");
+        return;
+      }
+
+      if ((e.shiftKey || (e.keyCode < 48 || e.keyCode > 57)) && (e.keyCode < 96 || e.keyCode > 105)) {
+        // console.log("key " + e.keyCode + " not allowed");
+        e.preventDefault();
+      }
+    });
+
     $('#ct-container').on('click', '.saveCommentButton', function() {
       var $this = $(this);
       var idx = $this.closest('[data-item-index]').data('item-index');
@@ -313,6 +355,7 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
     function generateFormFields() {
       var $ctFields = $('#ct-fields');
       $ctFields.empty();
+      var enableSubmit = true;
       if (_.keys(selectedIndicies).length > 0) {
         $('input[name=recordValues\\.0\\.noAnimalsVisible]').removeAttr('checked');
         $('input[name=recordValues\\.0\\.problemWithImage]').removeAttr('checked');
@@ -320,12 +363,19 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
             delete recordValues[0].noAnimalsVisible;
             delete recordValues[0].problemWithImage;
         }
+        _.each(selectedIndicies, function(value, key, list) {
+          if (value.count === 0) enableSubmit = false;
+        });
       } else {
         if (recordValues && recordValues[0]) {
             delete recordValues[0].vernacularName;
             delete recordValues[0].scientificName;
             delete recordValues[0].individualCount;
         }
+
+        var q1 = $('input[name=recordValues\\.0\\.noAnimalsVisible]:checked').val();
+        var q2 = $('input[name=recordValues\\.0\\.problemWithImage]:checked').val();
+        if (!q1 && !q2) enableSubmit = false;
       }
       var i = 0;
       _.each(selectedIndicies, function (value, key, list) {
@@ -335,6 +385,10 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
         mu.appendTemplate($ctFields, 'input-template', {id: 'recordValues.' + i + '.comment', value: value.comment});
         ++i;
       });
+
+      // console.log("Enable submit button? " + enableSubmit);
+      if (enableSubmit) $('#btnSave').removeAttr('disabled');
+      else $('#btnSave').attr('disabled', 'disabled');
     }
 
     function syncRecordValues() {
@@ -371,12 +425,10 @@ function wildlifespotter(wsParams, imagePrefix, recordValues, placeholders) {
         errorList.push({element: null, message: "You must either indicate that there are no animals, there's a problem with the image or select at least one animal before you can submit", type: "Error" });
       }
     });
-    transcribeValidation.setErrorRenderFunctions(function (errorList) {
-      },
-      function() {
-      });
 
-    submitRequiresConfirmation = true;
+    transcribeValidation.setErrorRenderFunctions(function (errorList) {}, function() {});
+    var submitRequiresConfirmation = true;
+
     postValidationFunction = function(validationResults) {
       if (validationResults.errorList.length > 0) bootbox.alert("<h3>Invalid selection</h3><ul><li>" + _.pluck(validationResults.errorList, 'message').join('</li><li>') + "</li>");
     };
diff --git a/grails-app/controllers/au/org/ala/volunteer/LeaderBoardController.groovy b/grails-app/controllers/au/org/ala/volunteer/LeaderBoardController.groovy
index 192b1d8a..a6d9a3b0 100644
--- a/grails-app/controllers/au/org/ala/volunteer/LeaderBoardController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/LeaderBoardController.groovy
@@ -36,6 +36,7 @@ class LeaderBoardController {
         def category = params.category as LeaderBoardCategory
 
         def institution = Institution.get(params.int("institutionId"))
+        log.debug("Leaderboard top list")
 
         leaderBoardService.topList(category, institution)
     }
diff --git a/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy b/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
index a65de8c1..0d63e346 100644
--- a/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
@@ -37,6 +37,7 @@ class ProjectController {
     def authService
     def groovyPageRenderer
     def templateService
+    def settingsService
     Closure<DSLContext> jooqContext
 
     /**
@@ -63,6 +64,8 @@ class ProjectController {
         } else {
             // project info
             List userIds = taskService.getUserIdsAndCountsForProject(projectInstance, new HashMap<String, Object>())
+            def ineligible = settingsService.getSetting(SettingDefinition.IneligibleLeaderBoardUsers) ?: []
+            log.debug("Ineligible users: ${ineligible}")
             def expedition = grailsApplication.config.getProperty("expedition", List.class)
             def roles = [] //  List of Map
             // copy expedition data structure to "roles" & add "members"
@@ -78,7 +81,7 @@ class ProjectController {
                 def count = it[1]
                 def assigned = false
                 def user = User.findByUserId(userId)
-                if (user) {
+                if (user && !ineligible.contains(userId)) {
                     roles.eachWithIndex { role, i ->
                         if (count >= role.threshold && role.members.size() < role.max && !assigned) {
                             // assign role
diff --git a/grails-app/controllers/au/org/ala/volunteer/TaskController.groovy b/grails-app/controllers/au/org/ala/volunteer/TaskController.groovy
index 3630456d..6099c3c8 100644
--- a/grails-app/controllers/au/org/ala/volunteer/TaskController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/TaskController.groovy
@@ -174,6 +174,8 @@ class TaskController {
         def jsonObj = [:]
         jsonObj.put("cat", recordValues?.get(0)?.catalogNumber)
         jsonObj.put("name", recordValues?.get(0)?.scientificName)
+        jsonObj.put("id", taskInstance.id)
+        jsonObj.put("filename", taskInstance.externalIdentifier)
 
         List transcribers = []
         taskInstance.transcriptions.each {
diff --git a/grails-app/services/au/org/ala/volunteer/ExportService.groovy b/grails-app/services/au/org/ala/volunteer/ExportService.groovy
index 104ad132..713213f0 100644
--- a/grails-app/services/au/org/ala/volunteer/ExportService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/ExportService.groovy
@@ -7,6 +7,7 @@ import grails.gorm.transactions.Transactional
 import org.apache.commons.lang.SerializationUtils
 import org.jooq.tools.StringUtils
 
+import javax.servlet.http.HttpServletResponse
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.regex.Pattern
 import java.util.zip.ZipOutputStream
@@ -83,7 +84,7 @@ class ExportService {
         return result
     }
 
-    def export_zipFile = { Project project, taskList, fieldNames, fieldList, response ->
+    def export_zipFile = { Project project, List<Task> taskList, ArrayList<String> fieldNames, List fieldList, HttpServletResponse response ->
         def sw = Stopwatch.createStarted()
         def databaseFieldNames = fieldService.getMaxRecordIndexByFieldForProject(project)
         log.debug("Got databaseFieldNames in {}ms", sw.elapsed(MILLISECONDS))
@@ -102,7 +103,7 @@ class ExportService {
         log.debug("Generated repeating fields in {}ms", sw.elapsed(MILLISECONDS))
         sw.reset().start()
 
-        zipExport(project, taskList, fieldNames, fieldList, response, ["dataset"], repeatingFields)
+        zipExport(project, taskList, fieldNames, fieldList, response, ["dataset"] as List<FieldCategory>, repeatingFields)
     }
 
     private Map<Transcription, Map> getTranscriptionsToExport(Project project, Task task, Map valuesMap) {
@@ -253,10 +254,11 @@ class ExportService {
         writer.close()
     }
 
-    private void zipExport(Project project, taskList, List fieldNames, fieldList, response, List<FieldCategory> datasetCategories, List<String> otherRepeatingFields) {
+    private void zipExport(Project project, List<Task> taskList, ArrayList<String> fieldNames, List fieldList, HttpServletResponse response, List<FieldCategory> datasetCategories, List<String> otherRepeatingFields) {
         def valueMap = fieldListToMultiMap(fieldList)
         def sw = Stopwatch.createStarted()
         def datasetCategoryFields = [:]
+
         if (datasetCategories) {
             datasetCategories.each { category ->
                 // Work out which fields are a repeating group...
@@ -291,7 +293,7 @@ class ExportService {
         // Prepare the response for a zip file - use the project name as a basis of the filename
         def filename = "Project-" + (cleanFilename(project.featuredLabel) ?: project.id) + "-DwC"
 
-        response.setHeader("Content-Disposition", "attachment;filename=" + filename +".zip");
+        response.setHeader("Content-Disposition", "attachment;filename=" + filename + "-" + new Date().getTime() + ".zip");
         response.setContentType("application/zip");
 
         // First up write out the main tasks file -all the remaining fields are single value only
@@ -301,7 +303,7 @@ class ExportService {
 
         CSVWriter writer = new CSVWriter(outputwriter);
 
-        zipStream.putNextEntry(new ZipEntry("tasks.csv"));
+        zipStream.putNextEntry(new ZipEntry("tasks-" + new Date().getTime() + ".csv"));
         // write header line (field names)
         writer.writeNext((String[]) fieldNames.toArray(new String[0]))
 
@@ -336,6 +338,7 @@ class ExportService {
 
         // now for each repeating field category...
         if (datasetCategoryFields) {
+            log.debug("DatasetCategory Fields: ${datasetCategoryFields}")
             datasetCategoryFields.keySet().each { category ->
                 // Dataset files...
                 def dataSetFieldNames = datasetCategoryFields[category]
@@ -349,6 +352,7 @@ class ExportService {
         }
         // Now for the other repeating fields...
         if (otherRepeatingFields) {
+            log.debug("Other Repeating Fields: ${otherRepeatingFields}")
             otherRepeatingFields.each {
                 zipStream.putNextEntry(new ZipEntry("${it}.csv"))
                 exportDataSet(project, taskList, valueMap, writer, [it])
@@ -362,7 +366,7 @@ class ExportService {
         // Export multimedia as 'associatedMedia'. There may be more than one piece of multimedia per task
         // so we do it in a separate file...
 
-        zipStream.putNextEntry(new ZipEntry("associatedMedia.csv"))
+        zipStream.putNextEntry(new ZipEntry("associatedMedia-" + new Date().getTime() + ".csv"))
         exportMultimedia(taskList, writer);
         writer.flush();
         zipStream.closeEntry()
diff --git a/grails-app/services/au/org/ala/volunteer/LeaderBoardService.groovy b/grails-app/services/au/org/ala/volunteer/LeaderBoardService.groovy
index 4ebf2ff4..5bc90c38 100644
--- a/grails-app/services/au/org/ala/volunteer/LeaderBoardService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/LeaderBoardService.groovy
@@ -79,6 +79,7 @@ class LeaderBoardService {
         def today = todaysDate
 
         def ineligibleUsers = settingsService.getSetting(SettingDefinition.IneligibleLeaderBoardUsers)
+        log.debug("LeaderBoardService ineligible users: ${ineligibleUsers}")
 
         def headingPrefix = "Top 20 volunteers for "
         def heading =  headingPrefix + category?.toString()?.toTitleCase()
@@ -155,46 +156,69 @@ class LeaderBoardService {
     }
 
     List getTopNForPeriod(Date startDate, Date endDate, int count, List<Institution> institutionList, List<String> ineligibleUsers = [], def pt = null) {
+        log.debug("getTopNForPeriod: ${[startDate: startDate, endDate: endDate, count: count, institutionList: institutionList, ineligibleUsers: ineligibleUsers, pt: pt]}")
         // Get a map of users who transcribed tasks during this period, along with the count
         def scoreMap = getUserMapForPeriod(startDate, endDate, ActivityType.Transcribed, institutionList, ineligibleUsers, pt)
+        log.debug("Score Map: ${scoreMap}")
         // Get a map of user who validated tasks during this periodn, along with the count
         def validatedMap = getUserMapForPeriod(startDate, endDate, ActivityType.Validated, institutionList, ineligibleUsers, pt)
+        log.debug("Validate Map: ${validatedMap}")
 
         return mergeScores(validatedMap, scoreMap, count, ineligibleUsers)
     }
 
+    /**
+     * Merge the validated score map into the transcribed score map, forming a total activity score for the superset of users.
+     * Will omit ineligible users (saved in Admin/Inelgible Users).
+     * @param validatedMap Map of users validation scores
+     * @param scoreMap Map of users transcribe scores
+     * @param count the total number of combined users to list
+     * @param ineligibleUsers List of users to be omitted from the leaderboard
+     * @return the complete combined list with user details.
+     */
     private List mergeScores(LinkedHashMap validatedMap, LinkedHashMap scoreMap, int count, def ineligibleUsers) {
-        // merge the validated map into the transcribed map, forming a total activity score for the superset of users
+        log.debug("Ineligible users: ${ineligibleUsers}")
+
+        // combine the transcribed count with the validated count for that user.
         validatedMap.each { kvp ->
+            if (!scoreMap[kvp.key]) {
+                scoreMap[kvp.key] = 0
+            }
+            scoreMap[kvp.key] += kvp.value
+        }
+
+        // Parse the combined scoremap for ineligible users
+        scoreMap.each {kvp ->
             // If the user is excluded, set their score to -1.
             if (ineligibleUsers?.size() > 0 && ineligibleUsers?.contains(kvp.key)) {
                 scoreMap[kvp.key] = -1
-            } else {
-                // if there exists a validator who is not a transcriber, set the transcription count to 0
-                if (!scoreMap[kvp.key]) {
-                    scoreMap[kvp.key] = 0
-                }
-
-                // combine the transcribed count with the validated count for that user.
-                scoreMap[kvp.key] += kvp.value
+                log.debug("Ineligbile user [${kvp.key}] score: ${scoreMap[kvp.key]}")
             }
         }
 
+        // Sort and clip the top n volunteers
         scoreMap = scoreMap.sort { a, b -> b.value <=> a.value }
         if (scoreMap.size() > count) {
             scoreMap = scoreMap.take(count)
         }
+        log.debug("Final Score Map: ${scoreMap}")
 
-        // Flatten the map into a list for easy sorting, so we can slice off the top N
+        // Flatten the map into a list with user details
         def list = []
         def userDetails = userService.detailsForUserIds(scoreMap.keySet() as List<String>).collectEntries { [(it.userId): it] }
         scoreMap.each { kvp ->
-            def user = User.findByUserId(kvp.key)
-            def details = userDetails[kvp.key]
-            if (user) {
-                list << [name: details?.displayName, email: details?.email, score: kvp?.value ?: 0, userId: user?.id]
+            // Only include if they have a positive score (ineligible users will have -1)
+            if (kvp.value > 0) {
+                def user = User.findByUserId(kvp.key)
+                def details = userDetails[kvp.key]
+                if (user) {
+                    list << [name: details?.displayName, email: details?.email, score: kvp?.value ?: 0, userId: user?.id]
+                    log.debug("Adding user details for ${[name: details?.displayName, email: details?.email, score: kvp?.value ?: 0, userId: user?.id]}")
+                } else {
+                    log.warn("Failed to find user with key: ${kvp.key}")
+                }
             } else {
-                log.warn("Failed to find user with key: ${kvp.key}")
+                log.debug("Omitting ${kvp.key} from leaderboard list")
             }
         }
 
diff --git a/grails-app/services/au/org/ala/volunteer/TaskService.groovy b/grails-app/services/au/org/ala/volunteer/TaskService.groovy
index 0c3c8baf..032c064c 100644
--- a/grails-app/services/au/org/ala/volunteer/TaskService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/TaskService.groovy
@@ -73,13 +73,14 @@ class TaskService {
      * @return Map of project id -> count
      */
     Map getProjectTaskTranscribedCounts(boolean activeOnly = false) {
-        def projectTaskCounts = Task.executeQuery(
-            """select t.project.id as projectId, count(t) as taskCount
-               from Task t 
-               where 
-                exists (from Field as f where f.task = t) 
-                ${activeOnly ? 'and t.project.inactive != true' : ''}
-               group by t.project.id""")
+        def querySelect = """
+            select t.project.id as projectId, count(t) as taskCount
+            from Task t 
+            where exists (from Field as f where f.task = t) """.stripIndent()
+        def activeClause = "and t.project.inactive != true"
+        def query = querySelect + (activeOnly ? activeClause : "") + " group by t.project.id"
+
+        def projectTaskCounts = Task.executeQuery(query)
         projectTaskCounts.toMap()
     }
 
@@ -87,15 +88,15 @@ class TaskService {
      * @return Map of project id -> count
      */
     Map getProjectTaskFullyTranscribedCounts(boolean activeOnly = false) {
-        def projectTaskCounts = Task.executeQuery(
-            """select t.project.id as projectId, count(t) as taskCount
-               from Transcription t
-                ${activeOnly ? 'where t.project.inactive != true' : ''} 
-               group by t.project.id""")
+        def querySelect = """select t.project.id as projectId, count(t) as taskCount
+               from Transcription t """.stripIndent()
+        def activeClause = "where t.project.inactive != true"
+        def query = querySelect + (activeOnly ? activeClause : "") + " group by t.project.id"
+
+        def projectTaskCounts = Task.executeQuery(query)
         projectTaskCounts.toMap()
     }
 
-
     Map getProjectDates() {
         def dates = Task.executeQuery(
             """select t.project.id as projectId, min(trans.dateFullyTranscribed), max(trans.dateFullyTranscribed), min(t.dateFullyValidated), max(t.dateFullyValidated)
@@ -110,7 +111,6 @@ class TaskService {
         map
     }
 
-
     /**
      *
      * @param project
diff --git a/grails-app/services/au/org/ala/volunteer/ValidationService.groovy b/grails-app/services/au/org/ala/volunteer/ValidationService.groovy
index 39db53de..b9be8d55 100644
--- a/grails-app/services/au/org/ala/volunteer/ValidationService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/ValidationService.groovy
@@ -128,7 +128,13 @@ class ValidationService {
      */
     private boolean fieldsMatch(Transcription t1, Transcription t2) {
         if (t1?.project?.projectType?.name == ProjectType.PROJECT_TYPE_CAMERATRAP) {
-            return fieldsMatch(t1, t2, CAMERATRAP_EXCLUDED_FIELDS)
+            // If validation type is set to species only, add individual count to the list of excluded fields
+            def ctExcludedFields = CAMERATRAP_EXCLUDED_FIELDS
+            def viewParams = t1?.project?.template?.viewParams
+            if (viewParams && AutoValidationType.fromString(viewParams?.autoValidationType as String) == AutoValidationType.speciesOnly) {
+                ctExcludedFields.add(DarwinCoreField.individualCount.name())
+            }
+            return fieldsMatch(t1, t2, ctExcludedFields)
         } else {
             return fieldsMatch(t1, t2, EXCLUDED_FIELDS)
         }
diff --git a/grails-app/views/admin/index.gsp b/grails-app/views/admin/index.gsp
index d1a167c0..a07eb938 100644
--- a/grails-app/views/admin/index.gsp
+++ b/grails-app/views/admin/index.gsp
@@ -4,6 +4,19 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}"/>
     <title><cl:pageTitle title="${g.message(code:"admin.label", default:"Administration")}" /></title>
+
+    <style>
+        .btn {
+            border-radius: 5px;
+            width: 200px;
+        }
+
+        .btn-primary {
+            background-color: #5d8ab1 !important;
+            border-color: #2e6da4 !important;
+        }
+    </style>
+
 </head>
 
 <body class="admin">
@@ -31,123 +44,123 @@
                         <tbody>
 
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'institutionAdmin', action: 'index')}">Manage Institutions</a>
                             </td>
                             <td>Manage Institutions</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'project', action: 'manage')}">Manage Expeditions</a>
                             </td>
                             <td>Download expedition images and remove from server, clone and edit expedition.</td>
                         </tr>
                         <tr>
                             <td>
-                                <a class="btn btn-default bs3"
+                                <a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'project', action: 'create')}">Create new Expedition</a>
                             </td>
                             <td>Create a new ${message(code: 'default.application.name')} Expedition</td>
                         </tr>
                         <tr>
                             <td>
-                                <a class="btn btn-default bs3"
+                                <a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'template', action: 'list')}">Templates</a>
                             </td>
                             <td>Manage expedition templates and their fields</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'picklist', action: 'manage')}">Bulk manage Picklists</a>
                             </td>
                             <td>Allows modification to the values held in various picklists</td>
                         </tr>
                         <cl:ifSiteAdmin>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'validationRule', action: 'list')}">Validation Rules</a>
                             </td>
                             <td>Manage transcription validation rules</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'frontPage', action: 'edit')}">Configure Front Page</a>
                             </td>
                             <td>Configure the appearance of the front page</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'landingPageAdmin', action: 'index')}">Configure Landing Page</a>
                             </td>
                             <td>Configure the appearance of a landing page</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
-                                   href="${createLink(controller: 'leaderBoardAdmin', action: 'index')}">Configure Honour Board</a>
+                            <td><a class="btn btn-primary bs3"
+                                   href="${createLink(controller: 'leaderBoardAdmin', action: 'index')}">Manage Leaderboard</a>
                             </td>
                             <td>Configure the appearance of the Honour Board</td>
                         </tr>
                         </cl:ifSiteAdmin>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'stats', action: 'index')}">Stats</a></td>
                             <td>Various Statistics (Experimental!)</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'admin', action: 'tutorialManagement')}">Tutorial Files</a>
                             </td>
                             <td>Manage tutorial files</td>
                         </tr>
                     <cl:ifSiteAdmin>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'admin', action: 'tools')}">Tools</a></td>
                             <td>Tools</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'user', action: 'list')}">User List</a></td>
                             <td>List of all User accounts on DigiVol</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'user', action: 'listOptOut')}">Users Opted-Out</a></td>
                             <td>List of all Users who have opted-out of receiving Institution Messages</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'admin', action: 'manageInstitutionAdmins')}">Manage Institution Admins</a>
                             </td>
                             <td>Manage Institution Admins</td>
                         </tr>
                     </cl:ifSiteAdmin>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'admin', action: 'manageUserRoles')}">Manage User Roles</a>
                             </td>
                             <td>Manage User Roles, such as validators and forum moderators.</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'institutionMessage', action: 'index')}">Institution Messages</a>
                             </td>
                             <td>Create and send messages to volunteers of your institutions and expeditions.</td>
                         </tr>
                         <cl:ifSiteAdmin>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'achievementDescription', action: 'index')}">Manage Badges</a>
                             </td>
                             <td>Manage Achievements</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'label', action: 'index')}">Manage Tags</a></td>
                             <td>Manage Expedition Tags</td>
                         </tr>
                         <tr>
-                            <td><a class="btn btn-default bs3"
+                            <td><a class="btn btn-primary bs3"
                                    href="${createLink(controller: 'setting', action: 'index')}">Advanced Settings</a>
                             </td>
                             <td>Advanced Settings</td>
@@ -157,13 +170,13 @@
                             <td>Admin reports</td>
                             <td>
                                 <cl:ifSiteAdmin>
-                                <a class="btn btn-default bs3"
+                                <a class="btn btn-primary bs3"
                                    title="Users and their various counts and last activity etc..."
                                    href="${createLink(controller: 'ajax', action: 'userReport', params: [wt: 'csv'])}">User report</a>
-                                <a class="btn btn-default bs3" title="A summary of recent user activity"
+                                <a class="btn btn-primary bs3" title="A summary of recent user activity"
                                    href="${createLink(controller: 'admin', action: 'currentUsers')}">Current users</a>
                                 </cl:ifSiteAdmin>
-                                <a class="btn btn-default bs3" title="List of all expeditions and their statistics"
+                                <a class="btn btn-primary bs3" title="List of all expeditions and their statistics"
                                    href="${createLink(controller: 'admin', action: 'projectSummaryReport')}">Expedition Summary Report</a>
                             </td>
                         </tr>
diff --git a/grails-app/views/layouts/_profileDropDown.gsp b/grails-app/views/layouts/_profileDropDown.gsp
index 306b01ee..e53d280b 100644
--- a/grails-app/views/layouts/_profileDropDown.gsp
+++ b/grails-app/views/layouts/_profileDropDown.gsp
@@ -26,7 +26,7 @@
                     <ul class="profile-links">
                         <li><a href="${cl.urlAppend(base: grailsApplication.config.getProperty('userDetails.url', String), path: 'my-profile')}" class="" target="_blank"><g:message code="action.viewProfile" /></a></li>
                         <li><a href="${g.createLink(controller: 'user', action: 'notebook')}" class=""><g:message code="action.notebook" /> <span class="hidden unread-count label label-danger label-as-badge"></span></a></li>
-                        <li><a href="${g.createLink(controller: 'logout', action: 'logout')}" class="">Logout</a></li>
+                        <li><a href="${g.createLink(uri: '/logout')}" class="">Logout</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/grails-app/views/leaderBoardAdmin/index.gsp b/grails-app/views/leaderBoardAdmin/index.gsp
index 04e33ff8..2da2edda 100644
--- a/grails-app/views/leaderBoardAdmin/index.gsp
+++ b/grails-app/views/leaderBoardAdmin/index.gsp
@@ -89,7 +89,7 @@
 
                         $("#add-user").val('');
                     })
-                    .fail(function() { alert("Couldn't add user")});
+                    .fail(function() { alert("Couldn't add user"); });
                 return null;
         }, 'displayName');
 
@@ -111,7 +111,7 @@
                 p.remove();
                 $("#add-user").val('');
             })
-            .fail(alert("Couldn't remove user"))
+            .fail(function() { alert("Couldn't remove user"); })
             .always(hideSpinner);
         }
 
diff --git a/grails-app/views/project/index.gsp b/grails-app/views/project/index.gsp
index b080022f..33b2b502 100644
--- a/grails-app/views/project/index.gsp
+++ b/grails-app/views/project/index.gsp
@@ -277,7 +277,14 @@
 
                 url: "${createLink(controller: 'task', action: 'details')}/" + id,
                 success: function (data) {
-                    var content = "<div style='font-size:12px;line-height:1.3em;'>Catalogue No.: " + data.cat + "<br/>Taxon: " + data.name + "<br/>Transcribed by: " + data.transcriber + "</div>";
+                    var content = "<div style='font-size:12px;line-height:1.3em;'>Task: " + data.id + "<br/>";
+                <cl:ifValidator project="${projectInstance}">
+                    content += "File: <a href=\"${createLink(controller: 'task', action: 'showDetails')}/" + id + "\" target=\"_blank\">" + data.filename + "</a><br/>";
+                </cl:ifValidator>
+                <cl:ifNotValidator project="${projectInstance}">
+                    content += "File: " + data.filename + "<br/>";
+                </cl:ifNotValidator>
+                    content += "Transcribed by: " + data.transcriber + "</div>";
                     infowindow.close();
                     infowindow.setContent(content);
                     infowindow.open(map, marker);
diff --git a/grails-app/views/project/manage.gsp b/grails-app/views/project/manage.gsp
index 8b08eddd..4e2ebc06 100644
--- a/grails-app/views/project/manage.gsp
+++ b/grails-app/views/project/manage.gsp
@@ -185,9 +185,7 @@
 
                                 <td style="white-space: nowrap;">
                                     <!-- Toggle Status -->
-%{--                                    <g:form name="activationForm_${projectInstance.project.id}" id="${projectInstance.project.id}" controller="project" action="update" params="${params}">--}%
                                     <g:if test="${projectInstance.project.inactive}">
-%{--                                        <g:hiddenField name="inactive" value="true"/>--}%
                                         <g:if test="${projectInstance.project.archived}">
                                             <button role="button" class="btn btn-default btn-xs"
                                                     title="You cannot activate an archived expedition." disabled><i class="fa fa-toggle-off"></i></button>
@@ -197,10 +195,11 @@
                                         </g:else>
                                     </g:if>
                                     <g:else>
-%{--                                        <g:hiddenField name="inactive" value="false"/>--}%
                                         <a class="btn btn-xs btn-default toggle-project-status" alt="Deactivate" title="Deactivate Expedition"><i class="fa fa-toggle-on"></i></a>
                                     </g:else>
 
+                                    <!-- Export -->
+                                    <a class="btn btn-xs btn-default export-project" alt="Export" title="Export Expedition (all tasks)"><i class="fa fa-table"></i></a>
 
                                     <!-- Clone -->
                                     <a class="btn btn-xs btn-default clone-project" alt="Clone" title="Clone Expedition"><i class="fa fa-clone"></i></a>
@@ -263,6 +262,16 @@ jQuery(function($) {
         }
     });
 
+    $(".export-project").click(function(e) {
+            e.preventDefault();
+            var projectId = $(this).parents("[projectId]").attr("projectId");
+            var options = {
+                title:'Export all tasks',
+                url:"${createLink(controller: "task", action: "exportOptionsFragment", params: [exportCriteria: 'all']).encodeAsJavaScript()}&projectId=" + projectId
+            };
+            bvp.showModal(options);
+        });
+
     $(".clone-project").click(function(e) {
         e.preventDefault();
         var oldProjectId = $(this).parents("[projectId]").attr("projectId");
diff --git a/grails-app/views/task/exportOptionsFragment.gsp b/grails-app/views/task/exportOptionsFragment.gsp
index ef5a34d3..6032d0f1 100644
--- a/grails-app/views/task/exportOptionsFragment.gsp
+++ b/grails-app/views/task/exportOptionsFragment.gsp
@@ -1,20 +1,27 @@
 <div class="row">
     <div class="col-md-12">
-        <h3>Select an export format</h3>
+        <strong>Select an export format</strong>
 
         <div class="input-group">
             <label class="radio" style="margin-left: 20px;">
                 <input type="radio" name="optionsExport" id="optionsExportCSV" value="csv" checked>
                 <strong>Single de-normalised CSV file</strong>
-                <br/>
-                Repeating fields will get a column each with a record index suffix (e.g. recordedBy_0, recordedBy_1). This is probably the most appropriate choice for specimen label transcriptions.
             </label>
+            <p>
+                Export will be a single CSV file. Repeating fields will have their own column each with a record index
+                suffix (e.g. recordedBy_0, recordedBy_1).
+                This is probably the most appropriate choice for <b>specimen label</b> transcriptions.
+            </p>
+
             <label class="radio" style="margin-left: 20px;">
                 <input type="radio" name="optionsExport" id="optionsExportZip" value="zip">
                 <strong>ZIP file</strong>
-                <br/>
-                A compressed archive of multiple flat CSV files, one for each one-to-many relationship. Files are linked by a task id. Suitable for field diaries and notebooks with large numbers of repeating fields.
             </label>
+            <p>
+                A compressed archive of multiple flat CSV files, one for each one-to-many relationship. Files are linked
+                by a task id. This would be most suitable for <b>field diaries</b> and <b>notebooks</b> with large
+                numbers of repeating fields.
+            </p>
         </div>
 
         <div class="input-group">
diff --git a/grails-app/views/template/_wildlifespotterTranscribeParams.gsp b/grails-app/views/template/_wildlifespotterTranscribeParams.gsp
index 24130597..b4a5b6e7 100644
--- a/grails-app/views/template/_wildlifespotterTranscribeParams.gsp
+++ b/grails-app/views/template/_wildlifespotterTranscribeParams.gsp
@@ -1,46 +1,65 @@
+<%@ page import="au.org.ala.volunteer.AutoValidationType" %>
 <div class="form-group">
-    <div class="col-md-offset-3 col-md-6">
+    <label class="col-md-3 control-label" for="exportGroupByIndex">
+        <g:message code="template.hideDefaultButtons.label" default="Hide Default Buttons"/>
+    </label>
+    <div class="col-md-6">
         <div class="checkbox">
-            <label>
-                <g:checkBox name="hideDefaultButtons" data-default="true"/>
-                <g:message code="template.hideDefaultButtons.label" default="Hide Default Buttons"/>
-            </label>
+            <g:checkBox name="hideDefaultButtons" data-default="true"/>
         </div>
     </div>
 </div>
 
 <div class="form-group">
-    <div class="col-md-offset-3 col-md-6">
+    <label class="col-md-3 control-label" for="exportGroupByIndex">
+        <g:message code="template.hideSectionNumbers.label" default="Hide Section Numbers"/>
+    </label>
+    <div class="col-md-6">
         <div class="checkbox">
-            <label>
-                <g:checkBox name="hideSectionNumbers" data-default="true"/>
-                <g:message code="template.hideSectionNumbers.label" default="Hide Section Numbers"/>
-            </label>
+            <g:checkBox name="hideSectionNumbers" data-default="true"/>
         </div>
     </div>
 </div>
 
 <div class="form-group">
-    <div class="col-md-offset-3 col-md-6">
+    <label class="col-md-3 control-label" for="exportGroupByIndex">
+        <g:message code="template.exportGroupByIndex.label" default="Group fields by index in CSV export"/>
+    </label>
+    <div class="col-md-6" style="padding-bottom: 10px;">
         <div class="checkbox">
-            <label>
                 <g:checkBox name="exportGroupByIndex" data-default="true"/>
-                <g:message code="template.exportGroupByIndex.label" default="Group fields by index in CSV export"/>
-            </label>
         </div>
     </div>
 </div>
 
 <div class="form-group">
-    <label class="col-md-3 control-label" for="jumpNTasks"><g:message code="template.wildlifeSpotter.jump.label"
-                                                             default="Number of tasks to jump on save / skip"/></label>
+    <label class="col-md-3 control-label" for="autoValidationType">
+        <g:message code="template.autoValidationType.label" default="System Validation Type"/>
+        &nbsp;&nbsp;<a href="#" class="btn btn-default btn-xs fieldHelp"
+                       title="<g:message code="template.autoValidationType.helptext"
+                                         default="Select the field combination that the System will use for comparison when auto-validating."/>">
+        <span class="help-container"><i class="fa fa-question"></i></span></a>
+    </label>
+    <div class="col-md-6">
+        <g:select class="form-control"
+                  name="autoValidationType"
+                  from="${AutoValidationType.values()}"
+                  optionValue="label"
+                  value="${AutoValidationType.getDefault()}" />
+    </div>
+</div>
 
+<div class="form-group">
+    <label class="col-md-3 control-label" for="jumpNTasks">
+        <g:message code="template.wildlifeSpotter.jump.label" default="Number of tasks to jump on save / skip"/>
+    </label>
     <div class="col-md-6">
         <g:field type="number" name="jumpNTasks" min="1" max="10" data-default="6" class="form-control"/>
     </div>
 </div>
+
 <div class="form-group">
-    <div class="col-sm-offset-3 col-sm-9">
+    <div class="col-md-offset-3 col-md-9" style="padding-bottom: 5px;">
         <g:link class="btn btn-primary" controller="template" action="wildlifeTemplateConfig" id="${templateInstance.id}">Configure Wildlife Spotter Entries</g:link>
     </div>
 </div>
diff --git a/grails-app/views/template/edit.gsp b/grails-app/views/template/edit.gsp
index ba997322..ba238746 100644
--- a/grails-app/views/template/edit.gsp
+++ b/grails-app/views/template/edit.gsp
@@ -5,6 +5,11 @@
     <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}"/>
     <g:set var="entityName" value="${message(code: 'template.label', default: 'Template')}"/>
     <title><g:message code="default.edit.label" args="[entityName]"/></title>
+    <style>
+        input[type="checkbox"] {
+            margin-left: 0px !important;
+        }
+    </style>
 </head>
 
 <body class="admin">
@@ -58,7 +63,6 @@
                         </div>
 
                         <div id="row-view-params-form" style="display: none;">
-
                         </div>
 
                         <div id="row-view-params-json"
@@ -73,68 +77,58 @@
                         </div>
 
                         <div class="form-group ${hasErrors(bean: templateInstance, field: 'supportMultipleTranscriptions', 'has-error')}">
-                            <label class="col-md-4 control-label" for="supportMultipleTranscriptions">
+                            <label class="col-md-3 control-label" for="supportMultipleTranscriptions">
                                 <g:message code="template.multipletanscriptions.label"
-                                           default="Support multiple transcriptions per task?"/>&nbsp;&nbsp;<a href="#" class="btn btn-default btn-xs fieldHelp"
-                                                                                                   title="<g:message code="template.multipletanscriptions.helptext"
-                                                                                                                     default="Ignored for Specimen and Fieldnote Expedition types."/>"><span
-                                        class="help-container"><i class="fa fa-question"></i> </span></a>
+                                           default="Support multiple transcriptions per task?"/>
+
                             </label>
                             <div class="col-md-6">
                                 <div style="padding-top: 10px">
-                                <g:checkBox name="supportMultipleTranscriptions"
-                                            checked="${templateInstance.supportMultipleTranscriptions}"/>
+                                    <g:checkBox name="supportMultipleTranscriptions"
+                                                checked="${templateInstance.supportMultipleTranscriptions}"/>
+                                    &nbsp;&nbsp;<a href="#" class="btn btn-default btn-xs fieldHelp"
+                                                   title="<g:message code="template.multipletanscriptions.helptext"
+                                                                     default="Ignored for Specimen and Fieldnote Expedition types."/>">
+                                    <span class="help-container"><i class="fa fa-question"></i></span></a>
                                 </div>
                             </div>
                         </div>
 
                         <cl:ifSiteAdmin>
-                            <div class="form-group ${hasErrors(bean: templateInstance, field: 'isGlobal', 'has-error')}">
-                                <label class="col-md-4 control-label" for="isGlobal">
-                                    <g:message code="template.isglobal.label"
-                                               default="Is a Global Template (available to everyone)?"/>
-                                </label>
-                                <div class="col-md-6">
-                                    <div style="padding-top: 10px">
-                                        <g:checkBox name="isGlobal"
-                                                    checked="${templateInstance.isGlobal}"/>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group ${hasErrors(bean: templateInstance, field: 'isHidden', 'has-error')}">
-                                <label class="col-md-4 control-label" for="isHidden">
-                                    <g:message code="template.ishidden.label"
-                                               default="Hide Template (hide from all editors)?"/>
-                                </label>
-                                <div class="col-md-6">
-                                    <div style="padding-top: 10px">
-                                        <g:checkBox name="isHidden"
-                                                    checked="${templateInstance.isHidden}"/>
-                                    </div>
+                        <div class="form-group ${hasErrors(bean: templateInstance, field: 'isGlobal', 'has-error')}">
+                            <label class="col-md-3 control-label" for="isGlobal">
+                                <g:message code="template.isglobal.label"
+                                           default="Is a Global Template?"/>
+                            </label>
+                            <div class="col-md-6">
+                                <div style="padding-top: 10px">
+                                    <g:checkBox name="isGlobal"
+                                                checked="${templateInstance.isGlobal}"/>
+                                    &nbsp;&nbsp;<a href="#" class="btn btn-default btn-xs fieldHelp"
+                                                   title="<g:message code="template.globaltemplate.helptext"
+                                                                     default="A global template is available to all institutions."/>">
+                                    <span class="help-container"><i class="fa fa-question"></i></span></a>
                                 </div>
                             </div>
-                        </cl:ifSiteAdmin>
-
-                        <div id="row-view-params-json" class="form-group">
-                            <label class="col-md-4 control-label"><g:message code="template.project.label"
-                                                                                  default="Projects that use this template:"/></label>
+                        </div>
 
+                        <div class="form-group ${hasErrors(bean: templateInstance, field: 'isHidden', 'has-error')}">
+                            <label class="col-md-3 control-label" for="isHidden">
+                                <g:message code="template.ishidden.label"
+                                           default="Hide Template?"/>
+                            </label>
                             <div class="col-md-6">
-                                <g:each in="${projectUsageList}" var="project">
-                                    <ul>
-                                        <li class="form-control-static">${(project.key ? project.key : "No institution")}</li>
-                                        <ul>
-                                            <g:each in="${project.value}" var="proj">
-                                                <li><g:link controller="project" action="show" id="${proj.id}">${proj.name}</g:link></li>
-                                            </g:each>
-                                        </ul>
-                                    </ul>
-                                </g:each>
+                                <div style="padding-top: 10px">
+                                    <g:checkBox name="isHidden"
+                                                checked="${templateInstance.isHidden}"/>
+                                    &nbsp;&nbsp;<a href="#" class="btn btn-default btn-xs fieldHelp"
+                                                   title="<g:message code="template.hidden.helptext"
+                                                                     default="Hide this template from all users."/>">
+                                    <span class="help-container"><i class="fa fa-question"></i></span></a>
+                                </div>
                             </div>
                         </div>
-
-                        </div>
+                        </cl:ifSiteAdmin>
 
                         <div class="form-group">
                             <div class="col-md-offset-3 col-md-9">
@@ -149,11 +143,31 @@
                             </div>
                         </div>
                     </g:form>
+
+                    <div id="row-view-params-json" class="form-group">
+                        <label class="col-md-3 control-label">
+                            <g:message code="template.project.label"
+                                       default="Projects that use this template:"/>
+                        </label>
+                        <div class="col-md-6">
+                            <g:each in="${projectUsageList}" var="project">
+                                <ul>
+                                    <li class="form-control-static">${(project.key ? project.key : "No institution")}</li>
+                                    <ul>
+                                        <g:each in="${project.value}" var="proj">
+                                            <li><g:link controller="project" action="show" id="${proj.id}">${proj.name}</g:link></li>
+                                        </g:each>
+                                    </ul>
+                                </ul>
+                            </g:each>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
+
 <asset:javascript src="underscore" asset-defer=""/>
 <asset:javascript src="qtip" asset-defer=""/>
 <asset:script type="text/javascript">
@@ -246,6 +260,7 @@
             p.done(function(data, textStatus, jqXHR) {
                 $('#row-view-params-form').css('display', 'initial').html(data);
                 addDefaults();
+                updateHelpTips();
                 syncParamsFields();
             });
 
@@ -254,20 +269,22 @@
             });
         }).change();
 
-        // Context sensitive help popups
-        $("a.fieldHelp").each(function() {
-        var self = this;
-            $(self).qtip({
-                content: $(self).attr('title'),
-                position: {
-                    at: "top left",
-                    my: "bottom right"
-                },
-                style: {
-                    classes: 'qtip-bootstrap'
-                }
-            }).bind('click', function(e) { e.preventDefault(); return false; });
-        });
+        function updateHelpTips() {
+            // Context sensitive help popups
+            $("a.fieldHelp").each(function() {
+                var self = this;
+                $(self).qtip({
+                    content: $(self).attr('title'),
+                    position: {
+                        at: "top left",
+                        my: "bottom right"
+                    },
+                    style: {
+                        classes: 'qtip-bootstrap'
+                    }
+                }).bind('click', function(e) { e.preventDefault(); return false; });
+            });
+        }
 
     });
 
diff --git a/grails-app/views/transcribe/_wildlifeSpotterWidget.gsp b/grails-app/views/transcribe/_wildlifeSpotterWidget.gsp
index 36a8d712..8836eeef 100644
--- a/grails-app/views/transcribe/_wildlifeSpotterWidget.gsp
+++ b/grails-app/views/transcribe/_wildlifeSpotterWidget.gsp
@@ -1,23 +1,32 @@
 <div class="itemgrid">%{--
     display: inline-block, so no spaces between the divs
-    --}%<g:each in="${imageInfos}" var="piItem" status="st"><div class="griditem bvpBadge"
-                                                                           data-item-index="${st}">
-        <g:if test="${piItem?.audio?.size() > 0}">
-            <div class="thumbnail ct-thumbnail <g:if test="${!isAnswers}">ws-selector</g:if>" aria-selected="false" data-image-select-key="${st}" title="${g.message(code: 'audiotranscribe.widget.badge.title', args: [piItem.vernacularName])}">
-        </g:if>
-        <g:else>
-            <div class="thumbnail ct-thumbnail <g:if test="${!isAnswers}">ws-selector</g:if>" aria-selected="false" data-image-select-key="${st}" title="${g.message(code: 'wildlifespotter.widget.badge.title', args: [piItem.vernacularName])}">
-        </g:else>
-                <g:if test="${!isAnswers}">
-                    %{-- If Audio --}%
-                    <g:if test="${piItem?.audio?.size() > 0}">
-                        <g:set var="audioSample" value="${piItem.audio[0]}" />
-                        <cl:audioSample prefix="audiotranscribe" name="${audioSample.hash}" format="${audioSample.ext}"/>
-                    </g:if>
-                    <span class="ws-selected"><i class="fa fa-check"></i></span>
-                    <span class="ws-info" data-container="body"><i class="fa fa-info-circle"></i></span>
+    --}%
+<g:each in="${imageInfos}" var="piItem" status="st">
+    <div class="griditem bvpBadge" data-item-index="${st}">
+    <g:if test="${piItem?.audio?.size() > 0}">
+        <div class="thumbnail ct-thumbnail <g:if test="${!isAnswers}">ws-selector</g:if>"
+             aria-selected="false"
+             data-image-select-key="${st}"
+             data-validation-type="${viewParams.autoValidationType}"
+             title="${g.message(code: 'audiotranscribe.widget.badge.title', args: [piItem.vernacularName])}">
+    </g:if>
+    <g:else>
+        <div class="thumbnail ct-thumbnail <g:if test="${!isAnswers}">ws-selector</g:if>"
+             aria-selected="false"
+             data-image-select-key="${st}"
+             data-validation-type="${viewParams.autoValidationType}"
+             title="${g.message(code: 'wildlifespotter.widget.badge.title', args: [piItem.vernacularName])}">
+    </g:else>
+            <g:if test="${!isAnswers}">
+                %{-- If Audio --}%
+                <g:if test="${piItem?.audio?.size() > 0}">
+                    <g:set var="audioSample" value="${piItem.audio[0]}" />
+                    <cl:audioSample prefix="audiotranscribe" name="${audioSample.hash}" format="${audioSample.ext}"/>
                 </g:if>
-            %{--</g:if>--}%
+                <span class="ws-selected"><i class="fa fa-check"></i></span>
+                <span class="ws-info" data-container="body"><i class="fa fa-info-circle"></i></span>
+            </g:if>
+                %{--</g:if>--}%
             <div class="bvpBadgeMain cycler">
                 <g:each in="${piItem.images}" var="key" status="j">
                     <cl:sizedImage class="ct-thumbnail-image ws-thumbnail-image${j == 0 ? ' active' : ' '}"
@@ -32,5 +41,6 @@
                 </div>
             </div>
         </div>
-    </div></g:each>
+    </div>
+</g:each>
 </div>
\ No newline at end of file
diff --git a/grails-app/views/transcribe/templateViews/genericLabelsTranscribe.gsp b/grails-app/views/transcribe/templateViews/genericLabelsTranscribe.gsp
index 545f2c12..64af3f6a 100644
--- a/grails-app/views/transcribe/templateViews/genericLabelsTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/genericLabelsTranscribe.gsp
@@ -71,7 +71,7 @@
                         <button type="button" class="insert-symbol-button" symbol="&#39;"
                                 title="Insert an apostrophe (minutes) symbol"></button>
                         <button type="button" class="insert-symbol-button" symbol="&quot;"
-                                title="Insert a quote (minutes) symbol"></button>
+                                title="Insert a quote (seconds) symbol"></button>
                         <button type="button" class="insert-symbol-button" symbol="&#x2642;"
                                 title="Insert the male gender symbol"></button>
                         <button type="button" class="insert-symbol-button" symbol="&#x2640;"
diff --git a/grails-app/views/transcribe/templateViews/smithsonianPlantsTranscribe.gsp b/grails-app/views/transcribe/templateViews/smithsonianPlantsTranscribe.gsp
index 872ef676..4b14f28a 100644
--- a/grails-app/views/transcribe/templateViews/smithsonianPlantsTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/smithsonianPlantsTranscribe.gsp
@@ -71,7 +71,7 @@
                     <button type="button" class="insert-symbol-button" symbol="&#39;"
                             title="Insert an apostrophe (minutes) symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&quot;"
-                            title="Insert a quote (minutes) symbol"></button>
+                            title="Insert a quote (seconds) symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&#x2642;"
                             title="Insert the male gender symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&#x2640;"
diff --git a/grails-app/views/transcribe/templateViews/specimenLabelTranscribe.gsp b/grails-app/views/transcribe/templateViews/specimenLabelTranscribe.gsp
index 40a73dc4..01287f0f 100644
--- a/grails-app/views/transcribe/templateViews/specimenLabelTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/specimenLabelTranscribe.gsp
@@ -85,7 +85,7 @@
                             <button type="button" class="insert-symbol-button" symbol="&#39;"
                                     title="Insert an apostrophe (minutes) symbol"></button>
                             <button type="button" class="insert-symbol-button" symbol="&quot;"
-                                    title="Insert a quote (minutes) symbol"></button>
+                                    title="Insert a quote (seconds) symbol"></button>
                             <button type="button" class="insert-symbol-button" symbol="&#x2642;"
                                     title="Insert the male gender symbol"></button>
                             <button type="button" class="insert-symbol-button" symbol="&#x2640;"
diff --git a/grails-app/views/transcribe/templateViews/specimenTranscribe.gsp b/grails-app/views/transcribe/templateViews/specimenTranscribe.gsp
index eab7f2a7..f26e842e 100644
--- a/grails-app/views/transcribe/templateViews/specimenTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/specimenTranscribe.gsp
@@ -70,7 +70,7 @@
                     <button type="button" class="insert-symbol-button" symbol="&#39;"
                             title="Insert an apostrophe (minutes) symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&quot;"
-                            title="Insert a quote (minutes) symbol"></button>
+                            title="Insert a quote (seconds) symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&#x2642;"
                             title="Insert the male gender symbol"></button>
                     <button type="button" class="insert-symbol-button" symbol="&#x2640;"
diff --git a/grails-app/views/transcribe/templateViews/threeColumnLabelTranscribe.gsp b/grails-app/views/transcribe/templateViews/threeColumnLabelTranscribe.gsp
index 2c41535a..ef1258bd 100644
--- a/grails-app/views/transcribe/templateViews/threeColumnLabelTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/threeColumnLabelTranscribe.gsp
@@ -73,7 +73,7 @@
                                 <button type="button" class="insert-symbol-button btn btn-primary btn-sm" symbol="&#39;"
                                         title="Insert an apostrophe (minutes) symbol"></button>
                                 <button type="button" class="insert-symbol-button btn btn-primary btn-sm" symbol="&quot;"
-                                        title="Insert a quote (minutes) symbol"></button>
+                                        title="Insert a quote (seconds) symbol"></button>
                                 <button type="button" class="insert-symbol-button btn btn-primary btn-sm" symbol="&#x2642;"
                                         title="Insert the male gender symbol"></button>
                                 <button type="button" class="insert-symbol-button btn btn-primary btn-sm" symbol="&#x2640;"
diff --git a/grails-app/views/transcribe/templateViews/wildlifespotterTranscribe.gsp b/grails-app/views/transcribe/templateViews/wildlifespotterTranscribe.gsp
index 1f1a28dc..2f12c9bf 100644
--- a/grails-app/views/transcribe/templateViews/wildlifespotterTranscribe.gsp
+++ b/grails-app/views/transcribe/templateViews/wildlifespotterTranscribe.gsp
@@ -1,4 +1,4 @@
-<%@ page import="au.org.ala.volunteer.Picklist; au.org.ala.volunteer.FieldCategory; au.org.ala.volunteer.TemplateField; au.org.ala.volunteer.DarwinCoreField" %>
+<%@ page import="au.org.ala.volunteer.AutoValidationType; au.org.ala.volunteer.Picklist; au.org.ala.volunteer.FieldCategory; au.org.ala.volunteer.TemplateField; au.org.ala.volunteer.DarwinCoreField" %>
 <sitemesh:parameter name="useFluidLayout" value="${true}"/>
 <g:applyLayout name="digivol-task" model="${pageScope.variables}">
     <head>
@@ -9,6 +9,8 @@
         <div id="ct-container" >
 
             <g:set var="wsParams" value="${template.viewParams2}" />
+            <g:set var="viewParams" value="${template.viewParams}" />
+
             <div class="row">
                 <div id="ct-image-span" class="col-sm-6">
                     <div id="ct-image-well" class="panel panel-default">
@@ -78,7 +80,7 @@
                                                        style="margin-bottom: 0; height: 34px;"
                                                        placeholder="${message(code: 'default.input.keywordSearch.placeholder', default: "Search by keyword")}">
                                             </div>
-                                            <g:each var="cat" in="${wsParams.categories}" status="i">
+                                            <g:each var="cat" in="${wsParams?.categories}" status="i">
                                                 <div class="btn-group category-filter">
                                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-idx="$i">${cat.name} <span class="caret"></span></button>
                                                     <ul class="dropdown-menu">
@@ -117,7 +119,7 @@
                                             <g:set var="animalInfos"
                                                    value="${wsParams.animals}"/>
                                             <g:render template="/transcribe/wildlifeSpotterWidget"
-                                                      model="${[imageInfos: animalInfos]}"/>
+                                                      model="${[imageInfos: animalInfos, viewParams: viewParams]}"/>
                                         </div>
                                     </div>
                                 </div>
@@ -220,29 +222,57 @@
         </div>
 
         <script id="status-detail-list-template" type="text/x-mustache-template">
-            <ul class="status_detail_list">
+            <table class="table table-condensed">
+                <tr style="border-top: 0;">
+                    <th class="col-md-8" style="border-top: 0;">Species Name</th>
+                <g:if test="${AutoValidationType.fromString(viewParams.autoValidationType as String) == AutoValidationType.speciesWithCount}">
+                    <th class="col-md-2" style="border-top: 0;">Animal Count</th>
+                </g:if>
+                    <th class="col-md-2" style="border-top: 0;">Actions</th>
+                </tr>
                 {{#selectedAnimals}}
-                <li data-item-index="{{index}}">
-                    <div>
-                        <div class="classificationRow">
-                            <div class="animalName">{{name}}</div>
-                            <button type="button" class="btn btn-mini btn-default animalDelete pull-right" tabindex="-1"><i aria-hidden="true" class="fa fa-close"></i><span class="sr-only">Delete selection</span></button>
-                            <span class="animalNum pull-right">
-                                <select tabindex="-1" name="numAnimals" class="numAnimals form-control">
-                                    {{#options}}
-                                    <option value="{{val}}" {{selected}}>{{val}}</option>
-                                    {{/options}}
-                                </select>
-                            </span>
-                            <button type="button" aria-expanded="false" class="btn btn-link saveCommentButton pull-right" tabindex="-1" style="display:none;">Save Comment</button>
-                            <button type="button" aria-expanded="false" class="btn btn-link editCommentButton pull-right" tabindex="-1">Add Comment</button>
-                        </div>
+                <tr data-item-index="{{index}}">
+                    <td class="classificationRow col-md-8" style="border-top: 0;">
+                        <div class="animalName">{{name}}</div>
                         <div class="classificationComments">{{comment}}</div>
-                        <div class="editClassificationComments" style="display: none;"><label class="sr-only">Comment on the {{name}} you found</label><textarea id="{{index}}-comment" class="form-control" rows="1">{{comment}}</textarea></div>
-                    </div>
-                </li>
+                        <div class="editClassificationComments" style="display: none;">
+                            <label class="sr-only">Comment on the {{name}} you found</label>
+                            <textarea id="{{index}}-comment" class="form-control" rows="1">{{comment}}</textarea>
+                            <button type="button" aria-expanded="false" class="btn btn-default saveCommentButton pull-right" tabindex="-1" style="display:none;">Save</button>
+                        </div>
+                        <g:if test="${AutoValidationType.fromString(viewParams.autoValidationType as String) == AutoValidationType.speciesOnly}">
+                            <input type="hidden" name="numAnimals" data-validate-type="speciesOnly" data-default="{{curval}}" value="{{curval}}">
+                        </g:if>
+                    </td>
+                    <g:if test="${AutoValidationType.fromString(viewParams.autoValidationType as String) == AutoValidationType.speciesWithCount}">
+                    <td class="col-md-2" style="border-top: 0;">
+                        <span class="animalNum" style="padding-top: 5px; padding-right: 10px;">
+                            <input type="number"
+                                   name="numAnimals"
+                                   min="0" max="100"
+                                   data-default="{{curval}}"
+                                   data-validate-type="speciesWithCount"
+                                   value="{{curval}}"
+                                   class="form-control numAnimals"
+                                   tabindex="-1"/>
+                        </span>
+                    </td>
+                    </g:if>
+                    <td class="col-md-2" style="border-top: 0;">
+                        <button type="button"
+                                class="btn btn-default btn-xs editCommentButton"
+                                title="Add a comment">
+                            <i class="fa fa-commenting" tabindex="-1"></i>
+                            <span class="sr-only">Add a comment</span>
+                        </button>
+                        <button type="button" class="btn btn-xs btn-default animalDelete" title="Delete selection" tabindex="-1">
+                            <i aria-hidden="true" class="fa fa-trash"></i>
+                            <span class="sr-only">Delete selection</span>
+                        </button>
+                    </td>
+                </tr>
                 {{/selectedAnimals}}
-            </ul>
+            </table>
         </script>
 
         <script id="input-template" type="text/x-mustache-template">
@@ -252,7 +282,13 @@
         <script id="detail-template" type="text/x-mustache-template">
             <div class="detail-animal" >
                 <div id="ct-full-image-carousel" data-interval="0" class="carousel slide" data-item-index="{{itemIndex}}">
-                    <span class="ws-selector ws-selected ws-selected-large {{animal.selected}}" data-container="body" aria-selected="{{animal.isSelected}}" title="${g.message(code: 'wildlifespotter.widget.badge.title', args: ['{{animal.vernacularName}}'])}"><i class="fa fa-check"></i></span>
+                    <span class="ws-selector ws-selected ws-selected-large {{animal.selected}}"
+                          data-container="body"
+                          aria-selected="{{animal.isSelected}}"
+                          data-validation-type="${viewParams.autoValidationType}"
+                          title="${g.message(code: 'wildlifespotter.widget.badge.title', args: ['{{animal.vernacularName}}'])}">
+                        <i class="fa fa-check"></i>
+                    </span>
                     <span class="ws-full-image-carousel-close">&times;</span>
                     <ol class="carousel-indicators">
                         {{#animal.images}}
@@ -263,7 +299,6 @@
                         {{#animal.images}}
                         <div class="item {{active}}">
                             <cl:sizedImage prefix="wildlifespotter" name="{{hash}}" width="804" height="550" format="jpg" alt="{{animal.vernacularName}}" template="true"/>
-                            %{--<img src="{{url}}" />--}%
                         </div>
                         {{/animal.images}}
                     </div>
diff --git a/src/main/groovy/au/org/ala/volunteer/AutoValidationType.groovy b/src/main/groovy/au/org/ala/volunteer/AutoValidationType.groovy
new file mode 100644
index 00000000..a3f95805
--- /dev/null
+++ b/src/main/groovy/au/org/ala/volunteer/AutoValidationType.groovy
@@ -0,0 +1,36 @@
+package au.org.ala.volunteer
+
+/**
+ * AutoValidationType is a set of allowed options when system validating wildlife spotter expeditions.
+ */
+enum AutoValidationType {
+    speciesOnly("Validate on Species only"),
+    speciesWithCount("Validate on Species and count")
+
+    def label
+
+    AutoValidationType(String label) {
+        this.label = label
+    }
+
+    /**
+     * Returns the default validation type.
+     * @return the default validation type.
+     */
+    static AutoValidationType getDefault() {
+        speciesWithCount
+    }
+
+    /**
+     * Translates an enum object from the string value. Returns the correlating validation type.
+     * @param validationType the validation type in string form.
+     * @return the validation type or default if not known.
+     */
+    static AutoValidationType fromString(String validationType) {
+        if (validationType) {
+            validationType as AutoValidationType
+        } else {
+            getDefault()
+        }
+    }
+}
\ No newline at end of file