diff --git a/grails-app/assets/stylesheets/digivol-custom.css b/grails-app/assets/stylesheets/digivol-custom.css
index 30982ab07..9b7073d4c 100644
--- a/grails-app/assets/stylesheets/digivol-custom.css
+++ b/grails-app/assets/stylesheets/digivol-custom.css
@@ -496,3 +496,40 @@ a.fieldHelp {
     white-space: normal;
 }
 
+/* Labels */
+
+.label-base {
+    background-color: #777;
+}
+
+.label-green {
+    background-color: #5cb85c;
+}
+
+.label-red {
+    background-color: #d9534f;
+}
+
+.label-yellow {
+    background-color: #f0ad4e;
+}
+
+.label-blue {
+    background-color: #337ab7;
+}
+
+.label-lightblue {
+    background-color: #3498db;
+}
+
+.label-orange {
+    background-color: #e67e22;
+}
+
+.label-purple {
+    background-color: #9b59b6;
+}
+
+.label-darkgrey {
+    background-color: #4b5359;
+}
\ No newline at end of file
diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
index 37170566b..bb7cd0efd 100644
--- a/grails-app/conf/application.yml
+++ b/grails-app/conf/application.yml
@@ -1,4 +1,5 @@
 ---
+
 grails:
     profile: web
     codegen:
diff --git a/grails-app/controllers/au/org/ala/volunteer/AdminController.groovy b/grails-app/controllers/au/org/ala/volunteer/AdminController.groovy
index f521f302b..4581b0432 100644
--- a/grails-app/controllers/au/org/ala/volunteer/AdminController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/AdminController.groovy
@@ -742,6 +742,11 @@ class AdminController {
         }
     }
 
+    /**
+     * @deprecated
+     * @see {@link ReportRequestService#projectSummaryReport()}
+     * @return
+     */
     def projectSummaryReport() {
         if (!checkAdminAccess(true)) {
             render(view: '/notPermitted')
diff --git a/grails-app/controllers/au/org/ala/volunteer/LabelController.groovy b/grails-app/controllers/au/org/ala/volunteer/LabelController.groovy
index 05be2f6ba..1f476eaac 100644
--- a/grails-app/controllers/au/org/ala/volunteer/LabelController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/LabelController.groovy
@@ -1,100 +1,305 @@
 package au.org.ala.volunteer
 
+import grails.converters.JSON
 import grails.gorm.transactions.Transactional
 
 import static org.springframework.http.HttpStatus.*
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND
 
 class LabelController {
 
-    static allowedMethods = [save: "POST", update: "PUT", delete: "POST"]
+    static allowedMethods = [saveNewLabel: "POST", updateCategory: "POST", saveCategory: "POST",
+                             saveLabel: "POST", deleteCategory: "POST"]
 
     def userService
+    def labelAdminService
 
-    def index(Integer max) {
+    /**
+     * Index page for Label/Tag admin
+     */
+    def index() {
         if (userService.isAdmin()) {
-            params.max = Math.min(max ?: 25, 100)
-            respond Label.list(params), model: [labelInstanceCount: Label.count()]
+            def labelCategories = LabelCategory.list(sort: 'name', order: 'asc')
+            render(view: 'index', model: [labelCategories: labelCategories, labelInstanceCount: Label.count()])
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
+
+    def editCategory() {
+        if (userService.isAdmin()) {
+            def categoryId = params.long('id')
+            def category = LabelCategory.get(categoryId)
+            if (!category) {
+                log.debug("No category found,  redirecting back to index.")
+                flash.message = message(code: 'default.not.found.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), params.long('id')]) as String
+                redirect(action: "index")
+            } else {
+                log.debug("Edit category: ${category.name}")
+                final def loadedDefaultLabels = grailsApplication.config.getProperty("bvp.labels.ensureDefault", Boolean, false)
+                render(view: 'editCategory', model: [labelCategory: category, categoryList: LabelCategory.list(), loadedDefaultLabels: loadedDefaultLabels])
+            }
         } else {
             render(view: '/notPermitted')
         }
     }
 
     @Transactional
-    def save(Label labelInstance) {
+    def updateCategory() {
         if (userService.isAdmin()) {
+            def categoryId = params.long('categoryId')
+            def category = LabelCategory.get(categoryId)
+            if (!category) {
+                flash.message = message(code: 'default.not.found.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), params.long('id')]) as String
+                redirect(action: "index")
+            } else {
+                if (!category.isDefault) {
+                    def name = params.get('name')?.toString()
+                    if (!name) {
+                        flash.message = message(code: 'default.not.updated.message',
+                                args: [message(code: 'default.label.category.label', default: 'Category'), category.name]) as String
+                        redirect(action: "index")
+                        return
+                    }
+                    category.name = name
+                }
 
-            if (labelInstance == null) {
-                notFound()
-                return
+                category.labelColour = params.get('labelColour')
+                category.updatedDate = new Date()
+                category.save(flush: true, failOnError: true)
+
+                flash.message = message(code: 'default.updated.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), category.name]) as String
+                redirect(view: 'index')
             }
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
 
-            if (labelInstance.hasErrors()) {
-                respond labelInstance.errors, view: 'index'
-                return
+    def createCategory() {
+        if (userService.isAdmin()) {
+            render(view: 'createCategory')
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
+
+    @Transactional
+    def saveCategory() {
+        if (userService.isAdmin()) {
+            LabelCategory newCategory = new LabelCategory()
+            def categoryName = params.get("name") as String
+            if (!categoryName) {
+                newCategory.errors.rejectValue("name", "label.category.name.notnull",
+                        "A category name must be provided.")
             }
+            newCategory.name = categoryName
+            newCategory.isDefault = false
+            newCategory.updatedDate = new Date()
+            newCategory.createdBy = userService.currentUser.id
 
-            labelInstance.save(flush: true, failOnError: true)
+            def catCheck = LabelCategory.findByName(categoryName)
+            if (catCheck) {
+                // Name already exists, cannot create it.
+                newCategory.errors.rejectValue("name", "label.name.unique",
+                        "Category name must be unique.")
+            }
 
-            request.withFormat {
-                form multipartForm {
-                    flash.message = message(code: 'default.created.message', args: [message(code: 'label.label', default: 'Label'), labelInstance.value])
-                    redirect action: 'index'
-                }
-                '*' { respond labelInstance, [status: CREATED] }
+            if (newCategory.errors.hasErrors()) {
+                log.debug("LabelCategory Errors: ${newCategory.errors}")
+                render(view: 'createCategory', model: [labelCategory: newCategory])
+                return
+            } else {
+                newCategory.save(flush: true, failOnError: true)
+                flash.message = message(code: 'default.created.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), newCategory.name]) as String
+                redirect(view: 'index')
             }
         } else {
-            render status: 403
+            render(view: '/notPermitted')
         }
     }
 
     @Transactional
-    def update(Label labelInstance) {
+    def saveNewLabel() {
+        log.debug("Saving new label")
         if (userService.isAdmin()) {
-
-            if (labelInstance == null) {
-                notFound()
+            LabelCategory labelCategory = LabelCategory.get(params.long('categoryId'))
+            if (!labelCategory) {
+                flash.message = message(code: 'default.not.found.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), params.long('categoryId')]) as String
+                render(view: 'index')
                 return
             }
 
-            if (labelInstance.hasErrors()) {
-                respond labelInstance.errors, view: 'index'
+            String value = params.get('value') as String
+            if (!value) {
+                flash.message = message(code: 'label.name.notnull') as String
+                redirect(view: 'editCategory', params: [id: labelCategory.id])
                 return
             }
 
-            labelInstance.save(flush: true, failOnError: true)
+            Label label = new Label()
+            label.category = labelCategory
+            label.value = value
+            label.isDefault = false
+            label.updatedDate = new Date()
+            label.createdBy = userService.currentUser.id
+            label.save(flush: true, failOnError: true)
 
-            request.withFormat {
-                form multipartForm {
-                    flash.message = message(code: 'default.updated.message', args: [message(code: 'Label.label', default: 'Label'), labelInstance.value])
-                    redirect action: 'index'
-                }
-                '*' { respond labelInstance, [status: OK] }
+            flash.message = message(code: 'default.created.message',
+                    args: [message(code: 'default.label.label', default: 'Tag'), label.value]) as String
+            redirect(action: 'editCategory', params: [id: labelCategory.id])
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
+
+    @Transactional
+    def saveLabel() {
+        log.debug("Saving label")
+        if (userService.isAdmin()) {
+            log.debug("id: ${params.long('id')}, value: ${params.get('labelName')}")
+            def label = Label.get(params.long('id'))
+            log.debug("Label: ${label}")
+            if (label == null) {
+                notFound()
+                return
             }
+
+            label.value = params.get('labelName')
+            label.updatedDate = new Date()
+            label.save(flush: true, failOnError: true)
+            log.debug("label saved: ${label}")
+            render([message: "Successfully updated label '${label.value}'"] as JSON)
         } else {
-            render status: 403
+            response.status = SC_FORBIDDEN
+            render([message: "Access forbidden."] as JSON)
         }
     }
 
     @Transactional
-    def delete(Label labelInstance) {
+    def deleteLabel() {
         log.debug("Deleting label id: ${params.id}")
         if (userService.isAdmin()) {
-            if (labelInstance == null) {
+            Label labelInstance = Label.get(params.long('id'))
+            if (!labelInstance) {
                 notFound()
                 return
             }
 
+            if (labelAdminService.isLabelInUse(labelInstance)) {
+                flash.message = message(code: 'label.delete.notallowed', args: [labelInstance.value]) as String
+                redirect(action: 'editCategory', params: [id: labelInstance.category.id])
+                return
+            }
+
             labelInstance.delete(flush: true, failOnError: true)
 
-            request.withFormat {
-                form multipartForm {
-                    flash.message = message(code: 'default.deleted.message', args: [message(code: 'Label.label', default: 'Label'), labelInstance.value])
-                    redirect action: "index", method: "GET"
-                }
-                '*' { render status: NO_CONTENT }
+            flash.message = message(code: 'default.deleted.message',
+                    args: [message(code: 'default.label.label', default: 'Tag'), labelInstance.value]) as String
+            redirect(action: 'editCategory', params: [id: labelInstance.category.id])
+
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
+
+    @Transactional
+    def deleteCategory() {
+        log.debug("Deleting category.")
+        if (userService.isAdmin()) {
+            LabelCategory labelCategory = LabelCategory.get(params.long('id'))
+            if (!labelCategory) {
+                flash.message = message(code: 'default.not.found.message',
+                        args: [message(code: 'default.label.category.label', default: 'Category'), params.long('id')]) as String
+                redirect(action: "index")
+                return
             }
+            def name = labelCategory.name
+            // Delete category
+            if (labelCategory.isDefault) {
+                // Shouldn't allow deletion due to system default category
+                flash.message = message(code: 'label.category.delete.notallowed', args: [labelCategory.name]) as String
+                redirect(action: "index")
+                return
+            }
+
+            try {
+                labelCategory.delete(flush: true, failOnError: true)
+            } catch (Exception ex) {
+                flash.message = message(code: 'label.category.delete.notallowed', args: [labelCategory.name]) as String
+                redirect(action: "index")
+                return
+            }
+
+            flash.message = message(code: 'default.deleted.message',
+                    args: [message(code: 'default.label.category.label', default: 'Category'), name]) as String
+            redirect(action: 'index')
         } else {
-            render status: 403
+            render(view: '/notPermitted')
+        }
+    }
+
+    @Transactional
+    def changeCategory() {
+        log.debug("Changing label category.")
+        if (userService.isAdmin()) {
+            Label label = Label.get(params.long('labelId'))
+            LabelCategory labelCategory = LabelCategory.get(params.long('newCategory'))
+            if (!label || !labelCategory) {
+                flash.message = "Unable to modify ${message(code: 'default.label.label', default: 'Tag')}, missing parameters: label or category."
+                redirect(action: "index")
+                return
+            }
+
+            // Check if new category already has tag of this value
+            def labelCheck = labelCategory.labels.find {
+                it.value == label.value
+            }
+
+            if (labelCheck) {
+                // One already exists. Return an error.
+                flash.message = "Unable to modify ${message(code: 'default.label.label', default: 'Tag')}, new category already has a label with the same name."
+                redirect(action: "editCategory", params: [id: label.category.id])
+                return
+            }
+
+            label.category = labelCategory
+            label.updatedDate = new Date()
+            label.save(flush: true, failOnError: true)
+
+            flash.message = message(code: 'default.updated.message',
+                    args: [message(code: 'default.label.label', default: 'Tag'), label.value]) as String
+            redirect(action: 'editCategory', params: [id: labelCategory.id])
+        } else {
+            render(view: '/notPermitted')
+        }
+    }
+
+    def labelUsage() {
+        if (userService.isAdmin()) {
+            def labelId = params.long('id')
+
+            def label = Label.get(labelId)
+            if (!label) {
+                // return emtpy map
+                response.status = SC_NOT_FOUND
+                render([:] as JSON)
+                return
+            }
+
+            def result = labelAdminService.getLabelUsage(label)
+            if (result.size() > 0) {
+                render(result as JSON)
+            } else {
+                response.status = SC_NOT_FOUND
+                render([:] as JSON)
+            }
         }
     }
 
diff --git a/grails-app/controllers/au/org/ala/volunteer/LandingPageAdminController.groovy b/grails-app/controllers/au/org/ala/volunteer/LandingPageAdminController.groovy
index c62c3f349..12c60c24e 100644
--- a/grails-app/controllers/au/org/ala/volunteer/LandingPageAdminController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/LandingPageAdminController.groovy
@@ -41,15 +41,19 @@ class LandingPageAdminController {
     }
 
     def editSelections(LandingPage landingPageInstance) {
-        final labelCats = Label.withCriteria { projections { distinct 'category' } }
+        //final labelCats = Label.withCriteria { projections { distinct 'category' } }
+        final labelCats = LabelCategory.list(sort: 'name').collect { it.name }
         ['landingPageInstance': landingPageInstance, 'labels': Label.listOrderByCategory(), 'labelCats': labelCats]
     }
 
     def filterLabelCategory () {
+        log.info("Filtering by category: ${params['category']}")
         def list
         def category = params['category'] ?: null
         if (category != 'all') {
-            list = Label.findAllByCategory(category)
+            //list = Label.findAllByCategory(category)
+            LabelCategory labelCategory = LabelCategory.findByName(category as String)
+            list = Label.findAllByCategory(labelCategory)
         } else {
             list = Label.listOrderByValue()
         }
@@ -58,19 +62,23 @@ class LandingPageAdminController {
 
     @Transactional
     def saveProjectLabels(LandingPage landingPageInstance) {
+        log.debug("landing page: ${landingPageInstance}")
 
         if (landingPageInstance.hasErrors()) {
             chain action: "edit", model: ['landingPage': landingPageInstance]
         } else {
-
             def newLabel = Label.findById(params['tag'])
-            if (!landingPageInstance.label) {
-                landingPageInstance.label = new ArrayList<Label>()
-            }
+            log.debug("New label: ${newLabel}")
 
-            landingPageInstance.label.add(newLabel)
-            landingPageInstance.save flush: true
+            if (newLabel) {
+                landingPageInstance.label.add(newLabel)
+                log.debug("${landingPageInstance.label}")
+                landingPageInstance.save(flush: true, failOnError: true)
+            } else {
+                log.warn("Attempted to add a non-existent tag: ${params['tag']}")
+            }
         }
+
         redirect(action: "editSelections", params: ['id': landingPageInstance.id])
     }
 
diff --git a/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy b/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
index 0d63e346f..bda02b3b9 100644
--- a/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/ProjectController.groovy
@@ -535,11 +535,12 @@ class ProjectController {
 
     def getGeneralProjectLists(Project project) {
         final insts = (userService.isSiteAdmin() ? Institution.listApproved([sort: 'name', order: 'asc']) : userService.getAdminInstitutionList())
-        final labelCats = Label.withCriteria { projections { distinct 'category' } }
+        //final labelCats = Label.withCriteria { projections { distinct 'category' } }
+        final labelCats = LabelCategory.list(sort: 'name').collect { it.name }
         final templates = templateService.getTemplatesForProject(project, userService.isSiteAdmin())
 
         final sortedLabels = project.labels.sort { a,b ->
-            def x = a.category?.compareTo(b.category)
+            def x = a.category.name?.compareTo(b.category.name)
             return x == 0 ? a.value <=> b.value : x
         }
 
@@ -1091,6 +1092,11 @@ class ProjectController {
         render status: 204
     }
 
+    /**
+     * Search for labels
+     * @param project the project to search
+     * @return
+     */
     def newLabels(Project project) {
         if (!projectService.isAdminForProject(project)) {
             render(view: '/notPermitted')
@@ -1106,7 +1112,9 @@ class ProjectController {
             def existingIds = existing*.id.toList()
             labels = Label.withCriteria {
                 or {
-                    ilike 'category', ilikeTerm
+                    category {
+                        ilike('name', ilikeTerm)
+                    }
                     ilike 'value', ilikeTerm
                 }
                 not {
@@ -1114,10 +1122,25 @@ class ProjectController {
                 }
             }
         } else {
-            labels = Label.findAllByCategoryIlikeOrValueIlike(ilikeTerm, ilikeTerm)
+            labels = Label.createCriteria().list {
+                or {
+                    category {
+                        ilike('name', ilikeTerm)
+                    }
+                    ilike 'value', ilikeTerm
+                }
+            }
+        }
+
+        def result = []
+        labels.each { Label label ->
+            Map labelInfo = [id: label.id, value: label.value]
+            Map labelCategory = [id: label.category.id, name: label.category.name, labelColour: label.category.labelColour]
+            labelInfo.put("category", labelCategory)
+            result.add(labelInfo)
         }
 
-        render labels as JSON
+        render result as JSON
     }
 
     /**
diff --git a/grails-app/controllers/au/org/ala/volunteer/ReportController.groovy b/grails-app/controllers/au/org/ala/volunteer/ReportController.groovy
new file mode 100644
index 000000000..172c0466e
--- /dev/null
+++ b/grails-app/controllers/au/org/ala/volunteer/ReportController.groovy
@@ -0,0 +1,201 @@
+package au.org.ala.volunteer
+
+import grails.converters.JSON
+import grails.gorm.transactions.Transactional
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN
+
+class ReportController {
+
+    static final String DATE_FORMAT = "dd/MM/yyyy"
+
+
+    def userService
+    def reportRequestService
+
+    def index() {
+        redirect(action: 'reportHistory', params: params)
+    }
+
+    /**
+     *
+     * @return
+     */
+    def userReport() {
+        if (!userService.isAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+
+        def userLabelCategory = LabelCategory.findByName('user')
+        def userLabelList = Label.findAllByCategory(userLabelCategory)
+        LocalDate startDate = LocalDate.now().minusDays(7)
+        final DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DATE_FORMAT, Locale.ENGLISH);
+        String startDateStr = startDate.format(dtf);
+        String endDateStr = LocalDate.now().format(DateTimeFormatter.ofPattern(DATE_FORMAT, Locale.ENGLISH))
+
+        [userLabelList: userLabelList, defaultStartDate: startDateStr, defaultEndDate: endDateStr]
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Transactional
+    def requestUserReport() {
+        if (!userService.isAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+
+        def dateStart = params.get('dateStart')
+        def dateEnd = params.get('dateEnd')
+        def labelFilter = params.long('labelFilter')
+        def filterByLabel = Label.get(labelFilter)
+
+        if (!dateStart || !dateEnd) {
+            flash.message = message(code: 'default.invalid.parameter.message',
+                    args: ["Start and/or End Date"]) as String
+            redirect(action: 'userReport')
+            return
+        }
+
+        def newReport = new ReportRequest(requestUser: userService.currentUser,
+                reportName: ReportRequestService.REPORT_NAME_USER)
+        newReport.dateCreated = new Date()
+        newReport.reportParams = [dateStart: dateStart, dateEnd: dateEnd, labelFilter: (filterByLabel) ? filterByLabel.id : null]
+        newReport.save(flush: true, failOnError: true)
+
+        log.debug("Report requiest: user report, start date: ${dateStart}, end date: ${dateEnd}, labelFilter: [${filterByLabel}]")
+        redirect(action: 'userReport')
+    }
+
+    /**
+     *
+     * @return
+     */
+    def projectSummary() {
+        if (!userService.isInstitutionAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+
+        render(view: 'projectSummary')
+    }
+
+    /**
+     *
+     * @return
+     */
+    @Transactional
+    def requestProjectSummaryReport() {
+        if (!userService.isInstitutionAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+
+        def newReport = new ReportRequest(requestUser: userService.currentUser,
+                reportName: ReportRequestService.REPORT_NAME_PROJECT_SUMMARY)
+        newReport.dateCreated = new Date()
+        if (userService.isSiteAdmin()) {
+            newReport.reportParams = [userLevel: UserService.USER_LEVEL_ADMIN]
+        } else if (userService.isInstitutionAdmin() && !userService.isSiteAdmin()) {
+            newReport.reportParams = [userLevel: UserService.USER_LEVEL_INSTITUTION]
+        } else {
+            newReport.reportParams = [userLevel: UserService.USER_LEVEL_USER]
+        }
+        newReport.save(flush: true, failOnError: true)
+
+        log.debug("Report requiest: project summary report")
+        redirect(action: 'projectSummary')
+    }
+
+    /**
+     *
+     * @return
+     */
+    def reportHistory() {
+        if (!userService.isInstitutionAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+        log.debug("page params: ${params}")
+        def sortColumn = params.sort as String ?: 'dateCompleted'
+        def sortOrder = params.order as String ?: 'desc'
+        def max = Math.min(params.max ? params.int('max') : 25, 100)
+        def offset = (params.offset ? params.int('offset') : 0)
+
+        log.debug("Sort: ${sortColumn}, order: ${sortOrder}")
+
+        def queryParams = [sortColumn: sortColumn,
+                           sortOrder: sortOrder,
+                           max: max,
+                           offset: offset,
+                           statusFilter: !userService.isAdmin() ? null : params.statusFilter,
+                           reportFilter: params.reportFilter]
+        if (!userService.isAdmin()) {
+            queryParams.userFilter = userService.currentUser
+        }
+
+        // If not a site admin, get only their reports and only the ones that still have the file on disk.
+        def reportResults = reportRequestService.getReportsForAdmin(queryParams)
+        def reportList = reportResults.reportList
+        def reportCount = reportResults.count
+
+        def reportListComplete = []
+        reportList.each { report ->
+            def row = [:]
+            def filename = reportRequestService.checkReportFile(report)
+            def filepath = (filename) ? reportRequestService.getReportUrlPrefix() + filename : ""
+            row.report = report
+            row.filepath = filepath
+            reportListComplete.add(row)
+        }
+
+        //def reportFilterList = reportList.collect{ it.reportName }.unique()
+        def reportFilterList = reportRequestService.getReportNames()
+
+        [reportList: reportListComplete, reportCount: reportCount, reportFilterList: reportFilterList]
+    }
+
+    /**
+     *
+     * @return
+     */
+    def getReports() {
+        if (!userService.isInstitutionAdmin()) {
+            render status: SC_FORBIDDEN
+            return
+        }
+
+        log.debug("Report list...")
+        def reportName = params.get('reportName') as String
+        def user = userService.getCurrentUser()
+        def reportList
+
+        if (reportName == "all") {
+            reportList = ReportRequest.listOrderByDateCreated(order: 'desc')
+        } else if (reportName) {
+            reportList = ReportRequest.findAllByRequestUserAndReportName(user, reportName)
+        } else {
+            reportList = []
+        }
+        log.debug("Found ${reportList.size()} reports.")
+
+        def results = []
+        reportList.each { report ->
+            def filename = reportRequestService.checkReportFile(report)
+
+            def out = [dateCreated  : report.dateCreated.format(DateConstants.DATE_TIME_FORMAT),
+                       requestUser  : [id: report.requestUser.id, displayName: report.requestUser.displayName],
+                       dateCompleted: report.dateCompleted?.format(DateConstants.DATE_TIME_FORMAT),
+                       dateArchived : report.dateArchived?.format(DateConstants.DATE_TIME_FORMAT),
+                       params       : report.reportParams,
+                       filepath     : (filename) ? reportRequestService.getReportUrlPrefix() + filename : ""]
+            results.add(out)
+        }
+
+        render results as JSON
+    }
+}
diff --git a/grails-app/controllers/au/org/ala/volunteer/UserController.groovy b/grails-app/controllers/au/org/ala/volunteer/UserController.groovy
index 167f5f251..ec8e1e41b 100644
--- a/grails-app/controllers/au/org/ala/volunteer/UserController.groovy
+++ b/grails-app/controllers/au/org/ala/volunteer/UserController.groovy
@@ -7,6 +7,8 @@ import org.elasticsearch.action.search.SearchResponse
 import org.elasticsearch.action.search.SearchType
 import org.springframework.dao.DataIntegrityViolationException
 
+import static org.springframework.http.HttpStatus.NO_CONTENT
+
 class UserController {
 
     static allowedMethods = [save: "POST", update: "POST", delete: "POST"]
@@ -74,7 +76,7 @@ class UserController {
 }'''
 
     def index() {
-        redirect(action: "list", params: params)
+        redirect(action: "adminList", params: params)
     }
 
     def myStats() {
@@ -151,45 +153,61 @@ class UserController {
             render(view: '/notPermitted')
             return
         }
-        params.max = Math.min(params.max ? params.int('max') : 10, 100)
+
+        []
+    }
+
+    def adminList() {
+        if (!userService.isAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
+        params.max = Math.min(params.max ? params.int('max') : 25, 100)
         if (!params.sort) {
             // set default sort and order
-            params.sort = params.sort ? params.sort : "transcribedCount"
-            params.order = "desc"
+            params.sort = params.sort ? params.sort : "lastName" //"transcribedCount"
+            params.order = "asc"
         }
 
         def userList
         def totalCount = 0
 
-        if (params.q) {
-            // TODO Migrate away from database email addresses
-            def c = User.createCriteria()
-            userList = c.list(params) {
+        def closure = {
+            if (params.q) {
                 or {
                     ilike("displayName", '%' + params.q + '%')
                     ilike("email", '%' + params.q + '%')
                 }
             }
-
-            def cc = User.createCriteria()
-            def countResult = cc.list() {
-                or {
-                    ilike("displayName", '%' + params.q + '%')
-                    ilike("email", '%' + params.q + '%')
-                }
-                projections {
-                    countDistinct('id')
+            if (params.labelFilter) {
+                and {
+                    labels {
+                        eq("id", params.long('labelFilter'))
+                    }
                 }
-            } as List
-            // log.info("totalcount: ${totalCount}")
-            totalCount = countResult.first()
-        } else {
-            userList = User.list(params)
-            totalCount = User.count()
+            }
         }
 
+        userList = User.createCriteria().list(params) {
+            closure.delegate = delegate
+            closure()
+        } as List
+
+        def countResult = User.createCriteria().get {
+            closure.delegate = delegate
+            closure()
+            projections {
+                countDistinct('id')
+            }
+        }
+        totalCount = countResult
+
         def currentUser = userService.currentUserId
-        [userInstanceList: userList, userInstanceTotal: totalCount, currentUser: currentUser]
+
+        LabelCategory userCategory = LabelCategory.findByName('user')
+        def userLabels = Label.findAllByCategory(userCategory)
+
+        [userInstanceList: userList, userInstanceTotal: totalCount, currentUser: currentUser, userLabels: userLabels]
     }
 
     /**
@@ -305,6 +323,11 @@ class UserController {
         respond(result)
     }
 
+    /**
+     * User notebook
+     * @param user
+     * @return
+     */
     def show(User user) {
         def currentUser = userService.currentUserId
 
@@ -368,8 +391,49 @@ class UserController {
         }
 
         def roles = UserRole.findAllByUser(user)
+        def category = LabelCategory.findByName('user')
+        def userLabelList = Label.findAllByCategory(category)
+
+        return [userInstance: user, roles: roles, userDetails: authService.getUserForUserId(user.getUserId()), userLabelList: userLabelList]
+    }
+
+    @Transactional
+    def addUserLabel(User user) {
+        if (!userService.isAdmin()) {
+            render(view: '/notPermitted')
+            return
+        }
 
-        return [userInstance: user, roles: roles, userDetails: authService.getUserForUserId(user.getUserId())]
+        def label = Label.findById(params['tag'])
+        if (!label) {
+            flash.message = message(code: 'default.not.found.message',
+                    args: [message(code: 'default.label.label', default: 'Tag'), params.id]) as String
+            redirect(action: "edit", params: [id: params.id])
+            return
+        }
+
+        user.labels.add(label)
+        user.save(flush: true, failOnError: true)
+
+        flash.message = message(code: 'user.label.added', args: [label.value]) as String
+        redirect(action: "edit", params: [id: params.id])
+    }
+
+    @Transactional
+    def deleteLabel () {
+        def userId = params['userId']
+        if (userId.isLong()) {
+            def user = User.findById(userId.toLong())
+            def labels = user.labels
+            def labelIdToRemove = params['selectedLabelId']
+            if (labelIdToRemove && labelIdToRemove.isLong()) {
+                user.labels = labels.grep {label ->
+                    label.id != labelIdToRemove.toLong()
+                }
+                user.save(flush: true)
+                render status: NO_CONTENT
+            }
+        }
     }
 
     @Transactional
diff --git a/grails-app/domain/au/org/ala/volunteer/Label.groovy b/grails-app/domain/au/org/ala/volunteer/Label.groovy
index 58cffa742..efe36bf7f 100644
--- a/grails-app/domain/au/org/ala/volunteer/Label.groovy
+++ b/grails-app/domain/au/org/ala/volunteer/Label.groovy
@@ -6,14 +6,23 @@ import groovy.transform.ToString
 class Label implements Serializable {
 
     Long id
-    String category
+    LabelCategory category
     String value
+    Boolean isDefault
+    Date updatedDate
+    Long createdBy
 
-    static belongsTo = [Project, LandingPage]
-    static hasMany = [projects: Project, landingPages: LandingPage]
+    static belongsTo = [User, Project, LandingPage, LabelCategory]
+    static hasMany = [userList: User, projects: Project, landingPages: LandingPage]
+
+    static mapping = {
+        isDefault defaultValue: false
+        updatedDate defaultValue: new Date()
+        createdBy defaultValue: 0L
+    }
 
     static constraints = {
-        category unique: 'value'
+        //category unique: 'value'
     }
 
     boolean equals(o) {
@@ -22,7 +31,7 @@ class Label implements Serializable {
 
         Label label = (Label) o
 
-        if (category != label.category) return false
+        if (category.name != label.category.name) return false
         if (value != label.value) return false
 
         return true
@@ -30,21 +39,20 @@ class Label implements Serializable {
 
     int hashCode() {
         int result
-        result = (category != null ? category.hashCode() : 0)
+        result = (category.name!= null ? category.name.hashCode() : 0)
         result = 31 * result + (value != null ? value.hashCode() : 0)
         return result
     }
 
     LinkedHashMap<String,Object> toMap() {
-        [id: id, category: category, value: value]
+        [id: id, category: category.name, value: value]
     }
 
-
     @Override
     public String toString() {
         return "Label{" +
                 "id=" + id +
-                ", category='" + category + '\'' +
+                ", category='" + category.name + '\'' +
                 ", value='" + value + '\'' +
                 '}';
     }
diff --git a/grails-app/domain/au/org/ala/volunteer/LabelCategory.groovy b/grails-app/domain/au/org/ala/volunteer/LabelCategory.groovy
new file mode 100644
index 000000000..c4c2f737d
--- /dev/null
+++ b/grails-app/domain/au/org/ala/volunteer/LabelCategory.groovy
@@ -0,0 +1,34 @@
+package au.org.ala.volunteer
+
+class LabelCategory {
+
+    Long id
+    String name
+    Boolean isDefault
+    String labelColour
+    Date updatedDate
+    Long createdBy
+
+    static hasMany = [labels: Label]
+
+    static constraints = {
+        name nullable: false
+        labelColour nullable: true
+        isDefault nullable: false
+        updatedDate nullable: false
+        createdBy nullable: false
+    }
+
+    static mapping = {
+        isDefault defaultValue: false
+        updatedDate defaultValue: new Date()
+        createdBy defaultValue: 0L
+    }
+
+    String toString() {
+        return """
+            LabelCategory: [id: ${id}, name: ${name}, isDefault: ${isDefault}, updatedDate: ${updatedDate}, 
+            createdBy: ${createdBy}]
+        """.stripIndent()
+    }
+}
diff --git a/grails-app/domain/au/org/ala/volunteer/ReportRequest.groovy b/grails-app/domain/au/org/ala/volunteer/ReportRequest.groovy
new file mode 100644
index 000000000..525a38a8f
--- /dev/null
+++ b/grails-app/domain/au/org/ala/volunteer/ReportRequest.groovy
@@ -0,0 +1,65 @@
+package au.org.ala.volunteer
+
+import net.kaleidos.hibernate.usertype.JsonbMapType
+
+class ReportRequest {
+
+    long id
+    Date dateCreated
+    String reportName
+    Date dateCompleted
+    Date dateArchived
+    Map reportParams
+
+    static belongsTo = [requestUser: User]
+
+    static mapping = {
+        requestUser index: 'report_queue_id_fk'
+        reportParams type: JsonbMapType
+    }
+
+    static constraints = {
+        dateCreated nullable: false
+        dateCompleted nullable: true
+        dateArchived nullable: true
+        reportParams nullable: true
+    }
+
+    /**
+     * Returns the current status of the report.
+     * @return One of three values depending on the status: Archived, Download or Pending.
+     */
+    def getStatus() {
+        if (this.dateArchived != null) return "Archived"
+        if (this.dateCompleted != null) return "Download"
+        return "Pending"
+    }
+
+    @Override
+    String toString() {
+        final output = """\
+            ReportRequest: {
+                id: [${id}],
+                dateCreated: [${dateCreated}],
+                requestUser: [${requestUser.displayName}],
+                reportName: [${reportName}],
+                dateCompleted: [${dateCompleted}],
+                dateArchived: [${dateArchived}]
+            }
+        """.stripIndent()
+        return output
+    }
+
+    String printReportParams() {
+        final output = """\
+            ReportRequest: {
+                id: [${id}],
+                reportName: [${reportName}],
+                dateCreated: [${dateCreated}],
+                dateArchived: [${dateArchived}],
+                reportParams: ${reportParams}
+            }
+        """.stripIndent()
+        return output
+    }
+}
diff --git a/grails-app/domain/au/org/ala/volunteer/User.groovy b/grails-app/domain/au/org/ala/volunteer/User.groovy
index e389827ab..d3b238e92 100644
--- a/grails-app/domain/au/org/ala/volunteer/User.groovy
+++ b/grails-app/domain/au/org/ala/volunteer/User.groovy
@@ -18,7 +18,7 @@ class User implements AsyncEntity<User> {
 
     static final String HASH_SUFFIX = "cuxnzuqkqasqkdatlanipquugmabvofh"
 
-    static hasMany = [userRoles:UserRole, achievementAwards: AchievementAward]
+    static hasMany = [labels: Label, userRoles: UserRole, achievementAwards: AchievementAward, reports: ReportRequest]
 
     static mapping = {
         table 'vp_user'
diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
index bbe5376cf..faf4ff3fc 100644
--- a/grails-app/i18n/messages.properties
+++ b/grails-app/i18n/messages.properties
@@ -22,14 +22,16 @@ default.boolean.false=False
 default.date.format=yyyy-MM-dd HH:mm:ss z
 default.number.format=0
 
-default.created.message={0} {1} created
-default.not.created.message={0} {1} could not be created
-default.updated.message={0} {1} updated
-default.deleted.message={0} {1} deleted
-default.not.deleted.message={0} {1} could not be deleted
-default.not.found.message={0} not found with id {1}
+default.created.message={0} {1} created.
+default.not.created.message={0} {1} could not be created.
+default.not.updated.message={0} ({1}) could not be updated.
+default.updated.message={0} ({1}) updated.
+default.deleted.message={0} ({1}) has been deleted.
+default.not.deleted.message={0} ({1}) could not be deleted.
+default.not.found.message={0} record with id {1} does not exist.
 default.optimistic.locking.failure=Another user has updated this {0} while you were editing
-default.not.permitted.message=You are not authorised to {0}
+default.not.permitted.message=You are not authorised to {0}.
+default.invalid.parameter.message={0} must be a valid value.
 
 default.application.name=DigiVol
 default.home.label=Home
@@ -69,9 +71,14 @@ typeMismatch.java.math.BigDecimal=Property {0} must be a valid number
 typeMismatch.java.math.BigInteger=Property {0} must be a valid number
 
 default.admin.label=Administration
+default.admin.entity.title.label=Manage {0}
 default.projects.label=Expeditions
 default.project.manage=Manage Expeditions
 
+default.label.label=Tag
+default.label.category.label=Category
+default.label.admin=Manage Tags
+
 achievementDescription.label=Badge
 
 achievement.awarded.message={0} awarded to {1}
@@ -108,6 +115,7 @@ action.review.label=Review
 action.validate.label=Validate
 action.transcribe.label=Transcribe
 user.label=Volunteer
+user.admin.label=User
 user.role.label=User Role
 task.externalIdentifier.label=Image ID
 forumTopic.label=Topic
@@ -115,6 +123,7 @@ moderator.label=Moderator
 user.email.label=Email
 user.roles.manage.label=Manage user roles
 user.details.edit.label=Edit user details
+user.label.added=Label {0} successfully added to User
 notebook.tabs.user.heading=User Settings
 notebook.tabs.forum.heading=Forum Activities
 notebook.tabs.validated.heading=Validated Tasks
@@ -273,7 +282,16 @@ institutionMessage.approve.label=Approve and Send
 institutionMessage.optout.title=Opt Out of Institution Communications
 
 user.displayName.label=Name
+user.id.label=ID
+user.lastName.label=Surname
+user.firstName.label=Given Name
 optout.dateCreated.label=Date Requested
 optout.deleted.message=Opt-out request for {0} has been removed.
 optout.created.message=Opt-out request for {0} has been created.
 
+label.admin.editCategory.label=Edit Category
+label.name.unique=Category name must be unique.
+label.category.name.notnull=A category name must be provided.
+label.name.notnull=A category name must be provided.
+label.category.delete.notallowed=Category ({0}) cannot be deleted.
+label.delete.notallowed=Label ({0}) cannot be deleted.
diff --git a/grails-app/init/au/org/ala/volunteer/BootStrap.groovy b/grails-app/init/au/org/ala/volunteer/BootStrap.groovy
index ef5641789..a186d76cd 100644
--- a/grails-app/init/au/org/ala/volunteer/BootStrap.groovy
+++ b/grails-app/init/au/org/ala/volunteer/BootStrap.groovy
@@ -316,19 +316,59 @@ class BootStrap {
         if (shouldInstall) {
             log.info("Installing default labels")
             final defaults = (JSONObject)JSON.parse(Resources.getResource('default-labels.json').newReader())
-            //final defaultsSet = defaults.keySet().collectEntries { [(it): defaults[it].toSet() ] }
-            final labels = Label.all // TODO scroll?
-            final labelSet = labels.toSet()
-            final newLabels = defaults.keySet().collect { k ->
-                final a = (JSONArray)defaults[k]
-                a.collect { new Label(category: k, value: it) }.findAll { !labelSet.contains(it) }
-            }.flatten()
-            log.info("Adding ${newLabels.size()} new labels")
-            if (newLabels) {
-                log.debug("Adding ${newLabels.join('\n')}")
+
+            // Check for categories then labels
+            def now = new Date()
+            defaults.keySet().each { k ->
+                def blah = LabelCategory.findByName(k as String)
+                if (!blah) {
+                    // Create category
+                    def zz = new Date()
+                    //log.info("Date initialised: ${zz}")
+                    def lc
+                    LabelCategory.withNewTransaction {
+                        lc = new LabelCategory(name: k)
+                        lc.isDefault = true
+                        lc.updatedDate = zz
+                        lc.createdBy = 0L
+                        lc.save(flush: true, failOnError: true)
+                        lc.refresh()
+                    }
+
+                    //log.info("New category: ${lc}")
+
+                    // Create new labels for new category
+                    final labelList = (JSONArray)defaults[k]
+                    labelList.each { val ->
+                        def label = new Label(value: val)
+                        label.isDefault = true
+                        label.category = lc
+                        label.updatedDate = zz
+                        label.createdBy = 0L
+                        //log.info("new label: ${label}")
+                        label.save(flush: true, failOnError: true)
+                    }
+                } else {
+                    blah.isDefault = true
+                    blah.save(flush: true, failOnError: true)
+                    final labelList = (JSONArray)defaults[k]
+                    labelList.each { val ->
+                        def label = Label.findByCategoryAndValue(blah, val as String)
+                        if (!label) {
+                            label = new Label(value: val)
+                            label.isDefault = true
+                            label.category = blah
+                            label.updatedDate = now
+                            label.createdBy = 0L
+                            //log.info("new label: ${label}")
+                            label.save(flush: true, failOnError: true)
+                        } else {
+                            label.isDefault = true
+                            label.save(flush: true, failOnError: true)
+                        }
+                    }
+                }
             }
-//            if (newLabels) Label.saveAll(newLabels)
-            if (newLabels) newLabels*.save()
         } else {
             log.debug("Skipping default labels")
         }
diff --git a/grails-app/jobs/au/org/ala/volunteer/DeleteOldReportsJob.groovy b/grails-app/jobs/au/org/ala/volunteer/DeleteOldReportsJob.groovy
new file mode 100644
index 000000000..dccf85fec
--- /dev/null
+++ b/grails-app/jobs/au/org/ala/volunteer/DeleteOldReportsJob.groovy
@@ -0,0 +1,29 @@
+package au.org.ala.volunteer
+
+import groovy.util.logging.Slf4j
+
+@Slf4j
+class DeleteOldReportsJob {
+
+    def reportRequestService
+
+    private static int SECONDS = 1000
+    private static int MINUTES = 60 * SECONDS
+    private static int HOURS = 60 * MINUTES
+    static concurrent = false
+
+    def description = "Background process to clean up old reports."
+
+    static triggers = {
+        // Testing trigger:
+        // simple repeatInterval: 2 * MINUTES
+        // Production trigger:
+        cron name: 'deleteOldReports', cronExpression: '0 15 4 * * ?' // 4:15am
+    }
+
+    def execute() {
+        log.info("Report cleanup process running.")
+        reportRequestService.cleanUpReports()
+        log.info("Report cleanup process completed.")
+    }
+}
diff --git a/grails-app/jobs/au/org/ala/volunteer/ProcessReportRequestJob.groovy b/grails-app/jobs/au/org/ala/volunteer/ProcessReportRequestJob.groovy
new file mode 100644
index 000000000..f24cf2f30
--- /dev/null
+++ b/grails-app/jobs/au/org/ala/volunteer/ProcessReportRequestJob.groovy
@@ -0,0 +1,27 @@
+package au.org.ala.volunteer
+
+import groovy.util.logging.Slf4j
+
+@Slf4j
+class ProcessReportRequestJob {
+
+    def reportRequestService
+
+    private static int SECONDS = 1000
+    private static int MINUTES = 60 * SECONDS
+    private static int HOURS = 60 * MINUTES
+
+    static concurrent = false
+
+    def description = "Background process waiting for report generation requests."
+
+    static triggers = {
+        simple repeatInterval: 1 * MINUTES // every 60 seconds
+    }
+
+    def execute() {
+        log.debug("Report Process running.")
+        reportRequestService.processPendingReportRequests()
+        log.debug("Report Process completed.")
+    }
+}
diff --git a/grails-app/services/au/org/ala/volunteer/FullTextIndexService.groovy b/grails-app/services/au/org/ala/volunteer/FullTextIndexService.groovy
index 46e705cac..ec8899b9b 100644
--- a/grails-app/services/au/org/ala/volunteer/FullTextIndexService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/FullTextIndexService.groovy
@@ -137,7 +137,7 @@ class FullTextIndexService {
                         templateName           : task.project.template?.name,
                         templateViewName       : task.project.template?.viewName,
                         labels                 : task.project.labels?.collect {
-                            [category: it.category, value: it.value]
+                            [category: it.category.name, value: it.value]
                         } ?: []
                 ],
                 transcriptions       : []
diff --git a/grails-app/services/au/org/ala/volunteer/LabelAdminService.groovy b/grails-app/services/au/org/ala/volunteer/LabelAdminService.groovy
new file mode 100644
index 000000000..976b9c7ca
--- /dev/null
+++ b/grails-app/services/au/org/ala/volunteer/LabelAdminService.groovy
@@ -0,0 +1,47 @@
+package au.org.ala.volunteer
+
+import grails.gorm.transactions.Transactional
+
+@Transactional
+class LabelAdminService {
+
+    /**
+     * Returns true if the label is in use by an entity.
+     * @param label
+     * @return true if the label is in use, false if not.
+     */
+    def isLabelInUse(Label label) {
+        if (!label) {
+            return false
+        }
+
+        if (label.projects?.size() > 0) return true
+        if (label.landingPages?.size() > 0) return true
+        // if (label.users?.size() > 0) return true
+
+        false
+    }
+
+    /**
+     * Retrieves the lists of entities that use the provided label.
+     * @param label
+     * @return a map containing individual lists for projects, landing pages and users.
+     */
+    def getLabelUsage(Label label) {
+        def entityList = [:]
+        def projectList = []
+        label.projects.each {project ->
+            projectList.add([id: project.id, name: project.name])
+        }
+        if (projectList.size() > 0) entityList.put("projects", projectList)
+
+        def pageList = []
+        label.landingPages.each {lPage ->
+            pageList.add([id: lPage.id, name: lPage.title])
+        }
+        if (pageList.size() > 0) entityList.put("landingPages", pageList)
+
+        // Todo Add users
+        entityList
+    }
+}
diff --git a/grails-app/services/au/org/ala/volunteer/ProjectService.groovy b/grails-app/services/au/org/ala/volunteer/ProjectService.groovy
index ed59d4ece..de40ab63d 100644
--- a/grails-app/services/au/org/ala/volunteer/ProjectService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/ProjectService.groovy
@@ -606,6 +606,31 @@ class ProjectService implements EventPublisher {
         else return query
     }
 
+    /**
+     * Retrieves a list of project summaries for all projects, unless an institution list is provided.
+     * Intended to be called for reporting purposes, not for UI consumption.
+     * @param institutionList the list of institutions if any
+     * @param countUser specify true to include user counts
+     * @return project summary list
+     */
+    def getAllProjectSummaries(def institutionList, boolean countUser) {
+        def conditions
+        if (institutionList && institutionList.size() > 0) {
+            def institutionAdminClause = [ACTIVE_ONLY, PROJECT.INSTITUTION_ID.in(institutionList*.id)]
+            conditions = [jOr(institutionAdminClause)]
+        } else {
+            conditions = []
+        }
+
+        return makeSummaryListFromConditions(conditions, null, null, null, null, null, null, null, null, countUser)
+    }
+
+    /**
+     * Retrieves a list of project summaries for the given querystring parameters.
+     * @param params querystring parameters such as statusFilter, activeFilter, search filter query, tag, sort etc
+     * @param countUser specify true to include user counts
+     * @return project summary list
+     */
     ProjectSummaryList getProjectSummaryList(GrailsParameterMap params, boolean countUser) {
 
         def statusFilterMode = ProjectStatusFilterType.fromString(params?.statusFilter)
diff --git a/grails-app/services/au/org/ala/volunteer/ReportRequestService.groovy b/grails-app/services/au/org/ala/volunteer/ReportRequestService.groovy
new file mode 100644
index 000000000..e1aa64a2a
--- /dev/null
+++ b/grails-app/services/au/org/ala/volunteer/ReportRequestService.groovy
@@ -0,0 +1,673 @@
+package au.org.ala.volunteer
+
+import com.google.common.base.Stopwatch
+import grails.gorm.transactions.Transactional
+import groovy.time.TimeCategory
+import groovy.util.logging.Slf4j
+
+import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.ZoneId
+
+import static grails.async.Promises.waitAll
+
+@Slf4j
+@Transactional
+class ReportRequestService {
+
+    def grailsApplication
+    def taskService
+    def authService
+    def settingsService
+    def projectService
+    def institutionService
+    def userService
+
+    static final String FILE_DIR_HOME = "reports"
+    static final String NO_DATA = "nodata"
+
+    static final String REPORT_NAME_USER = "user"
+    static final String REPORT_NAME_PROJECT_SUMMARY = "project-summary"
+
+    /**
+     * Returns the report directory name. See setting <code>images.home</code>
+     * @return the report directory name.
+     */
+    String getReportDirectory() {
+        return grailsApplication.config.getProperty('images.home', String) + "/" + FILE_DIR_HOME
+    }
+
+    /**
+     * Returns the reports filename. Generated from the reports name, ID and file extension (Defaults to csv).
+     * @param reportRequest the report request
+     * @param fileExtension the file extension, defaults to 'csv'.
+     * @return the generated filename.
+     */
+    String getReportFilename(ReportRequest reportRequest, String fileExtension = 'csv') {
+        return "${reportRequest.reportName}-${reportRequest.id}.${fileExtension}"
+    }
+
+    /**
+     * Returns the filepath for the report file.
+     * @param name the name of the file.
+     * @return the filepath.
+     */
+    String createFilePath(String name) {
+        return reportDirectory + "/" + name
+    }
+
+    private final Closure taggedUserReportColumnsDef = {
+        'user_id' { it[0] }
+        'display_name' { it[1] }
+        'email' { it[2] }
+        'hours_transcribed' { it[3] }
+        'task_institution' { it[4] }
+        'task_expedition' { it[5] }
+        'task_id' { it[6] }
+        'date_transcribed' { it[7] }
+    }
+
+    private final Closure allUserReportColumnsDef = {
+        'user_id' { it[0] }
+        'email' { it[1] }
+        'display_name' { it[2] }
+        'organisation' { it[3] }
+        'location' { it[4] }
+        'transcribed_count' { it[5] }
+        'validated_count' { it[6] }
+        'last_activity' { it[7] ?: NO_DATA }
+        'projects_count' { it[8] }
+        'volunteer_since' { it[9] }
+        'is_admin' { it[10] }
+        'is_institution_admin' { it[11] }
+        'is_ala_validator' { it[12] }
+        'is_validator' { it[13] }
+        'is_forum_mod' { it[14] }
+    }
+
+    private final Closure projectSummaryColumnsDef = {
+        'Expedition Id' { it.project.id }
+        'Expedtion Name' { it.project.featuredLabel }
+        'Institution' { it.project.institution ? it.project.institution.name : it.project.featuredOwner }
+        'Institution Id' { it.project.institution?.id ?: "" }
+        'Inactive' { it.project.inactive ? "t" : "f" }
+        'Template' { it.project.template?.name }
+        'Expedition Type' { it.project.projectType?.name ?: "<unknown>" }
+        'Tasks' { it.summary?.taskCount ?: 0 }
+        'Transcribed Tasks' { it.summary?.transcribedCount ?: 0 }
+        'Validated Tasks' { it.summary?.validatedCount ?: 0 }
+        'Percent Transcribed' { it.summary?.percentTranscribed }
+        'Percent Validated' { it.summary?.percentValidated }
+        'Active Transcribers' { it.summary?.transcriberCount }
+        'Active Validators' { it.summary?.validatorCount }
+        'Transcription Start Date' { dateStr(it.dates?.transcribeStartDate) }
+        'Transcription End Date' { dateStr(it.dates?.transcribeEndDate) }
+        'Time taken (Transcribe)' { daysBetween(it.dates?.transcribeStartDate, it.dates?.transcribeEndDate) }
+        'Validation Start Date' { dateStr(it.dates?.validateStartDate) }
+        'Validation End Date' { dateStr(it.dates?.validateEndDate) }
+        'Time taken (Validate)' { daysBetween(it.dates?.validateStartDate, it.dates?.validateEndDate) }
+    }
+
+    private final Closure dateStr = { Date d ->
+        def sdf = new SimpleDateFormat("yyyy-MM-dd")
+        if (d) {
+            return sdf.format(d)
+        }
+        return ""
+    }
+
+    private final Closure daysBetween = { Date d1, Date d2 ->
+        if (d1 && d2) {
+            return TimeCategory.minus(d2, d1).days
+        }
+        return ""
+    }
+
+    /**
+     * Job execute method, processing pending report generation requests
+     */
+    @Transactional
+    def processPendingReportRequests() {
+        log.debug("ReportRequestService: Process Pending Report Requests")
+        def dir = new File(reportDirectory)
+        if (!dir.exists()) {
+            dir.mkdirs()
+        }
+
+        def pendingReports = ReportRequest.findAllByDateCompletedIsNull(sort: "dateCreated", order: "asc")
+        // Get the first one only.
+        if (pendingReports.size() > 0) {
+            def report = pendingReports?.first()
+            if (report) {
+                log.info("Running Report: ${report.printReportParams()}")
+                report.dateCompleted = new Date()
+                report.save(flush: true, failOnError: true)
+
+                switch(report.reportName) {
+                    case REPORT_NAME_USER:
+                        log.debug("Loading User report")
+                        userReport(report)
+                        break
+                    case REPORT_NAME_PROJECT_SUMMARY:
+                        log.debug("Loading Project Summary report")
+                        projectSummaryReport(report)
+                        break
+                }
+            }
+        }
+    }
+
+    /**
+     * Job execute method to clean up report directory.
+     */
+    @Transactional
+    def cleanUpReports() {
+        log.info("ReportRequestService: Clean up reports directory")
+        def dir = new File(reportDirectory)
+        if (!dir.exists()) {
+            dir.mkdirs()
+            return
+        }
+
+        def ageInWeeks = settingsService.getSetting(SettingDefinition.ReportCleanupAge) as Integer
+        def cleanupEnabled = settingsService.getSetting(SettingDefinition.ReportCleanupEnabled) as Boolean
+        final int _day = 1
+        final int _week = 7 * _day
+
+        if (cleanupEnabled) {
+            LocalDate startDate = LocalDate.now().minusDays(ageInWeeks * _week)
+            //LocalDate startDate = LocalDate.now().minusDays(1)
+            Date date = Date.from(startDate.atStartOfDay(ZoneId.systemDefault()).toInstant())
+            log.debug("Looking for reports older than ${date}")
+            def oldReports = ReportRequest.findAllByDateArchivedIsNullAndDateCompletedLessThan(date)
+            int count = 0
+            oldReports.each { report ->
+                log.debug("Deleting report file for: ${report.fileName}")
+                def fileName = getReportFilename(report)
+                def filePath = createFilePath(fileName)
+                def csvFile = new File(filePath)
+
+                if (csvFile.exists()) {
+                    csvFile.delete()
+                    count++
+                }
+
+                report.dateArchived = new Date()
+                report.save(flush: true, failOnError: true)
+            }
+            log.info("Deleted (${count}) files.")
+        } else {
+            log.warn("Report cleanup has been disabled in the Advanced settings.")
+        }
+
+        log.info("Finished Clean up")
+    }
+
+    /**
+     * Checks if the report file still exists on the system. Returns the filepath to the file if it exists, null if
+     * it does not.
+     * @param reportRequest the report being checked
+     * @return the filepath if file exists or null if it doesn't
+     */
+    def checkReportFile(ReportRequest reportRequest) {
+        log.debug("Checking report file")
+        def fileName = getReportFilename(reportRequest, 'csv')
+        def filePath = createFilePath(fileName)
+        def csvFile = new File(filePath)
+        return csvFile.exists() ? fileName : null
+    }
+
+    /**
+     * Returns the web version of the file path for a report.
+     * @return
+     */
+    def getReportUrlPrefix() {
+        String serverUrl = grailsApplication.config.getProperty('server.url', String)
+        String urlPrefix = grailsApplication.config.getProperty('images.urlPrefix', String)
+        "${serverUrl}/${urlPrefix}reports/"
+    }
+
+    /**
+     * Set up method for the file for reporting.
+     * @param reportRequest the report request
+     * @return the File object for writing.
+     */
+    private def setupFile(ReportRequest reportRequest) {
+        def fileName = getReportFilename(reportRequest)
+        def filePath = createFilePath(fileName)
+        def csvFile = new File(filePath)
+
+        if (csvFile.exists()) {
+            // Stop, another process may be writing to the file, so don't continue.
+            log.warn("Picked up an existing file for this report.")
+            csvFile.delete()
+        }
+
+        csvFile
+    }
+
+    /**
+     * Generates a user report for a given set of parameters.
+     * @param reportRequest the report request to generate
+     */
+    def userReport(ReportRequest reportRequest) {
+        log.debug("User report running...")
+        def csvFile = setupFile(reportRequest)
+
+        // Report Parameters
+        def params = reportRequest.reportParams
+        def startDate = new SimpleDateFormat(DateConstants.DATE_FORMAT_SHORT).parse(params.get('dateStart') as String)
+        def endDate = new SimpleDateFormat(DateConstants.DATE_FORMAT_SHORT).parse(params.get('dateEnd') as String)
+        use (TimeCategory) {
+            endDate = endDate + 23.hour + 59.minute + 59.second
+        }
+        def labelFilter = params.labelFilter != "null" ? Label.findById(params.labelFilter as Long) : null
+        log.debug("Params: startDate: ${startDate}, endDate: ${endDate}, labelFilter: ${labelFilter}")
+
+        FileWriter fileWriter = new FileWriter(csvFile)
+        def writer = new PrintWriter(fileWriter)
+        def csvWriter
+        def report = []
+
+        if (!labelFilter) {
+            csvWriter = new CSVHeadingsWriter(writer, allUserReportColumnsDef)
+            csvWriter.writeHeadings()
+
+            // Old user report/All users
+            def asyncCounts = Task.async.withStatelessSession {
+                getTaskCounts()
+            }
+
+            def asyncLastActivities = ViewedTask.async.withStatelessSession {
+                def sw2 = Stopwatch.createStarted()
+                def lastActivities = taskService.getUserActivity()
+                sw2.stop()
+                log.debug("UserReport viewedTasks took ${sw2.toString()}")
+                lastActivities
+            }
+
+            def asyncProjectCounts = Transcription.async.withStatelessSession {
+                def sw4 = Stopwatch.createStarted()
+                def projectCounts = taskService.getProjectTranscriptionCounts()
+                sw4.stop()
+                log.debug("UserReport projectCounts took ${sw4.toString()}")
+                projectCounts
+            }
+
+            def sw3 = Stopwatch.createStarted()
+            def asyncUserDetails = User.async.task {
+                getUserDetails(labelFilter)
+            }
+            sw3.stop()
+            log.debug("UserReport user details took ${sw3.toString()}")
+
+            def asyncResults = waitAll(asyncCounts, asyncLastActivities, asyncProjectCounts, asyncUserDetails)
+
+            // transform raw results into map(id -> count)
+            def validateds = asyncResults[0].vs
+            def transcribeds = asyncResults[0].ts
+
+            def lastActivities = asyncResults[1]
+            def projectCounts = asyncResults[2]
+
+            def users = asyncResults[3].users as List<User>
+            def serviceResults = asyncResults[3].results
+
+            final realAdminRole = 'ROLE_ADMIN'
+            final adminRole = CASRoles.ROLE_ADMIN
+            final validatorRole = CASRoles.ROLE_VALIDATOR
+
+            def sw5 = Stopwatch.createStarted()
+            for (User user: users) {
+                def id = user.userId
+                def transcribedCount = transcribeds[id] ?: 0
+                def validatedCount = validateds[id] ?: 0
+                def lastActivity = lastActivities[id]
+                def projectCount = projectCounts[id]?: 0
+
+                def serviceResult = serviceResults?.users?.get(id)
+                def location = (serviceResult?.city && serviceResult?.state) ? "${serviceResult?.city}, ${serviceResult?.state}" : (serviceResult?.city ?: (serviceResult?.state ?: ''))
+
+                //def userRoles = user.userRoles
+                def userRoles = UserRole.findAllByUser(user)
+                def roleObjs = userRoles*.role
+                def roles = (roleObjs*.name + serviceResult?.roles).toSet()
+                def isAdmin = !roles.intersect([realAdminRole, adminRole]).isEmpty()
+                def isAlaValidator = !roles.intersect([validatorRole]).isEmpty()
+                def isValidator = !roles.intersect([BVPRole.VALIDATOR]).isEmpty()
+                def isForumModerator = !roles.intersect([BVPRole.FORUM_MODERATOR]).isEmpty()
+                def isInstitutionAdmin = !roles.intersect([BVPRole.INSTITUTION_ADMIN]).isEmpty()
+
+                report.add([serviceResult?.userId ?: id,
+                            serviceResult?.userName ?: user.email,
+                            serviceResult?.displayName ?: user.displayName,
+                            serviceResult?.organisation ?: user.organisation ?: '',
+                            location,
+                            transcribedCount,
+                            validatedCount,
+                            lastActivity,
+                            projectCount,
+                            user.created,
+                            isAdmin,
+                            isInstitutionAdmin,
+                            isAlaValidator,
+                            isValidator,
+                            isForumModerator])
+            }
+            sw5.stop()
+            log.debug("UserReport generate report took ${sw5}")
+
+            sw5.reset().start()
+            // Sort by the transcribed count
+            report.sort({ row1, row2 -> row2[5] - row1[5]})
+            sw5.stop()
+            log.debug("UserReport sort took ${sw5.toString()}")
+
+        } else {
+
+            csvWriter = new CSVHeadingsWriter(writer, taggedUserReportColumnsDef)
+            csvWriter.writeHeadings()
+
+            def asyncTranscribeTimes = Transcription.async.withStatelessSession {
+                getTranscribeTimes(startDate, endDate)
+            }
+
+            def asyncTasks = Transcription.async.withStatelessSession {
+                getTranscriptions(startDate, endDate)
+            }
+
+            def sw3 = Stopwatch.createStarted()
+            def asyncUserDetails = User.async.task {
+                getUserDetails(labelFilter)
+            }
+            sw3.stop()
+            log.debug("UserReport user details took ${sw3.toString()}")
+
+            def asyncResults = waitAll(asyncTranscribeTimes, asyncTasks, asyncUserDetails)
+            def transcribeTimes = asyncResults[0]
+            def transcriptionList = asyncResults[1] as List<Transcription>
+            def users = asyncResults[2].users as List<User>
+            def serviceResults = asyncResults[2].results
+
+            def reportUsers = []
+
+            def sw5 = Stopwatch.createStarted()
+            for (User user : users) {
+                def id = user.userId
+                def transcribeTime = transcribeTimes ? (transcribeTimes[id] ?: 0) : 0
+                transcribeTime = (transcribeTime / 60 / 60)
+                DecimalFormat df = new DecimalFormat("#.00")
+                transcribeTime = df.format(transcribeTime)
+                def serviceResult = serviceResults?.users?.get(id)
+                def userTranscriptionList = transcriptionList.findAll { t ->
+                    t.fullyTranscribedBy == id
+                }
+
+                reportUsers.add([
+                        id               : serviceResult?.userId ?: id,
+                        displayName      : serviceResult?.displayName ?: user.displayName,
+                        email            : serviceResult?.userName ?: user.email,
+                        transcribeTime   : transcribeTime,
+                        transcriptionList: userTranscriptionList
+                ])
+            }
+
+            log.debug("Report Users: ${reportUsers}")
+            reportUsers.each { user ->
+
+                log.debug("${user}")
+                def userInfo = []
+                userInfo.addAll([user['id'],
+                                 user['displayName'],
+                                 user['email'],
+                                 user['transcribeTime']])
+
+                if (user.transcriptionList.size() > 0) {
+                    user.transcriptionList.each { Transcription tx ->
+                        def row = []
+                        row.addAll(userInfo)
+                        def txGet = Transcription.get(tx.id)
+                        def project = txGet.project
+                        def institution = project.institution
+                        def task = txGet.task
+                        row.addAll([institution.name,
+                                    project.name,
+                                    task.id,
+                                    txGet.dateFullyTranscribed])
+                        report.add(row)
+                    }
+                } else {
+                    def row = []
+                    row.addAll(userInfo)
+                    row.addAll([NO_DATA, NO_DATA, NO_DATA, NO_DATA])
+                    report.add(row)
+                }
+            }
+
+            sw5.stop()
+            log.debug("UserReport generate report took ${sw5}")
+        }
+
+        log.debug("Writing report to file:")
+        for (def row : report) {
+            log.debug("${row}")
+            csvWriter << row
+        }
+
+        writer.close()
+        log.debug("User report completed.")
+    }
+
+    /**
+     * Project Summary report (migrated from AdminController)
+     * @param reportRequest the report request.
+     */
+    def projectSummaryReport(ReportRequest reportRequest) {
+        log.debug("Project Summary report running...")
+
+        def csvFile = setupFile(reportRequest)
+        def projects
+        def user = reportRequest.requestUser
+        def userLevel = UserService.USER_LEVEL_USER
+        if (reportRequest.reportParams != null) {
+            userLevel = reportRequest.reportParams.get("userLevel")
+            log.debug("userLevel: ${userLevel}")
+        }
+
+        def institutionList = []
+        if (userLevel == UserService.USER_LEVEL_INSTITUTION) {
+            institutionList.addAll(userService.getAdminInstitutionList(user))
+            projects = institutionService.listProjectsForInstititutionList(institutionList)
+        } else {
+            projects = Project.list([sort:'id'])
+        }
+
+        def dates = taskService.getProjectDates()
+
+        def projectSummaries = projectService.getAllProjectSummaries(institutionList, true)
+        def summaryMap = projectSummaries.projectRenderList.collectEntries { [(it.project.id) : it ] }
+
+        def data = projects.collect { project ->
+            def summary = summaryMap[project.id]
+            [project: project, summary: summary, dates: dates[project.id]]
+        }
+
+        FileWriter fileWriter = new FileWriter(csvFile)
+        def writer = new PrintWriter(fileWriter)
+        def csvWriter = new CSVHeadingsWriter(writer, projectSummaryColumnsDef)
+
+        for (def row : data) {
+            log.debug("row: ${row}")
+            csvWriter << row
+        }
+
+        writer.close()
+        log.debug("Project Summary report completed.")
+    }
+
+    /**
+     * Dynamic query for selecting reports based on provided status or report filters.
+     * @param statusFilter the status filter if any. Accepted values: all, active and archived.
+     * @param reportFilter the report filter if any
+     * @param params Map of query parameters such as <code>sortColumn</code>, <code>sortOrder</code>, <code>max</code>,
+     * and <code>offset</code>.
+     * @return Map: {@code[reportList: List<ReportRequest>, reportCount: Integer]}
+     */
+    def getReportsForAdmin(def params) {
+        def fetchReports = {
+            if (params.statusFilter) {
+                switch (params.statusFilter) {
+                    case 'active':
+                        and {
+                            isNotNull('dateCompleted')
+                            isNull('dateArchived')
+                        }
+                        break
+                    case 'archived':
+                        isNotNull('dateArchived')
+                        break
+                }
+            }
+            if (params.reportFilter) {
+                eq('reportName', params.reportFilter)
+            }
+            if (params.userFilter) {
+                eq('requestUser', params.userFilter)
+            }
+        }
+
+        log.debug("params: ${params}")
+
+        def results = ReportRequest.createCriteria().list() {
+            fetchReports.delegate = delegate
+            fetchReports()
+            if (params.max) {
+                maxResults(params.get('max') as int)
+            }
+            if (params.offset) {
+                firstResult(params.get('offset') as int)
+            }
+            if (params.sortColumn) {
+                order(params.sortColumn as String, params.sortOrder as String)
+            }
+        } as List<ReportRequest>
+
+        int resultCount = ReportRequest.createCriteria().get() {
+            fetchReports.delegate = delegate
+            fetchReports()
+            projections {
+                count('id')
+            }
+        }
+
+        [reportList: results, count: resultCount]
+    }
+
+    /**
+     * Returns a list of distinct report names from the {@link ReportRequest} table.
+     * @return a {@code List<String>} of report names.
+     */
+    def getReportNames() {
+        def reportNames = ReportRequest.createCriteria().list() {
+            projections {
+                distinct('reportName')
+            }
+        } as List<String>
+
+        reportNames
+    }
+
+    /**
+     * Retrieves transcription and validation counts for all users.
+     * @return a Map containing the results of a transcription count query and a validation count query.
+     */
+    private def getTaskCounts() {
+        def sw1 = Stopwatch.createStarted()
+        def vs = (Task.withCriteria {
+            projections {
+                groupProperty('fullyValidatedBy')
+                count('id')
+            }
+        }).collectEntries { [(it[0]): it[1]] }
+
+        def ts = (Transcription.withCriteria {
+            projections {
+                groupProperty('fullyTranscribedBy')
+                count('id')
+            }
+        }).collectEntries { [(it[0]): it[1]] }
+        sw1.stop()
+
+        log.debug("User counts took ${sw1.toString()}")
+        [vs: vs, ts: ts]
+    }
+
+    /**
+     * Retrieves transcribe times for users within a given date range.
+     * @param startDate the starting date of the range
+     * @param endDate the end date of the range
+     * @return a list of maps containing the user ID (from Transcription.fullyTranscribedBy) and the total transcibing
+     * time in seconds.
+     */
+    private def getTranscribeTimes(Date startDate, Date endDate) {
+        def transcribeTimes = (Transcription.withCriteria {
+            and {
+                isNotNull ('dateFullyTranscribed')
+                ge ('dateFullyTranscribed', startDate)
+                le ('dateFullyTranscribed', endDate)
+            }
+            projections {
+                groupProperty('fullyTranscribedBy')
+                sum('timeToTranscribe')
+            }
+        }).collectEntries { [(it[0]): it[1]] }
+
+        log.debug("Times: ${transcribeTimes}")
+        transcribeTimes
+    }
+
+    /**
+     * Returns a list of transcriptions between a given date range.
+     * @param startDate the starting date of the range
+     * @param endDate the end date of the range
+     * @return a list of transcriptions.
+     */
+    private def getTranscriptions(Date startDate, Date endDate) {
+        def sw1 = Stopwatch.createStarted()
+
+        def transcriptionList = Transcription.withCriteria {
+            and {
+                isNotNull ('dateFullyTranscribed')
+                ge ('dateFullyTranscribed', startDate)
+                le ('dateFullyTranscribed', endDate)
+            }
+        }
+        sw1.stop()
+        log.debug("User counts took ${sw1.toString()}")
+
+        transcriptionList
+    }
+
+    /**
+     * Returns a list of users and user details from the ALA auth service.
+     * @param labelFilter optional label filter
+     * @return A list of user objects and corresponding user info from the auth service.
+     */
+    private def getUserDetails(Label labelFilter = null) {
+        def users
+        if (labelFilter) {
+            users = labelFilter.userList.toList()
+        } else {
+            users = User.list()
+        }
+        def serviceResults = [:]
+        try {
+            serviceResults = authService.getUserDetailsById(users*.userId, true)
+        } catch (Exception e) {
+            log.warn("couldn't get user details from web service", e)
+        }
+
+        [users: users, results: serviceResults]
+    }
+}
diff --git a/grails-app/services/au/org/ala/volunteer/TaskService.groovy b/grails-app/services/au/org/ala/volunteer/TaskService.groovy
index 032c064cb..0e91bb831 100644
--- a/grails-app/services/au/org/ala/volunteer/TaskService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/TaskService.groovy
@@ -1557,6 +1557,25 @@ ORDER BY record_idx, name;
         lastActivities
     }
 
+    /**
+     * Returns a map of user activity between two given dates.
+     * @param startDate the start date
+     * @param endDate the end date
+     * @return a Map of user activity for a given date range.
+     */
+    def getUserActivityBetweenDates(Date startDate, Date endDate) {
+        String query = """\
+            select vt.userId, to_timestamp(min(vt.lastView)/1000), to_timestamp(max(vt.lastView)/1000)
+            from ViewedTask vt
+            where vt.lastView/1000 >= cast(extract(epoch FROM :startDate::timestamp) AS bigint)
+              and vt.lastView/1000 <= cast(extract(epoch FROM :endDate::timestamp) AS bigint)
+            group by vt.userId
+        """.stripIndent()
+        def userActivity = ViewedTask.executeQuery(query, [startDate: startDate, endDate: endDate])
+                .collectEntries { [(it[0]): it[1]] }
+        userActivity
+    }
+
     /**
      * Returns a Map of transcription counts grouped by user (Transcription.fullyTranscribedBy).
      * @return a Map of transcription counts grouped by user
diff --git a/grails-app/services/au/org/ala/volunteer/UserService.groovy b/grails-app/services/au/org/ala/volunteer/UserService.groovy
index ee73db7f8..a60239772 100644
--- a/grails-app/services/au/org/ala/volunteer/UserService.groovy
+++ b/grails-app/services/au/org/ala/volunteer/UserService.groovy
@@ -39,6 +39,10 @@ class UserService {
     public static final int WELCOME_EMAIL_TRANSCRIPTION = 0
     public static final int WELCOME_EMAIL_SYNC = 1
 
+    static final String USER_LEVEL_USER = "user"
+    static final String USER_LEVEL_INSTITUTION = "institution"
+    static final String USER_LEVEL_ADMIN = "admin"
+
     private static Queue<UserActivity> _userActivityQueue = new ConcurrentLinkedQueue<UserActivity>()
 
     /**
@@ -233,7 +237,8 @@ class UserService {
     }
 
     /**
-     * Determines if the current user holds the institution admin role for any institution.
+     * Determines if the provided user holds the institution admin role for any institution. Can be called with no user
+     * parameter to check the current logged in user.
      * To find if a user holds the institution admin role for a specific institution, call
      * {@link UserService#isInstitutionAdmin(Institution)}
      * <br />
@@ -270,10 +275,12 @@ class UserService {
     /**
      * Returns a list of institutions the current user holds the Institution Admin for.
      */
-    def getAdminInstitutionList() {
-        def user = currentUser
+    def getAdminInstitutionList(User user = null) {
         if (!user) {
-            return []
+            user = currentUser
+            if (!user) {
+                return []
+            }
         }
 
         def institutionAdminRole = Role.findByNameIlike(BVPRole.INSTITUTION_ADMIN)
diff --git a/grails-app/taglib/au/org/ala/volunteer/VolunteerTagLib.groovy b/grails-app/taglib/au/org/ala/volunteer/VolunteerTagLib.groovy
index 3c5e80075..fee9db7d3 100644
--- a/grails-app/taglib/au/org/ala/volunteer/VolunteerTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/volunteer/VolunteerTagLib.groovy
@@ -743,11 +743,12 @@ class VolunteerTagLib {
         if (!active) {
             active = attrs.title
         }
+        def target = attrs.target
         def current = pageProperty(name:'page.pageTitle')?.toString()
 
         def mb = new MarkupBuilder(out)
         mb.li(class: "list-group-item ${active == current ? 'active' : ''}") {
-            a(href:attrs.href) {
+            a(href:attrs.href, target: "${target ?: ''}") {
                 i(class:'fa fa-chevron-right') { mkp.yieldUnescaped('&nbsp;')}
                 mkp.yield(attrs.title)
             }
diff --git a/grails-app/views/admin/index.gsp b/grails-app/views/admin/index.gsp
index a07eb938a..d2ce80d82 100644
--- a/grails-app/views/admin/index.gsp
+++ b/grails-app/views/admin/index.gsp
@@ -120,7 +120,7 @@
                         </tr>
                         <tr>
                             <td><a class="btn btn-primary bs3"
-                                   href="${createLink(controller: 'user', action: 'list')}">User List</a></td>
+                                   href="${createLink(controller: 'user', action: 'adminList')}">Manage Users</a></td>
                             <td>List of all User accounts on DigiVol</td>
                         </tr>
                         <tr>
@@ -166,6 +166,12 @@
                             <td>Advanced Settings</td>
                         </tr>
                         </cl:ifSiteAdmin>
+                        <tr>
+                            <td><a class="btn btn-primary bs3"
+                                   href="${createLink(controller: 'report', action: 'index')}">DigiVol Reporting</a>
+                            </td>
+                            <td>Admin Reports</td>
+                        </tr>
                         <tr>
                             <td>Admin reports</td>
                             <td>
diff --git a/grails-app/views/label/_form.gsp b/grails-app/views/label/_form.gsp
deleted file mode 100644
index 88b86b008..000000000
--- a/grails-app/views/label/_form.gsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ page import="au.org.ala.volunteer.Label" %>
-
-
-
-<div class="fieldcontain ${hasErrors(bean: labelInstance, field: 'category', 'error')} required">
-    <label for="category">
-        <g:message code="label.category.label" default="Category"/>
-        <span class="required-indicator">*</span>
-    </label>
-    <g:textField name="category" required="" value="${labelInstance?.category}"/>
-
-</div>
-
-<div class="fieldcontain ${hasErrors(bean: labelInstance, field: 'value', 'error')} required">
-    <label for="value">
-        <g:message code="label.value.label" default="Value"/>
-        <span class="required-indicator">*</span>
-    </label>
-    <g:textField name="value" required="" value="${labelInstance?.value}"/>
-
-</div>
-
diff --git a/grails-app/views/label/createCategory.gsp b/grails-app/views/label/createCategory.gsp
new file mode 100644
index 000000000..17bac72df
--- /dev/null
+++ b/grails-app/views/label/createCategory.gsp
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}">
+    <g:set var="entityName" value="${message(code: 'default.label.category.label', default: 'Category')}"/>
+    <title><g:message code="default.create.label" args="[entityName]" default="Create"/></title>
+</head>
+
+<body class="admin">
+<cl:headerContent title="${message(code: 'default.create.label', args: [entityName], default: 'Create')}" selectedNavItem="bvpadmin">
+    <%
+        pageScope.crumbs = [
+            [
+                link: createLink(controller: 'admin'), label: message(code: 'default.admin.label', default: 'Administration'),
+                link: createLink(controller: 'label'), label: message(code: 'default.label.admin', default: 'Manage Tags')
+            ]
+        ]
+    %>
+</cl:headerContent>
+<div id="create-project" class="container">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <g:hasErrors bean="${labelCategory}">
+            <div class="row">
+                <div class="col-md-12">
+
+                    <div class="alert alert-danger">
+                        <ul class="errors" role="alert" style="padding-left: 0px;">
+                            <g:eachError bean="${labelCategory}" var="error">
+                                <li style="list-style: none" <g:if test="${error in FieldError}">data-field-id="${error.field}"</g:if>><g:message
+                                        error="${error}"/></li>
+                            </g:eachError>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            </g:hasErrors>
+
+            <div class="row">
+                <div class="col-md-12">
+                    <h4><g:message code="default.label.category.label" default="${entityName}"/> Details</h4>
+                </div>
+                <div class="col-md-12" style="margin-top: 20px;">
+                    <g:form action="saveCategory" class="form-horizontal">
+                        <div class="form-group">
+                            <label class="control-label col-md-3" for="categoryName"><g:message code="default.label.category.label" default="${entityName}"/> Name*</label>
+                            <div class="col-md-9">
+                                <g:textField class="form-control" id="categoryName" name="name" value="${params?.name}" required="required"/>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-md-offset-3 col-md-9">
+                                <g:submitButton name="create" class="save btn btn-primary"
+                                                value="${message(code: 'default.button.create.label', default: 'Create')}"/>
+                            </div>
+                        </div>
+                    </g:form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/grails-app/views/label/editCategory.gsp b/grails-app/views/label/editCategory.gsp
new file mode 100644
index 000000000..983269f87
--- /dev/null
+++ b/grails-app/views/label/editCategory.gsp
@@ -0,0 +1,521 @@
+<%@ page import="au.org.ala.volunteer.User" %>
+<%@ page import="au.org.ala.volunteer.DateConstants" %>
+<%@ page import="au.org.ala.volunteer.LabelColour" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}">
+    <g:set var="entityName" value="${message(code: 'default.label.label', default: 'Tag')}"/>
+    <g:set var="entityNamePlural" value="${message(code: 'default.label.plural.label', default: 'Tags')}"/>
+    <title><g:message code="label.admin.editCategory.label" default="Edit Category"/></title>
+    <style>
+        .label-button {
+            /*display: block;*/
+            /*position: absolute;*/
+            top: 0;
+            right: 20px;
+            padding: 4px 10px;
+            text-align: center;
+            cursor: pointer;
+            float: right;
+            font-size: 1.2em;
+        }
+
+        .btn {
+            border-radius: 5px;
+        }
+
+        .save-label-button, .cancel-label-button {
+            display: none;
+        }
+
+        .edit-label-button, .delete-label-button {
+            display: inline;
+        }
+
+        .focus {
+            outline: -webkit-focus-ring-color auto 1px;
+        }
+
+    </style>
+</head>
+
+<body class="admin">
+<cl:headerContent title="${message(code: 'label.admin.editCategory.label', default: 'Edit Category')}" selectedNavItem="bvpadmin">
+    <%
+        pageScope.crumbs = [
+                [link: createLink(controller: 'admin'), label: message(code: 'default.admin.label', default: 'Administration')],
+                [link: createLink(controller: 'label'), label: message(code: 'default.label.admin', default: 'Manage Tags')]
+
+        ]
+    %>
+</cl:headerContent>
+
+<div class="container" role="main">
+
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-12" style="margin-left: 5px;">
+                    <g:form controller="label" action="updateCategory" class="form-horizontal" method="POST">
+                    <div class="form-group">
+                        <label class="control-label col-md-2" for="name">
+                            Category Name:
+                        </label>
+                        <div class="col-md-4" style="vertical-align: middle;">
+                            <g:set var="isProtected" value="${(loadedDefaultLabels && labelCategory.isDefault)}"/>
+                            <input class="form-control" id="name" name="name" type="text"
+                                   placeholder="Enter the category name"
+                                   value="${labelCategory.name}"
+                                   ${(isProtected ? "disabled='disabled'" : '')} required/>
+                            <input type="hidden" name="categoryId" value="${labelCategory.id}"/>
+                        </div>
+                    </div>
+                        <div class="form-group">
+                            <label class="control-label col-md-2" for="name">
+                                Tag Colour:
+                            </label>
+                            <div class="col-md-4" style="vertical-align: middle;">
+                                <g:select name="labelColour" id="label-colour"
+                                          class="form-control"
+                                          from="${LabelColour.values()}"
+                                          keys="${LabelColour.values()*.name()}"
+                                          required=""
+                                          noSelection="['':'- Select a Tag Colour -']"
+                                          value="${labelCategory?.labelColour}"/>
+                            </div>
+                            <div class="control-label col-md-1" id="example-tag-display">
+                                <g:set var="labelColourClass" value="${(!labelCategory.labelColour ? 'base' : labelCategory.labelColour)}"/>
+                                <span class="label label-${labelColourClass}" id="example-tag">Example Tag</span>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-md-offset-2 col-md-4">
+                                <input type="submit" class="save btn btn-primary" id="addButton"
+                                       value="${message(code: 'default.button.add.label', default: 'Save')}"/>
+                            </div>
+                        </div>
+                    </g:form>
+                </div>
+            </div>
+
+            <g:if test="${isProtected}">
+            <div class="row">
+                <div class="col-md-12" style="margin-top: 20px;margin-left: 5px;">
+                    <i>* This category is a default, system-loaded category. It and default tags are not editable. You may add to the existing tags however.</i>
+                </div>
+            </div>
+            </g:if>
+
+
+            <div class="row">
+            </div>
+        </div>
+    </div>
+
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h4>${labelCategory.name} ${entityNamePlural}</h4>
+
+            <div class="row">
+                <div class="col-md-12" style="margin-left: 5px;">
+                    <g:form controller="label" action="saveNewLabel" class="form-horizontal" method="POST">
+                        <div class="form-group">
+                            <label class="control-label col-md-2" for="value">
+                                Add ${entityName}:
+                            </label>
+                            <div class="col-md-4">
+                                <input class="form-control" id="value" name="value" type="text"
+                                       placeholder="Enter the ${entityName} name"
+                                       required/>
+                                <input type="hidden" name="categoryId" value="${labelCategory.id}"/>
+                            </div>
+                            <input type="submit" class="save btn btn-primary" id="addLabelButton"
+                                   value="${message(code: 'default.button.add.label', default: 'Add')}"/>
+                        </div>
+                    </g:form>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-6" style="margin-top: 20px;margin-left: 5px;">
+                    ${labelCategory.labels?.size() ?: 0} ${entityNamePlural} found.
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-12 table-responsive">
+                    <table class="table table-striped table-hover" id="label-list">
+                        <thead>
+                            <tr>
+                                <th>Tag Name</th>
+                                <th>Last Updated</th>
+                                <th>Created By</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <g:each in="${labelCategory.labels.sort { a, b -> a.value <=> b.value }}" status="i" var="label">
+                            <tr class="${(i % 2) == 0 ? 'even' : 'odd'} label-data">
+                                <td style="vertical-align: middle;" class="label-value col-md-6" data-label-id="${label.id}">
+                                    ${label.value}
+                                </td>
+                                <td style="vertical-align: middle;" class="col-md-2">
+                                    ${formatDate(date: label.updatedDate, format: DateConstants.DATE_TIME_FORMAT)}
+                                </td>
+                                <td style="vertical-align: middle;" class="col-md-2">
+                                    ${User.get(label.createdBy)?.displayName ?: 'System'}
+                                </td>
+                                <td class="col-md-2" style="text-align: center;">
+                                    <g:set var="isEditable" value="${(!isProtected || (isProtected && !label.isDefault))}"/>
+                                    <g:if test="${(isEditable)}">
+                                        <i class="fa fa-times label-button cancel-label-button" contenteditable="false"
+                                           title="${message(code: 'default.button.cancel.label', default: 'Cancel')}"></i>
+                                        <i class="fa fa-save label-button save-label-button" contenteditable="false"
+                                           title="${message(code: 'default.button.add.label', default: 'Save')}"></i>
+
+                                        <i class="fa fa-trash label-button delete-label-button" contenteditable="false"
+                                           data-href="${createLink(controller: 'label', action: 'deleteLabel', id: label.id)}"
+                                           title="${message(code: 'default.button.delete.label', default: 'Delete')}"></i>
+                                        <i class="fa fa-pencil label-button edit-label-button" contenteditable="false"
+                                           title="${message(code: 'default.button.edit.label', default: 'Edit')}"></i>
+
+                                        <i class="fa fa-share-square-o label-button change-cat-button"
+                                           data-label-name="${label.value}"
+                                           data-label-id="${label.id}"
+                                           contenteditable="false"
+                                           title="${message(code: 'label.changecat.label', default: 'Move to a different Category')}"></i>
+                                    </g:if>
+                                    <i class="fa fa-tags label-button view-tags-button"
+                                       data-label-name="${label.value}"
+                                       data-label-id="${label.id}"
+                                       contenteditable="false"
+                                       title="${message(code: 'label.viewtags.label', default: 'View Tag Usage')}"></i>
+                                </td>
+                            </tr>
+                        </g:each>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+<!-- View Tags Modal -->
+<div class="modal fade" id="view-labels-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4>${message(code: 'default.label.label', default: 'Tag')} Usage for: '<span id="view-label-name"></span>'</h4>
+            </div>
+            <div class="modal-body">
+                <div id="view-label-list"></div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" id="btn-close-view-labels">OK</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Change Category Modal -->
+<div class="modal fade" id="change-cat-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4>Change ${message(code: 'default.label.label', default: 'Tag')} Category: '<span id="change-cat-label-name"></span>'</h4>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <p>Select the new category for this ${message(code: 'default.label.label', default: 'Tag')}.</p>
+                    <div class="col-md-12" style="margin-left: 5px;">
+                        <div class="form-group">
+                            <label class="control-label col-md-4" for="newCategory">
+                                New Category:
+                            </label>
+                            <div class="col-md-8" style="vertical-align: middle;">
+                                <g:set var="categoryFilterList" value="${categoryList.findAll{it.id != labelCategory.id}}"/>
+                                <g:select name="newCategory"
+                                          class="form-control"
+                                          from="${categoryFilterList}"
+                                          optionKey="id"
+                                          optionValue="name"
+                                          noSelection="[0:'- Select a new Category -']"/>
+                                <input type="hidden" name="changeCatLabelId" id="cat-change-label-id" value=""/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-default" id="btn-save-change-cat">Save</button>
+                <button class="btn btn-default" id="btn-close-change-cat">Cancel</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<asset:script type="text/javascript">
+$(function($) {
+    var activeRow = null;
+    var valueBackup = "";
+
+    $.extend({
+        postGo: function(url, params) {
+            var $form = $("<form>")
+                .attr("method", "post")
+                .attr("action", url);
+            $.each(params, function(name, value) {
+                $("<input type='hidden'>")
+                    .attr("name", name)
+                    .attr("value", value)
+                    .appendTo($form);
+            });
+            $form.appendTo("body");
+            $form.submit();
+        }
+    });
+
+    /**
+    * Updates the data attr with new label name. Assumes ele is the row/parent element and searches for the
+    * buttons as children.
+    * @param ele the parent element
+    * @param newLabelName the new label name.
+    */
+    function updateLabel(ele, newLabelName) {
+        var changeCatButton = $(ele).find('.change-cat-button');
+        if (changeCatButton.length > 0) {
+            $(changeCatButton).attr('data-label-name', newLabelName);
+        }
+
+        var viewTagsButton = $(ele).find('.view-tags-button');
+        if (viewTagsButton.length > 0) {
+            $(viewTagsButton).attr('data-label-name', newLabelName);
+        }
+    }
+
+    $(".change-cat-button").click(function() {
+        var labelName = $(this).data('label-name');
+        var labelId = $(this).data('label-id');
+        //console.log("LabelID: " + labelId);
+        $('#change-cat-label-name').text(labelName);
+        $('#cat-change-label-id').val(labelId);
+        //console.log("Setting hidden field to " + $('#cat-change-label-id').val());
+        $( "#change-cat-modal" ).modal( "show" );
+    });
+
+    $("#btn-close-change-cat").click(function() {
+        $( "#change-cat-modal" ).modal( "hide" );
+    });
+
+    $("#btn-save-change-cat").click(function() {
+        // Save change category.
+        //console.log("saving category change");
+        var labelId = $('#cat-change-label-id').val();
+        var newCategory = $('#newCategory').val();
+        //console.log("Label ID: " + labelId + ", newCategory: " + newCategory);
+        if (labelId !== undefined && newCategory !== undefined) {
+            var href = "${createLink(controller: 'label', action: 'changeCategory')}?labelId=" + labelId + "&newCategory=" + newCategory;
+            $.postGo(href);
+        }
+    });
+
+    $(".view-tags-button").click(function(e) {
+        e.preventDefault();
+        var labelName = $(this).data('label-name');
+        var labelId = $(this).data('label-id');
+        var href = "${createLink(controller: 'label', action: 'labelUsage')}?id=" + labelId;
+        $('#view-label-name').html(labelName);
+        $('#view-label-list').html("<i class='fa fa-spinner fa-pulse fa-3x fa-fw'></i><span class='sr-only'>Loading...</span>");
+
+        $.get(href, function(data) {
+            var $div = $('<div>');
+            if (data.projects !== undefined && data.projects.length > 0) {
+                $div.append('<h4>Projects ('+ data.projects.length +'):</h4>');
+                var $ul = $('<ul>');
+                $.each(data.projects, function(index, project) {
+                    if (index > 100) {
+                        var $li = $('<li>').text((data.projects.length - index) + ' more.');
+                        $ul.append($li);
+                        return false;
+                    }
+                    var $li = $('<li>').text(project.name);
+                    $ul.append($li);
+                });
+                $div.append($ul);
+            }
+
+            if (data.landingPages !== undefined && data.landingPages.length > 0) {
+                $div.append('<h4>Landing Pages ('+ data.landingPages.length +'):</h4>');
+                var $ul = $('<ul>');
+                $.each(data.landingPages, function(index, page) {
+                    var $li = $('<li>').text(page.name);
+                    $ul.append($li);
+                });
+                $div.append($ul);
+            }
+
+            $('#view-label-list').html($div);
+        }).fail(function(jqXHR, textStatus) {
+            $('#view-label-list').html("No entities found.");
+            //console.log(jqXHR);
+        });
+
+        $( "#view-labels-modal" ).modal( "show" );
+    });
+
+    $("#btn-close-view-labels").click(function(e) {
+        e.preventDefault();
+        $( "#view-labels-modal" ).modal( "hide" );
+    });
+
+    // Attach click event listeners to each row
+    /**
+     * Toggles the editable nature of the tag value.
+     * @param ele the element where the event originated (e.g. button).
+     */
+    function toggleEdit(ele) {
+        var $row = $(ele).closest('tr.label-data');
+
+        if (activeRow !== null && activeRow[0] !== $row[0]) {
+            // activeRow.find('td.label-value').removeAttr('contenteditable');
+            // activeRow.find('.save-label-button').hide();
+            alert("Please save the current label before editing another.");
+            return;
+        }
+
+        // Toggle contenteditable attribute for the row
+        $row.find('td.label-value').each(function() {
+            var contentEditable = $(this).attr('contenteditable');
+            if (contentEditable === 'true') {
+                // Save icon clicked
+                $(this).removeAttr('contenteditable');
+                $(this).removeClass('focus');
+
+                if ($(ele).hasClass("save-label-button")) {
+                    //console.log("Save button clicked");
+                    saveLabel($row);
+                } else if ($(ele).hasClass("cancel-label-button")) {
+                    //console.log("Cancel button clicked");
+                    $(this).html(valueBackup);
+                }
+            } else {
+                // Edit icon clicked
+                var value = $.trim($(this).text());
+                //console.log("Old value: " + value);
+                valueBackup = value;
+                $(this).attr('contenteditable', 'true');
+                $(this).addClass('focus');
+                $(this).focus();
+                document.execCommand('selectAll', false, null);
+            }
+        });
+
+        toggleButtons($row);
+
+        // Update the activeRow
+        if ($row.find('.save-label-button').is(':hidden')) {
+            activeRow = null;
+        } else {
+            activeRow = $row;
+        }
+    }
+
+    /**
+     * Toggles the buttons from hidden to visible and vice versa.
+     * @param $row The row to perform the toggle.
+     */
+    function toggleButtons($row) {
+        // Toggle icon display
+        //$row.find('.label-button').toggle();
+        $row.find('.save-label-button').toggle();
+        $row.find('.edit-label-button').toggle();
+        $row.find('.cancel-label-button').toggle();
+        $row.find('.delete-label-button').toggle();
+    }
+
+    /**
+     * Saves the value for the tag to the database.
+     * @param $row The label row to save.
+     */
+    function saveLabel($row) {
+        //console.log("Saving label");
+        var td = $row.find('td.label-value');
+        var value = $(td).text();
+        var id = $(td).data('label-id');
+        //console.log("Saving value: " + $.trim(value));
+        //console.log("ID: " + id);
+        const url = "${createLink(controller: 'label', action: 'saveLabel')}";
+        var data = {
+            labelName: $.trim(value),
+            id: id
+        }
+        $.post(url, data)
+        .done(function (data, status, xhr) {
+            updateLabel($row, $.trim(value));
+        })
+        .fail(function(xhr, status, error) {
+           //console.log("Couldn't delete tasks", status, error);
+           alert("Error saving label. Please try again later.");
+        });
+    }
+
+    $('td.label-value').keypress(function(event) {
+        //console.log("keypress");
+        var keycode = event.charCode || event.keyCode;
+        if (keycode === 10 || keycode === 13) { // Enter key's keycode
+            event.preventDefault();
+            //console.log("Enter pressed");
+            var saveButton = $(this).closest('tr').find('.save-label-button');
+            if (saveButton.length > 0) {
+                saveButton.trigger('click');
+            }
+        }
+    });
+
+    // Attach click event listeners to each icon
+    $('.save-label-button').click(function(event) {
+        //console.log("Save button clicked");
+        event.stopPropagation(); // Prevent row click event from firing
+        toggleEdit(this); // Toggle the display of the icon
+    });
+
+    // Attach click event listeners to each edit icon
+    $('.edit-label-button').click(function(event) {
+        event.stopPropagation(); // Prevent row click event from firing
+        toggleEdit(this);
+    });
+
+    $('.cancel-label-button').click(function(event) {
+        event.stopPropagation(); // Prevent row click event from firing
+        //console.log('Cancel button clicked');
+        toggleEdit(this);
+    });
+
+    $('.delete-label-button').click(function(event) {
+        event.stopPropagation(); // Prevent row click event from firing
+        //console.log('Delete button clicked');
+        var $this = $(this);
+        var href = $this.data('href');
+        //console.log("href: " + href);
+
+        bootbox.confirm("Are you sure you wish to delete this label? This action is permanent!", function(result) {
+            if (result) {
+                $.postGo(href);
+                toggleEdit(this);
+            }
+        });
+    });
+
+    $('#label-colour').on('change', function() {
+        var colourValue = $(this).val();
+        var newLabelColour = "label-" + colourValue;
+        $('#example-tag').removeClass().addClass("label " + newLabelColour);
+    });
+
+});
+</asset:script>
+</body>
+</html>
\ No newline at end of file
diff --git a/grails-app/views/label/index.gsp b/grails-app/views/label/index.gsp
index 2d1c20486..281d68837 100644
--- a/grails-app/views/label/index.gsp
+++ b/grails-app/views/label/index.gsp
@@ -1,159 +1,118 @@
-<%@ page import="org.springframework.validation.FieldError; au.org.ala.volunteer.Label" %>
+<%@ page import="au.org.ala.volunteer.User" %>
+<%@ page import="au.org.ala.volunteer.DateConstants" %>
 <!DOCTYPE html>
 <html>
 <head>
     <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}">
-    <g:set var="entityName" value="${message(code: 'label.label', default: 'Tag')}"/>
-    <title><g:message code="default.list.label" args="[entityName]"/></title>
+    <g:set var="entityName" value="${message(code: 'default.label.category.label', default: 'Category')}"/>
+    <g:set var="entityNamePlural" value="${message(code: 'default.label.category.plural.label', default: 'Categories')}"/>
+        <title><g:message code="default.admin.entity.title.label" args="[entityNamePlural]" default="Manage Tags"/></title>
     <style>
-    .vptable {
-        display: table;
-    }
-
-    .vptable > * {
-        display: table-row;
-    }
-
-    .vptable > * > div {
-        display: table-cell;
-        padding: 8px;
-        line-height: 1.42857143;
-        vertical-align: top;
-        border-top: 1px solid #ddd;
-    }
-
-    .vptable > * > .vpth {
-        font-weight: bold;
-    }
-
-    .min-input-small {
-        min-width: 90px;
-    }
-
-    .min-input-medium {
-        min-width: 150px;
-    }
+        .label-button {
+            cursor: pointer;
+            font-size: 1.2em;
+        }
     </style>
 </head>
 
 <body class="admin">
-
-<cl:headerContent title="${message(code: 'default.tools.label', default: 'Tags')}" selectedNavItem="bvpadmin">
+<cl:headerContent title="${message(code: 'default.admin.entity.title.label', args: [entityNamePlural], default: 'Tags')}" selectedNavItem="bvpadmin">
     <%
         pageScope.crumbs = [
                 [link: createLink(controller: 'admin'), label: message(code: 'default.admin.label', default: 'Administration')]
         ]
     %>
+
+    <a class="btn btn-success" href="${createLink(action: "createCategory")}">
+        <i class="icon-plus icon-white"></i>
+        <g:message code="label.create.category.label" default="Create Tag Category"/>&nbsp;
+    </a>
 </cl:headerContent>
 
 <div class="container" role="main">
+
     <div class="panel panel-default">
         <div class="panel-body">
-            <div class="row">
-                <div class="col-md-offset-2 col-md-8">
-                    <g:hasErrors bean="${labelInstance}">
-                        An error was encountered:
-                        <ul class="errors" role="alert">
-                            <g:eachError bean="${labelInstance}" var="error">
-                                <li <g:if test="${error in FieldError}">data-field-id="${error.field}"</g:if>><g:message
-                                        error="${error}"/></li>
-                            </g:eachError>
-                        </ul>
-                    </g:hasErrors>
-                    <div class="table vptable">
-                        <div>
-                            <s:sortableColumn tag="div" class="vpth min-input-small" property="category"
-                                              title="${message(code: 'label.category.label', default: 'Category')}"/>
-                            <s:sortableColumn tag="div" class="vpth min-input-medium" property="value"
-                                              title="${message(code: 'label.value.label', default: 'Value')}"/>
-                            <div class="vpth min-input-small"><span>&nbsp;</span></div>
-                        </div>
-                        <g:each in="${labelInstanceList}" status="i" var="labelInstance">
-                            <g:form url="[resource: labelInstance, action: 'update']" method="PUT">
-                                <g:hiddenField name="version" value="${labelInstance?.version}"/>
-                                <div><g:textField class="form-control"
-                                                  placeholder="${message(code: 'label.category.label', default: 'Category')}"
-                                                  name="category" required="" value="${labelInstance?.category}"/></div>
 
-                                <div><g:textField class="form-control"
-                                                  placeholder="${message(code: 'label.value.label', default: 'Value')}"
-                                                  name="value" required="" value="${labelInstance?.value}"/></div>
+            <div class="row">
+                <div class="col-md-6" style="margin-top: 20px;margin-left: 5px;">
+                    ${labelCategories?.size() ?: 0} ${entityName}s found.
+                </div>
+            </div>
 
-                                <div class="min-input-small">
-                                    <button type="submit" class="btn btn-xs btn-success" title="Save">
-                                        <i class="fa fa-thumbs-up"></i>
-                                    </button>
-                                    <button type="reset" class="btn btn-xs btn-default" title="Reset">
-                                        <i class="fa fa-thumbs-down"></i>
-                                    </button>
-                                    <button type="button" title="Delete"
-                                            data-href="${createLink(controller: "label", action: "delete", id: labelInstance?.id, params: params)}"
-                                            class="btn btn-xs btn-danger delete-label">
-                                        <i class="fa fa-times"></i>
-                                    </button>
-                                </div>
-                            </g:form>
+            <div class="row">
+                <div class="col-md-12 table-responsive">
+                    <table class="table table-striped table-hover">
+                        <thead>
+                            <tr>
+                                <th><g:message code="label.category.name.label" default="Category"/></th>
+                                <th><g:message code="label.category.labelcount.label" default="No. Tags"/></th>
+                                <th><g:message code="label.category.labelcolour.label" default="Tag Colour"/></th>
+                                <th><g:message code="label.category.datecreated.label" default="Date Updated"/></th>
+                                <th><g:message code="label.category.createdby.label" default="Created By"/></th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <g:each in="${labelCategories}" status="i" var="labelCategory">
+                            <tr class="${(i % 2) == 0 ? 'even' : 'odd'}" categoryId="${labelCategory.id}">
+                                <g:set var="labelColourClass" value="${(!labelCategory.labelColour ? 'base' : labelCategory.labelColour)}"/>
+                                <td style="vertical-align: middle; width: 35%;"><g:link action="editCategory" id="${labelCategory.id}">${labelCategory.name}</g:link></td>
+                                <td style="vertical-align: middle; text-align: right; width: 8%;">${labelCategory.labels?.size()}</td>
+                                <td style="vertical-align: middle; text-align: right; width: 8%;"><span class="label label-${labelColourClass}">Example Tag</span></td>
+                                <td style="vertical-align: middle;">${formatDate(date: labelCategory.updatedDate, format: DateConstants.DATE_TIME_FORMAT)}</td>
+                                <td style="vertical-align: middle;">${labelCategory.createdBy == 0L ? "System" : User.get(labelCategory.createdBy).displayName}</td>
+                                <td>
+                                    <g:if test="${(!labelCategory.isDefault)}">
+                                    <i class="fa fa-trash label-button delete-label-button"
+                                       data-href="${createLink(controller: 'label', action: 'deleteCategory', id: labelCategory.id)}"
+                                       title="${message(code: 'default.button.delete.label', default: 'Delete')}"></i>
+                                    </g:if>
+                                </td>
+                            </tr>
                         </g:each>
-                    </div>
-                    <g:if test="${labelInstanceCount > (params.max ?: 25)}">
-                        <div class="pagination">
-                            <g:paginate max="25" total="${labelInstanceCount ?: 0}"/>
-                        </div>
-                    </g:if>
-                    <div class="table vptable">
-                        <g:form class="form-inline" url="[resource: labelInstance, action: 'save']">
-                            <div><g:textField autofocus="true" class="form-control"
-                                              placeholder="${message(code: 'label.category.label', default: 'Category')}"
-                                              name="category" required="" value="${labelInstance?.category}"/></div>
-
-                            <div><g:textField class="form-control"
-                                              placeholder="${message(code: 'label.value.label', default: 'Value')}" name="value"
-                                              required="" value="${labelInstance?.value}"/></div>
-
-                            <div class="min-input-small">
-                                <button type="submit" class="btn btn-xs btn-success"><i
-                                        class="fa fa-thumbs-up"></i></button>
-                                <button type="reset" class="btn btn-xs btn-default"><i class="fa fa-thumbs-down"></i></button>
-                            </div>
-                        </g:form>
-                    </div>
+                        </tbody>
+                    </table>
                 </div>
             </div>
+
         </div>
     </div>
-</div>
 
+</div>
 <asset:script type="text/javascript">
-    jQuery(function($) {
+$(function($) {
+    $.extend({
+        postGo: function(url, params) {
+            var $form = $("<form>")
+                .attr("method", "post")
+                .attr("action", url);
+            $.each(params, function(name, value) {
+                $("<input type='hidden'>")
+                    .attr("name", name)
+                    .attr("value", value)
+                    .appendTo($form);
+            });
+            $form.appendTo("body");
+            $form.submit();
+        }
+    });
 
-        $.extend({
-            postGo: function(url, params) {
-                var $form = $("<form>")
-                    .attr("method", "post")
-                    .attr("action", url);
-                $.each(params, function(name, value) {
-                    $("<input type='hidden'>")
-                        .attr("name", name)
-                        .attr("value", value)
-                        .appendTo($form);
-                });
-                $form.appendTo("body");
-                $form.submit();
-            }
-        });
+    $('.delete-label-button').click(function(event) {
+        event.stopPropagation(); // Prevent row click event from firing
+        //console.log('Delete button clicked');
+        var $this = $(this);
+        var href = $this.data('href');
+        //console.log("href: " + href);
 
-        $('.delete-label').click(function(e) {
-            var $this = $(this);
-            var href = $this.data('href');
-            bootbox.confirm("Are you sure you wish to delete this label? This action is permanent!", function(result) {
-                if (result) {
-                    $.postGo(href);
-                }
-            });
+        bootbox.confirm("Are you sure you wish to delete this tag category and all it's tags? This action is permanent!", function(result) {
+            if (result) {
+                $.postGo(href);
+            }
         });
-
     });
-</asset:script>
 
-</body>
-</html>
+});
+</asset:script>
+    </body>
+    </html>
\ No newline at end of file
diff --git a/grails-app/views/landingPageAdmin/editSelections.gsp b/grails-app/views/landingPageAdmin/editSelections.gsp
index 130d88e24..795ec1d85 100644
--- a/grails-app/views/landingPageAdmin/editSelections.gsp
+++ b/grails-app/views/landingPageAdmin/editSelections.gsp
@@ -1,3 +1,4 @@
+<%@ page import="au.org.ala.volunteer.LabelColour" %>
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -20,12 +21,12 @@
 
             <th><span>
                 Select a Category filter for tags
-                <g:select name="tagCategory" from="${labelCats}" class="selectpicker form-control" noSelection="${['all': '--- All Categories ---']}"></g:select>
+                <g:select name="tagCategory" from="${labelCats}" class="selectpicker form-control" noSelection="${['all': '--- All Categories ---']}"/>
             </span></th>
             <th><span>
                 Select Tag
                 <g:select name="tag" from="${labels}" optionKey="id" class="selectpicker form-control"
-                          optionValue="value"  data-live-search="true"></g:select></span></th>
+                          optionValue="value" data-live-search="true"/></span></th>
             <th/>
 
             <th><g:actionSubmit class="save btn btn-primary" action="saveProjectLabels"
@@ -35,9 +36,10 @@
     </table>
 
     <div id="labels">
-        <b>Selected tags:</b>
+        <b>Selected tags:</b><br/>
         <g:each in="${landingPageInstance.label}" var="l">
-            <span> ${l.value} <i class="fa fa-times-circle delete-label" data-label-id="${l.id}"></i> </span>
+            <g:set var="labelClassName" value="${l.category.labelColour ?: 'base'}"/>
+            <span class="label label-${labelClassName}"> ${l.category.name}/${l.value} <i class="fa fa-times-circle delete-label" data-label-id="${l.id}"></i> </span>
         </g:each>
     </div>
 </g:form>
@@ -50,13 +52,14 @@
                 type: 'GET',
                 dataType: 'json',
                 cache: false,
-                url: '/landingPageAdmin/filterLabelCategory?category=' + selectedCategory,
+                url: '${createLink(controller: "landingPageAdmin", action: "filterLabelCategory")}?category=' + selectedCategory,
+                //url: '/landingPageAdmin/filterLabelCategory?category=' + selectedCategory,
                 success: function (data) {
 
                    if (data) {
                        $('#tag option').remove();
                        for (var o in data) {
-                            if (data[o].value != undefined) {
+                            if (data[o].value !== undefined) {
                                 $('#tag').append('<option value="' + data[o].id + '">' + ("" + data[o].value) + '</option>');
                             }
                         }
@@ -79,7 +82,8 @@
                 type: 'POST',
                 dataType: 'json',
                 cache: false,
-                url: '/landingPageAdmin/deleteLabel?selectedLabelId=' + labelIdToRemove + '&landingPageId=' + landingPageId,
+                url: '${createLink(controller: "landingPageAdmin", action: "deleteLabel")}?selectedLabelId=' + labelIdToRemove + '&landingPageId=' + landingPageId,
+                //url: '/landingPageAdmin/deleteLabel?selectedLabelId=' + labelIdToRemove + '&landingPageId=' + landingPageId,
                 success: function (data) {
                     var t = $(e.target);
                     var p = t.parent("span");
@@ -91,8 +95,7 @@
         }
 
         $('#labels').on('click', 'i.delete-label', onDeleteLabelClick);
-
-    })
+    });
 
 </asset:script>
 
diff --git a/grails-app/views/layouts/digivol-landingPage.gsp b/grails-app/views/layouts/digivol-landingPage.gsp
index 245a76583..c247e1a78 100644
--- a/grails-app/views/layouts/digivol-landingPage.gsp
+++ b/grails-app/views/layouts/digivol-landingPage.gsp
@@ -39,11 +39,11 @@
 
                 <div class="col-md-9">
                     <div class="panel panel-default subpanel">
-                        <div class="panel-heading text-right" >
+                        <div class="panel-heading text-right" style="padding-bottom: 25px;">
                             <h4 class="pull-left">${landingPageInstance.title} - <g:pageProperty name="page.pageTitle"/></h4>
 
                             <div class="btn-group">
-                                <g:pageProperty name="page.admi`nButtonBar"/>
+                                <g:pageProperty name="page.adminButtonBar"/>
                             </div>
                         </div>
                         <div class="panel-body">
diff --git a/grails-app/views/layouts/digivol-reporting.gsp b/grails-app/views/layouts/digivol-reporting.gsp
new file mode 100644
index 000000000..c4fb2464d
--- /dev/null
+++ b/grails-app/views/layouts/digivol-reporting.gsp
@@ -0,0 +1,64 @@
+
+<g:applyLayout name="${grailsApplication.config.getProperty('ala.skin', String)}">
+<head>
+    <title><cl:pageTitle title="DigiVol Reporting"/></title>
+    <g:layoutHead/>
+</head>
+
+<body class="admin">
+
+<cl:headerContent title="${message(code: 'admin.reporting.label', default: 'DigiVol Reporting')}" selectedNavItem="bvpadmin">
+    <%
+        pageScope.crumbs = [
+                [link: createLink(controller: 'admin', action: 'index'), label: 'Administration']
+        ]
+    %>
+</cl:headerContent>
+
+<div class="container">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-md-3">
+                    <ul class="list-group">
+                        <cl:settingsMenuItem
+                                href="${createLink(controller: 'report', action: 'reportHistory')}"
+                                title="Report History"/>
+
+                        <cl:ifSiteAdmin>
+                            <cl:settingsMenuItem
+                                    href="${createLink(controller: 'report', action: 'userReport')}"
+                                    title="User Reporting"/>
+
+                            <cl:settingsMenuItem
+                                    href="${createLink(controller: 'admin', action: 'currentUsers')}"
+                                    title="Current Online Users"
+                                    target="_blank"/>
+                        </cl:ifSiteAdmin>
+
+                        <cl:settingsMenuItem
+                                href="${createLink(controller: 'report', action: 'projectSummary')}"
+                                title="Project Summary Report"/>
+                    </ul>
+                </div>
+
+                <div class="col-md-9">
+                    <div class="panel panel-default subpanel">
+                        <div class="panel-heading text-right" style="padding-bottom: 25px;">
+                            <h4 class="pull-left"><g:pageProperty name="page.pageTitle"/></h4>
+
+                            <div class="btn-group">
+                                <g:pageProperty name="page.adminButtonBar"/>
+                            </div>
+                        </div>
+                        <div class="panel-body">
+                            <g:layoutBody/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</g:applyLayout>
\ No newline at end of file
diff --git a/grails-app/views/project/editGeneralSettings.gsp b/grails-app/views/project/editGeneralSettings.gsp
index 291ae6e18..1a1ba840f 100644
--- a/grails-app/views/project/editGeneralSettings.gsp
+++ b/grails-app/views/project/editGeneralSettings.gsp
@@ -1,4 +1,5 @@
 <%@ page import="au.org.ala.volunteer.Project" %>
+<%@ page import="au.org.ala.volunteer.LabelColour" %>
 <!DOCTYPE html>
 <html>
 <head>
@@ -120,7 +121,8 @@
 
         <div id="labels" class="col-md-offset-3 col-md-9">
             <g:each in="${sortedLabels}" var="l">
-                <span class="label ${labelColourMap[l.category]}" title="${l.category}">
+                <g:set var="labelColourName" value="${l.category.labelColour ?: 'base'}"/>
+                <span class="label label-${labelColourName}" title="${l.category.name}">
                     ${l.value} <i class="fa fa-times-circle delete-label" data-label-id="${l.id}"></i>
                 </span>
             </g:each>
@@ -215,15 +217,18 @@
         var baseUrl = "${createLink(controller: 'institution', action: 'index')}";
 
         labelAutocomplete("#label", "${createLink(controller: 'project', action: 'newLabels', id: projectInstance.id)}", '', function(item) {
+            console.log(item);
             //var obj = JSON.parse(item);
             var updateUrl = "${createLink(controller: 'project', action: 'addLabel', id: projectInstance.id)}";
             //showSpinner();
+            var labelColour = item.category.labelColour === undefined ? 'base' : item.category.labelColour;
             $.ajax(updateUrl, {type: 'POST', data: { labelId: item.id }})
                 .done(function(data) {
                     $( "<span>" )
                         .addClass("label")
-                        .addClass(labelColourMap[item.category])
-                        .attr("title", item.category)
+                        //.addClass(labelColourMap[item.category])
+                        .addClass("label-" + labelColour  )
+                        .attr("title", item.category.name)
                         .text(item.value)
                         .append(
                         $( "<i>" )
diff --git a/grails-app/views/report/projectSummary.gsp b/grails-app/views/report/projectSummary.gsp
new file mode 100644
index 000000000..8581f187f
--- /dev/null
+++ b/grails-app/views/report/projectSummary.gsp
@@ -0,0 +1,100 @@
+<%@ page import="au.org.ala.volunteer.ReportRequestService" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="layout" content="digivol-reporting"/>
+    <title><g:message code="admin.project.summary.label" default="Project Summary Report"/></title>
+    <asset:stylesheet src="bootstrap-select.css" />
+    <asset:stylesheet src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css" />
+</head>
+
+<body class="admin">
+
+<content tag="pageTitle"><g:message code="admin.project.summary.label" default="Project Summary Report"/></content>
+
+<div class="panel panel-default" style="margin-top: 5px;">
+    <div class="panel-body">
+        <p>This report provides a summary outlook of all projects you have access to. <br/>
+            Includes task counts, transcribe and validation counts, expedition type, percentage complete, date started
+            and finished, and average transcription time.</p>
+    </div>
+</div>
+
+<g:form action="requestProjectSummaryReport" class="form-horizontal" method="POST">
+    <div class="form-group">
+        <div class="col-sm-offset-3 col-sm-8 input-group">
+            <g:actionSubmit class="save btn btn-primary" action="requestProjectSummaryReport"
+                            value="${message(code: 'admin.report.button.label', default: 'Generate Report')}"/>
+        </div>
+    </div>
+</g:form>
+
+<div class="row" style="padding-top: 20px;">
+    <div class="col-md-12">
+        <h4>Your Previous Reports</h4>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12 table-responsive">
+        <table class="table table-striped table-hover" id="report-table">
+            <thead>
+            <tr>
+                <th>Date Requested</th>
+                <th>Status</th>
+            </tr>
+            </thead>
+            <tbody>
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<asset:script type="text/javascript" asset-defer="">
+$(function () {
+    function loadReportData() {
+        const reportName = '${ReportRequestService.REPORT_NAME_PROJECT_SUMMARY}';
+        const url = "${createLink(controller: 'report', action: 'getReports')}?reportName=" + reportName;
+        $.get({
+            url: url,
+            dataType: 'json',
+            cache: false
+        }).done(function(data) {
+            updateReportTable(data);
+        });
+    }
+
+    function updateReportTable(data) {
+        var tableData = [];
+
+        $.each(data, function(idx, report) {
+
+            var tableRow = "<tr>";
+            tableRow += "<td><span title='Parameters: " + JSON.stringify(report.params) + "'>" + report.dateCreated + "</span></td>";
+            if (report.dateCompleted === null || report.dateCompleted === undefined) {
+                tableRow += "<td>Pending</td>";
+            } else if (report.filepath !== undefined && report.dateArchived === null) {
+                tableRow += "<td><a href='" + report.filepath + "'>Download</a></td>";
+            } else {
+                tableRow += "<td>Archived</td>";
+            }
+
+            tableRow += "</tr>";
+            tableData.push(tableRow);
+        });
+
+        if (data === null || data.length === 0) {
+            tableData.push("<tr><td colspan='2'>No reports found.</td></tr>");
+        }
+
+        $('#report-table').find('tbody').html(tableData.join(""));
+    }
+
+    loadReportData();
+    var intervalId = window.setInterval(function(){
+        loadReportData();
+    }, 60000);
+});
+</asset:script>
+</body>
+</html>
\ No newline at end of file
diff --git a/grails-app/views/report/reportHistory.gsp b/grails-app/views/report/reportHistory.gsp
new file mode 100644
index 000000000..b451a4c6a
--- /dev/null
+++ b/grails-app/views/report/reportHistory.gsp
@@ -0,0 +1,127 @@
+<%@ page import="au.org.ala.volunteer.DateConstants" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="layout" content="digivol-reporting"/>
+    <title><g:message code="admin.user.report.label" default="User Reporting"/></title>
+    <asset:stylesheet src="bootstrap-select.css" />
+
+</head>
+
+<body class="admin">
+    <content tag="pageTitle"><g:message code="admin.report.history.label" default="Report History"/></content>
+
+    <div class="row">
+    <cl:ifSiteAdmin>
+        <div class="col-md-3">
+            <g:select class=" form-control statusFilter" name="statusFilter" from="${[[key: 'all', value: 'All Reports'], [key: 'active', value: 'Available Reports'], [key: 'archived', value: 'Archived Reports']]}"
+                      optionKey="key"
+                      optionValue="value"
+                      value="${params?.statusFilter}"
+                      noSelection="['':'- Filter by Status -']" />
+        </div>
+    </cl:ifSiteAdmin>
+        <div class="col-md-3">
+            <g:select class="form-control reportFilter" name="reportFilter" from="${reportFilterList}"
+                      value="${params?.reportFilter}"
+                      noSelection="['':'- Filter by Report -']" />
+        </div>
+        <div class="col-md-3">
+            <a class="btn btn-default bs3"
+               href="${createLink(controller: 'report', action: 'reportHistory')}">Reset</a>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6" style="margin-top: 20px;margin-left: 5px;">
+            <small>${reportCount ?: 0} Reports found.</small>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12 table-responsive">
+            <table class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <g:sortableColumn property="dateCreated"
+                                      title="${message(code: 'report.date.created.label', default: 'Date/Time Requested')}"
+                                      params="${params}"/>
+                    <g:sortableColumn property="reportName"
+                                      title="${message(code: 'report.report.name.label', default: 'Report Name')}"
+                                      params="${params}"/>
+                    <g:sortableColumn property="requestUser"
+                                      title="${message(code: 'report.request.user.label', default: 'Requested By')}"
+                                      params="${params}"/>
+                    <g:sortableColumn property="dateCompleted"
+                                      title="${message(code: 'report.date.completed.label', default: 'Date/Time Completed')}"
+                                      params="${params}"/>
+                    <th>
+                        Status
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                    <g:each in="${reportList}" status="i" var="reportInstance">
+                    <tr>
+                        <td>${formatDate(date: reportInstance.report.dateCreated, format: DateConstants.DATE_TIME_FORMAT)}</td>
+                        <td>${reportInstance.report.reportName}</td>
+                        <td>${reportInstance.report.requestUser.displayName}</td>
+                        <td>${formatDate(date: reportInstance.report.dateCompleted, format: DateConstants.DATE_TIME_FORMAT)}</td>
+                        <g:set var="reportStatus" value="${reportInstance.report.getStatus()}"/>
+                        <g:if test="${reportStatus == 'Download'}">
+                        <td><a href="${reportInstance.filepath}">${reportInstance.report.getStatus()}</a></td>
+                        </g:if>
+                        <g:else>
+                        <td>${reportInstance.report.getStatus()}</td>
+                        </g:else>
+                    </tr>
+                    </g:each>
+                </tbody>
+            </table>
+            <g:if test="${reportCount > 25}">
+            <div class="pagination">
+                <g:paginate total="${institutionInstanceCount ?: 0}" params="${params}"/>
+            </div>
+            </g:if>
+        </div>
+    </div>
+<asset:script type="text/javascript">
+
+    jQuery(function($) {
+        $('.statusFilter').change(function() {
+            let filter = $(this).val();
+            let url = "${createLink(controller: 'report', action: 'reportHistory').encodeAsJavaScript()}";
+            const p = new URLSearchParams(window.location.search);
+
+            let reportFilter = p.get('reportFilter');
+
+            if (reportFilter !== "" && reportFilter !== null && reportFilter !== undefined) {
+                url += "?reportFilter=" + reportFilter + "&statusFilter=" + filter;
+            } else {
+                url += "?statusFilter=" + filter;
+            }
+
+            window.location = url;
+        });
+
+        $('.reportFilter').change(function() {
+            let filter = $(this).val();
+            let url = "${createLink(controller: 'report', action: 'reportHistory').encodeAsJavaScript()}";
+            const p = new URLSearchParams(window.location.search);
+
+            let statusFilter = p.get('statusFilter');
+
+            if (statusFilter !== "" && statusFilter !== undefined) {
+                url += "?statusFilter=" + statusFilter  + "&reportFilter=" + filter;
+            } else {
+                url += "?reportFilter=" + filter;
+            }
+
+            window.location = url;
+        });
+    });
+
+</asset:script>
+</body>
+</html>
\ No newline at end of file
diff --git a/grails-app/views/report/userReport.gsp b/grails-app/views/report/userReport.gsp
new file mode 100644
index 000000000..6e4c259ff
--- /dev/null
+++ b/grails-app/views/report/userReport.gsp
@@ -0,0 +1,170 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="layout" content="digivol-reporting"/>
+    <title><g:message code="admin.user.report.label" default="User Reporting"/></title>
+    <asset:stylesheet src="bootstrap-select.css" />
+    <asset:stylesheet src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css" />
+    <style>
+    .label-button {
+        cursor: pointer;
+        font-size: 1.2em;
+    }
+
+    .today, .active {
+        font-weight: bold;
+    }
+
+    .prev, .next, .day, .month, .year, .today, .datepicker-switch {
+        cursor: pointer;
+    }
+
+    .loader {
+        border: 4px solid #e0e0e0; /* Light grey */
+        border-top: 4px solid #000000;
+        border-radius: 50%;
+        width: 2.475rem;
+        height: 2.475rem;
+        animation: spin 1s linear infinite;
+        }
+
+    @keyframes spin {
+        0% { transform: rotate(0deg); }
+        100% { transform: rotate(360deg); }
+    }
+
+    .float-right {
+        position: absolute;
+        z-index: 2;
+        display: block;
+        /*line-height: 2.375rem;*/
+        text-align: center;
+        pointer-events: none;
+        color: #aaa;
+        right:40px;
+        top: 4px;
+    }
+    </style>
+</head>
+
+<body class="admin">
+
+    <content tag="pageTitle"><g:message code="admin.user.report.label" default="User Reporting"/></content>
+
+    <div class="panel panel-default" style="margin-top: 5px;">
+        <div class="panel-body">
+            <p>This report has two flavours: Filtered by tag and all users.</p>
+            <p><b>Filtered by tag:</b> This report collates users who are tagged by the selected tag and who
+            transcribed tasks between the provided start and end dates.</p>
+            <p><b>All users:</b> Due to the number of users, this report ignores the start and end date parameters and
+            provides a summary of user activity on DigiVol.</p>
+        </div>
+    </div>
+
+    <g:form action="requestUserReport" class="form-horizontal" method="POST">
+        <div class="form-group">
+            <label for="dateSelect" class="col-md-3 control-label">Date Range*</label>
+            <div class="col-md-8 input-daterange input-group" id="datepicker">
+                <input type="text" class="input-sm col-sm-3 form-control" value="${defaultStartDate}" name="dateStart" />
+                <span class="input-group-addon">to</span>
+                <input type="text" class="input-sm col-sm-3 form-control" value="${defaultEndDate}" name="dateEnd" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="labelFilter" class="col-md-3 control-label">Filter by User Tag</label>
+            <div class="col-md-8 input-group">
+                <g:select name="labelFilter"
+                          from="${userLabelList}"
+                          optionKey="id"
+                          class="input-sm form-control col-md-9"
+                          optionValue="value"
+                          noSelection="['':'- Filter by Tag -']"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-offset-3 col-sm-8 input-group">
+                <g:actionSubmit class="save btn btn-primary" action="requestUserReport"
+                                value="${message(code: 'admin.report.button.label', default: 'Generate Report')}"/>
+            </div>
+        </div>
+    </g:form>
+
+    <div class="row" style="padding-top: 20px;">
+        <div class="col-md-12">
+            <h4>Your Previous Reports</h4>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12 table-responsive">
+            <table class="table table-striped table-hover" id="report-table">
+                <thead>
+                    <tr>
+                        <th>Date Requested</th>
+                        <th>Status</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+<asset:script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js" asset-defer=""/>
+<asset:script type="text/javascript" asset-defer="">
+$(function () {
+    $('.input-daterange').datepicker({
+        format: "dd/mm/yyyy",
+        autoclose: true,
+        todayBtn: true,
+        orientation: "bottom auto",
+        todayHighlight: true,
+        endDate: "${defaultEndDate}"
+    });
+
+    function loadReportData() {
+        const reportName = 'user';
+        const url = "${createLink(controller: 'report', action: 'getReports')}?reportName=" + reportName;
+        $.get({
+            url: url,
+            dataType: 'json',
+            cache: false
+        }).done(function(data) {
+            updateReportTable(data);
+        });
+    }
+
+    function updateReportTable(data) {
+        var tableData = [];
+
+        $.each(data, function(idx, report) {
+
+            var tableRow = "<tr>";
+            tableRow += "<td><span title='Parameters: " + JSON.stringify(report.params) + "'>" + report.dateCreated + "</span></td>";
+            if (report.dateCompleted === null || report.dateCompleted === undefined) {
+                tableRow += "<td>Pending</td>";
+            } else if (report.filepath !== undefined && report.dateArchived === null) {
+                tableRow += "<td><a href='" + report.filepath + "'>Download</a></td>";
+            } else {
+                tableRow += "<td>Archived</td>";
+            }
+
+            tableRow += "</tr>";
+            tableData.push(tableRow);
+        });
+
+        if (data === null || data.length === 0) {
+            tableData.push("<tr><td colspan='2'>No reports found.</td></tr>");
+        }
+
+        $('#report-table').find('tbody').html(tableData.join(""));
+    }
+
+    loadReportData();
+    var intervalId = window.setInterval(function(){
+        loadReportData();
+    }, 60000);
+});
+</asset:script>
+</body>
+</html>
\ No newline at end of file
diff --git a/grails-app/views/user/adminList.gsp b/grails-app/views/user/adminList.gsp
new file mode 100644
index 000000000..ae6507bab
--- /dev/null
+++ b/grails-app/views/user/adminList.gsp
@@ -0,0 +1,193 @@
+<%@ page import="au.org.ala.volunteer.Institution" %>
+<%@ page import="au.org.ala.volunteer.LabelColour" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}"/>
+    <g:set var="entityName" value="${message(code: 'user.admin.label', default: 'User')}"/>
+    <title><g:message code="default.list.label" args="[entityName]"/></title>
+
+    <style>
+        .label-button {
+            cursor: pointer;
+            font-size: 1.2em;
+        }
+    </style>
+</head>
+
+<body class="admin">
+
+<cl:headerContent title="${message(code: 'default.users.admin.label', default: 'Manage Users')}" selectedNavItem="bvpadmin">
+    <%
+        pageScope.crumbs = [
+                [link: createLink(controller: 'admin'), label: message(code: 'default.admin.label', default: 'Administration')]
+        ]
+
+    %>
+
+
+</cl:headerContent>
+
+<div class="container">
+    <div class="panel panel-default">
+        <div class="panel-body">
+
+            %{--                    TODO Convert to user search --}%
+            <div class="row">
+                <div class="col-md-3">
+
+                    <g:select class="form-control labelFilter" name="labelFilter" from="${userLabels}"
+                              optionKey="id"
+                              optionValue="value"
+                              value="${params?.labelFilter}"
+                              noSelection="['':'- Filter by Tag -']" />
+
+                </div>
+                <div class="col-md-3">
+                    <input type="text" id="searchbox" class="form-control" value="${params.q}" placeholder="Search by name or email..."/>
+                </div>
+                <div class="col-md-3">
+                    <a class="btn btn-default bs3"
+                        href="${createLink(controller: 'user', action: 'adminList')}">Reset</a>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-6" style="margin-top: 20px;margin-left: 5px;">
+                    ${userInstanceTotal ?: 0} ${entityName}s found.
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-12 table-responsive">
+                    <table class="table table-striped table-hover">
+                        <thead>
+                        <tr>
+                            <g:sortableColumn property="lastName"
+                                              title="${message(code: 'user.lastName.label', default: 'Last Name')}"
+                                              params="${params}"/>
+                            <g:sortableColumn property="firstName"
+                                              title="${message(code: 'user.firstName.label', default: 'First Name')}"
+                                              params="${params}"/>
+                            <th>${message(code: 'user.tag.label', default: 'Labels')}</th>
+%{--                            <g:sortableColumn property="labels"--}%
+%{--                                              title="${message(code: 'user.tag.label', default: 'Labels')}"--}%
+%{--                                              params="${params}"/>--}%
+                            <g:sortableColumn style="text-align: center" property="transcribedCount"
+                                              title="${message(code: 'user.recordsTranscribedCount.label', default: 'Tasks completed')}"
+                                              params="${[q: params.q]}"/>
+                            <g:sortableColumn style="text-align: center" property="validatedCount"
+                                              title="${message(code: 'user.transcribedValidatedCount.label', default: 'Tasks validated')}"
+                                              params="${[q: params.q]}"/>
+                            <g:sortableColumn style="text-align: center" property="created"
+                                              title="${message(code: 'user.created.label', default: 'A volunteer since')}"
+                                              params="${[q: params.q]}"/>
+                            <th/>
+                        </tr>
+
+                        </thead>
+                        <tbody>
+                        <g:each in="${userInstanceList}" status="i" var="userInstance">
+                            <tr class="${(i % 2) == 0 ? 'even' : 'odd'}">
+
+
+                                <td>${fieldValue(bean: userInstance, field: "lastName")}</td>
+
+                                <td>${fieldValue(bean: userInstance, field: "firstName")}</td>
+
+                                <td>
+                                    <g:each in="${userInstance.labels}" var="l">
+                                        <g:set var="labelClassName" value="${l.category.labelColour ?: 'base'}"/>
+                                        <span class="label label-${labelClassName}">${l.value}</span>
+%{--                                        <span class="label label-base">${userLabel.value}</span>--}%
+                                    </g:each>
+                                </td>
+
+                                <td class="bold text-center">${fieldValue(bean: userInstance, field: "transcribedCount")}</td>
+
+                                <td class="bold text-center">${userInstance?.validatedCount}</td>
+
+                                <td class="text-center"><g:formatDate format="yyyy-MM-dd" date="${userInstance.created}"/></td>
+
+                                <td>
+                                    <i class="fa fa-edit label-button doLink"
+                                       data-href="${createLink(controller: 'user', action: 'edit', id: userInstance.id)}"
+                                       title="Edit User"></i>
+
+                                    <i class="fa fa-id-card-o label-button doLink" title="Display Notebook for User"
+                                       data-href="${createLink(controller: 'user', action: 'show', id: userInstance.id)}"></i>
+                                </td>
+                            </tr>
+                        </g:each>
+                        </tbody>
+                    </table>
+                    <g:if test="${userInstanceTotal > 20}">
+                    <div class="pagination">
+                        <g:paginate total="${userInstanceTotal ?: 0}" params="${params}"/>
+                    </div>
+                    </g:if>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<asset:script type="text/javascript">
+$(function($) {
+
+    $('.doLink').click(function(event) {
+        event.stopPropagation(); // Prevent row click event from firing
+        var $this = $(this);
+        var href = $this.data('href');
+        goLink(href);
+    });
+
+    function goLink(href) {
+        if (href !== undefined) {
+            document.location = href;
+        }
+    }
+
+    $('.labelFilter').change(function() {
+        doSearch();
+    });
+
+    $("#searchbox").keydown(function(e) {
+        if (e.keyCode === 13) {
+            doSearch();
+        }
+    });
+
+    function doSearch() {
+        console.log(window.location.search);
+        const params = new URLSearchParams(window.location.search);
+        let statulabelFiltersFilter = params.get('labelFilter');
+        let q = params.get('q');
+
+        var labelFilter = $('.labelFilter').val();
+        q = encodeURIComponent($('#searchbox').val());
+        console.log(q);
+
+        let hasParams = false;
+        let url = "${createLink(controller: 'user', action: 'adminList')}?";
+
+        if (labelFilter) {
+            url += "labelFilter=" + labelFilter;
+            if (!hasParams) hasParams = true;
+        }
+        if (q) {
+            if (hasParams) {
+                url += "&";
+            }
+            url += "q=" + q;
+        }
+
+        console.log(url);
+        window.location = url;
+    }
+
+});
+</asset:script>
+</body>
+</html>
diff --git a/grails-app/views/user/edit.gsp b/grails-app/views/user/edit.gsp
index 125c33bbf..ba3911447 100644
--- a/grails-app/views/user/edit.gsp
+++ b/grails-app/views/user/edit.gsp
@@ -1,19 +1,24 @@
 <%@ page import="au.org.ala.volunteer.User" %>
+<%@ page import="au.org.ala.volunteer.LabelColour" %>
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="layout" content="${grailsApplication.config.getProperty('ala.skin', String)}"/>
     <g:set var="entityName" value="${message(code: 'user.label', default: 'User')}"/>
     <title><g:message code="default.edit.label" args="[entityName]"/></title>
+    <asset:stylesheet src="bootstrap-select.css" />
+    <asset:javascript src="bootstrap-select.js" asset-defer="" />
 </head>
 
 <body class="admin">
 
 <cl:headerContent crumbLabel="Edit User"
-                  title="Edit User ${userInstance.userId} - ${userDetails?.displayName} (${userDetails?.userName})" selectedNavItem="bvpadmin">
+                  title="Edit User" selectedNavItem="bvpadmin">
     <%
-        pageScope.crumbs = []
-        pageScope.crumbs << [link: createLink(controller: 'user', action: 'show', id: userInstance.id), label: userInstance?.displayName]
+        pageScope.crumbs = [
+            [link: createLink(controller: 'admin'), label: message(code: 'default.admin.label', default: 'Administration')],
+            [link: createLink(controller: 'user', action: 'adminList'), label: message(code: 'default.users.admin.label', default: 'Manage Users')]
+        ]
     %>
 </cl:headerContent>
 
@@ -30,15 +35,15 @@
 
                     <g:form method="post" class="form-horizontal">
                         <g:hiddenField name="id" value="${userInstance?.id}"/>
-                        <g:hiddenField name="version" value="${userInstance?.version}"/>
-                        <div class="form-group ${hasErrors(bean: userInstance, field: 'created', 'has-error')}">
-                            <label class="control-label col-md-3" for="created"><g:message code="user.created.label" default="Created"/></label>
-                            <div class="col-md-6 grails-date">
-                                <g:datePicker name="created" precision="day" value="${userInstance?.created}"/>
+
+                        <div class="form-group">
+                            <label for="displayName" class="control-label col-md-3"><g:message code="user.displayName.label" default="Name"/></label>
+                            <div class="col-md-6">
+                                <g:textField name="displayName" class="form-control" disabled="disabled"
+                                             value="${fieldValue(bean: userInstance, field: 'displayName')}"/>
                             </div>
                         </div>
 
-
                         <div class="form-group  ${hasErrors(bean: userInstance, field: 'transcribedCount', 'has-error')}">
                             <label for="transcribedCount" class="control-label col-md-3">
                                 <g:message code="user.transcribedCount.label" default="Transcribed Count"/>
@@ -64,21 +69,11 @@
                                 <g:message code="user.userId.label" default="User Id"/>
                             </label>
                             <div class="col-md-6">
-                                <g:textField name="userId" class="form-control"
+                                <g:textField name="transcribedCount" class="form-control" disabled="disabled"
                                              value="${fieldValue(bean: userInstance, field: 'userId')}"/>
                             </div>
                         </div>
 
-                        <div class="form-group  ${hasErrors(bean: userInstance, field: 'displayName', 'has-error')}">
-                            <label for="displayName" class="control-label col-md-3">
-                                <g:message code="user.displayName.label" default="Display Name"/>
-                            </label>
-                            <div class="col-md-6">
-                                <g:textField name="displayName" class="form-control"
-                                             value="${fieldValue(bean: userInstance, field: 'displayName')}"/>
-                            </div>
-                        </div>
-
                         <div class="form-group  ${hasErrors(bean: userInstance, field: 'email', 'has-error')}">
                             <label for="email" class="control-label col-md-3">
                                 <g:message code="user.email.label" default="Email Address"/>
@@ -89,24 +84,7 @@
                             </div>
                         </div>
 
-                        <div class="form-group  ${hasErrors(bean: userInstance, field: 'roles', 'has-error')}">
-                            <label for="roles" class="control-label col-md-3">
-                                <g:message code="user.roles.label" default="Roles"/>
-                            </label>
-                            <div class="col-md-3">
-                                <ul id="roles" class="form-control-static">
-                                    <g:each var="role" in="${roles}">
-                                        <li>${role.role.name}
-                                        (${role.project == null ? '<All Projects>' : role.project.featuredLabel})
-                                        </li>
-                                    </g:each>
-                                </ul>
-                                <a class="btn btn-sm btn-default"
-                                   href="${createLink(controller: 'admin', action: 'manageUserRoles', params: [userid: userInstance.id])}">Edit roles</a>
-                            </div>
-                        </div>
-
-                        <div class="form-group">
+                        <div class="form-group" style="padding-bottom: 20px;">
                             <div class="col-md-offset-3 col-md-9">
                                 <g:actionSubmit class="save btn btn-primary" action="update"
                                                 value="${message(code: 'default.button.update.label', default: 'Update')}"/>
@@ -116,17 +94,89 @@
                             </div>
                         </div>
                     </g:form>
+
+                        <div class="well form-horizontal" style="padding: 10px !important;">
+                            <div class="form-group">
+                                <label for="roles" class="control-label col-md-3">
+                                    <g:message code="user.roles.label" default="Roles"/>
+                                    <a class="btn btn-link"
+                                       href="${createLink(controller: 'admin', action: 'manageUserRoles', params: [userid: userInstance.id])}"
+                                       title="Edit User Roles">
+                                        <i class="fa fa-users" style="font-size: 1.2em;"></i>
+                                    </a>
+                                </label>
+
+                                <div class="col-md-6">
+                                    <ul id="roles" class="form-control-static">
+                                        <g:each var="role" in="${roles}">
+                                            <li>${role.role.name}
+                                            (${role.project == null ? '<All Projects>' : role.project.featuredLabel})
+                                            </li>
+                                        </g:each>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="well" style="padding: 10px !important;">
+                            <g:form method="post" class="form-horizontal">
+                                <g:hiddenField name="id" id="add-label-user-id" value="${userInstance?.id}" />
+                            <div class="form-group">
+                                <label for="label" class="control-label col-md-3">
+                                    <g:message code="user.labels.label" default="Tags"/>
+                                </label>
+                                <div class="col-md-3">
+                                    <g:select name="tag" from="${userLabelList}" optionKey="id" class="selectpicker form-control"
+                                              noSelection="['':'- Select a Tag -']"
+                                              optionValue="value" data-live-search="true"/>
+                                    <div id="labels" style="padding-top: 10px;">
+                                    <g:each in="${userInstance.labels}" var="l">
+                                        <g:set var="labelClassName" value="${l.category.labelColour ?: 'base'}"/>
+                                        <span class="label label-${labelClassName}"> ${l.value} <i class="fa fa-times-circle delete-label" data-label-id="${l.id}"></i> </span>
+                                    </g:each>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <g:actionSubmit class="save btn btn-primary" action="addUserLabel"
+                                                    value="${message(code: 'default.button.save.label', default: 'Add Tag')}"/>
+                                </div>
+                            </div>
+                            </g:form>
+                        </div>
+
+                    </div>
+
+
                 </div>
             </div>
         </div>
     </div>
 </div>
-<asset:script>
-    $(function() {
-        $('.grails-date select').each(function(){
-            $(this).addClass('form-control');
+<asset:script type="text/javascript" asset-defer="">
+$(function() {
+    function onDeleteLabelClick (e) {
+        e.preventDefault();
+        var userId = $('#add-label-user-id').val();
+        var labelIdToRemove = e.target.dataset.labelId
+
+        $.ajax({
+            type: 'POST',
+            dataType: 'json',
+            cache: false,
+            url: '${createLink(controller: "user", action: "deleteLabel")}?selectedLabelId=' + labelIdToRemove + '&userId=' + userId,
+            success: function (data) {
+                var t = $(e.target);
+                var p = t.parent("span");
+                p.remove();
+            },  error: function (jqXHR, textStatus, errorThrown) {
+                console.log('user/deleteLabel: Error - ' + errorThrown);
+            }
         });
-    });
+    }
+
+    $('#labels').on('click', 'i.delete-label', onDeleteLabelClick);
+});
 </asset:script>
 </body>
 </html>
diff --git a/src/main/groovy/au/org/ala/volunteer/DateConstants.groovy b/src/main/groovy/au/org/ala/volunteer/DateConstants.groovy
index e9fa41387..61f2b942d 100644
--- a/src/main/groovy/au/org/ala/volunteer/DateConstants.groovy
+++ b/src/main/groovy/au/org/ala/volunteer/DateConstants.groovy
@@ -2,6 +2,7 @@ package au.org.ala.volunteer
 
 class DateConstants {
 
-    public static String DATE_TIME_FORMAT = "dd MMM yyyy HH:mm:ss";
+    public static String DATE_TIME_FORMAT = "dd MMM yyyy HH:mm:ss"
+    public static String DATE_FORMAT_SHORT = "dd/MM/yyyy"
 
 }
diff --git a/src/main/groovy/au/org/ala/volunteer/LabelColour.groovy b/src/main/groovy/au/org/ala/volunteer/LabelColour.groovy
new file mode 100644
index 000000000..c40a8f3dc
--- /dev/null
+++ b/src/main/groovy/au/org/ala/volunteer/LabelColour.groovy
@@ -0,0 +1,5 @@
+package au.org.ala.volunteer
+
+enum LabelColour {
+    base, green, red, yellow, blue, lightblue, orange, purple, darkgrey
+}
\ No newline at end of file
diff --git a/src/main/groovy/au/org/ala/volunteer/SettingDefinition.groovy b/src/main/groovy/au/org/ala/volunteer/SettingDefinition.groovy
index d2c8e3cf3..0a41db9de 100644
--- a/src/main/groovy/au/org/ala/volunteer/SettingDefinition.groovy
+++ b/src/main/groovy/au/org/ala/volunteer/SettingDefinition.groovy
@@ -15,6 +15,8 @@ public class SettingDefinition<T> {
     public static def EnableWelcomeEmail = new SettingDefinition("welcome.email.enabled", true, "Enable welcome emails to new users.")
     public static def WelcomeEmailSyncText = new SettingDefinition<String>('welcome.email.sync', "Welcome to DigiVol!", "The welcome email content for when the user hasn't yet transcribed a task.")
     public static def WelcomeEmailTranscribedText = new SettingDefinition<String>('welcome.email.transcribed', "Welcome to DigiVol!", "The welcome email content for when the user has transcribed their first task.")
+    public static def ReportCleanupEnabled = new SettingDefinition("report.cleanup.enabled", true, "Enable the cleanup job to delete old reports.")
+    public static def ReportCleanupAge = new SettingDefinition("report.cleanup.ageToDelete", 5, "The age of reports in weeks to delete in the cleanup job")
 
 //    public static def NotificationEmailServerName = new SettingDefinition("notifications.emailServer.name", "localhost", "The name or address of the SMTP server to user to send out notifications")
 //    public static def NotificationEmailServerPort = new SettingDefinition("notifications.emailServer.port", 25, "The port that the SMTP server is listening on")
diff --git a/src/main/resources/db/migration/V202403121033050812__user_labels.sql b/src/main/resources/db/migration/V202403121033050812__user_labels.sql
new file mode 100644
index 000000000..c4bbd6504
--- /dev/null
+++ b/src/main/resources/db/migration/V202403121033050812__user_labels.sql
@@ -0,0 +1,75 @@
+/*
+    Label and user changes
+    By: Chris Dunstall
+*/
+
+create table if not exists label_category (
+    id bigint not null,
+    version bigint not null,
+    name text not null,
+    label_colour varchar default null,
+    is_default boolean not null default false,
+    updated_date timestamp not null default current_timestamp,
+    created_by bigint not null default 0,
+    primary key (id)
+);
+comment on column label_category.id is 'Unique ID (primary key) for label category';
+comment on column label_category.version is 'Record version';
+comment on column label_category.name is 'Name of the label category';
+comment on column label_category.label_colour is 'Selected colour for the label category';
+comment on column label_category.is_default is 'True if a system default category, false if not';
+comment on column label_category.updated_date is 'Date record was last updated';
+comment on column label_category.created_by is 'User who created record';
+
+-- This record will be deleted after migration.
+INSERT INTO label_category VALUES (0, 1, 'placeholder');
+
+alter table label
+    drop constraint label_value_category_key,
+    drop constraint unique_category;
+
+alter table label
+    add column if not exists category_id bigint not null default 0
+        constraint label_category_id_fk references label_category (id),
+    add column if not exists is_default boolean not null default false,
+    add column if not exists updated_date timestamp not null default current_timestamp,
+    add column if not exists created_by bigint not null default 0
+    ;
+comment on column label.category_id is 'Foreign key to label_category';
+comment on column label.is_default is 'True if label is system default label, false if not';
+comment on column label.updated_date is 'Date record was last updated';
+comment on column label.created_by is 'User who created record';
+
+create table if not exists vp_user_labels (
+  user_id bigint not null,
+  label_id bigint not null,
+  primary key (user_id, label_id),
+  foreign key (user_id) references vp_user (id),
+  foreign key (label_id) references label (id)
+);
+comment on column vp_user_labels.user_id is 'User for user label';
+comment on column vp_user_labels.label_id is 'Label for user label';
+
+
+/* Migrate old categories to new table */
+DROP TABLE IF EXISTS category_temp;
+CREATE TABLE category_temp (
+    category TEXT
+);
+
+INSERT INTO category_temp (category)
+    SELECT DISTINCT category FROM label;
+
+INSERT INTO label_category (id, VERSION, name, created_by)
+    SELECT NEXTVAL('hibernate_sequence'), 0, category, 0 FROM category_temp
+    ON CONFLICT DO NOTHING;
+
+DROP TABLE category_temp;
+
+UPDATE label SET category_id = label_category.id
+  FROM label_category
+ WHERE label_category.name = label.category;
+
+ALTER TABLE label ALTER COLUMN category DROP NOT NULL;
+
+DELETE from label_category WHERE name = 'placeholder';
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V202405141547100417__report_request.sql b/src/main/resources/db/migration/V202405141547100417__report_request.sql
new file mode 100644
index 000000000..bdfc95c01
--- /dev/null
+++ b/src/main/resources/db/migration/V202405141547100417__report_request.sql
@@ -0,0 +1,31 @@
+/*
+    Report generation request table
+    By: Chris Dunstall
+*/
+
+CREATE TABLE if not exists report_request (
+    id BIGINT NOT NULL,
+    version BIGINT NOT NULL,
+    date_created TIMESTAMP NOT NULL default current_timestamp,
+    request_user_id BIGINT NOT NULL,
+    report_name TEXT NOT NULL,
+    date_completed TIMESTAMP NULL,
+    date_archived TIMESTAMP NULL,
+    report_params JSONB NULL,
+    primary key (id),
+    constraint report_queue_id_fk foreign key (request_user_id) references vp_user (id)
+);
+
+COMMENT on TABLE  report_request is 'Request queue for report generation';
+COMMENT ON COLUMN report_request.id IS 'Unique ID (primary key) for report_queue';
+COMMENT ON COLUMN report_request.version IS 'Record version';
+COMMENT ON COLUMN report_request.date_created IS 'Datetime record was created';
+COMMENT ON COLUMN report_request.request_user_id IS 'User creating report queue record';
+COMMENT ON COLUMN report_request.report_name IS 'Name of the report requested';
+COMMENT ON COLUMN report_request.date_completed IS 'Datetime report request was completed';
+COMMENT ON COLUMN report_request.date_archived IS 'Datetime report request was archived';
+COMMENT ON COLUMN report_request.report_params IS 'Parameters for the requested report';
+
+create index if not exists report_request_user_report_name_idx on report_request (request_user_id, report_name);
+create index if not exists report_request_queue_idx on report_request using btree (date_created asc, date_completed);
+
diff --git a/src/main/resources/default-labels.json b/src/main/resources/default-labels.json
index 32b20e269..d1b158621 100644
--- a/src/main/resources/default-labels.json
+++ b/src/main/resources/default-labels.json
@@ -264,7 +264,8 @@
     "Botany",
     "Entomology",
     "Ichthyology"
-  ]
+  ],
+  "user": []
 }
   
   
\ No newline at end of file
diff --git a/src/test/groovy/au/org/ala/volunteer/LabelControllerSpec.groovy b/src/test/groovy/au/org/ala/volunteer/LabelControllerSpec.groovy
index 99e4aa51f..d0bc7ebbc 100644
--- a/src/test/groovy/au/org/ala/volunteer/LabelControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/volunteer/LabelControllerSpec.groovy
@@ -14,18 +14,29 @@ class LabelControllerSpec extends Specification implements ControllerUnitTest<La
 
     def setup() {
         mockDomain(Label)
-        controller.userService = Stub(UserService)
-        controller.userService.isAdmin(_) >> { admin }
+        mockDomain(LabelCategory)
+
+        def userServiceStub = Stub(UserService) {
+            isAdmin() >> admin
+            currentUser >> new User([id: 123L])
+        }
+        controller.userService = userServiceStub
+
+        def labelAdminServiceStub = Stub(LabelAdminService) {
+            isLabelInUse(_) >> true
+            getLabelUsage(_) >> [:]
+        }
+        controller.labelAdminService = labelAdminServiceStub
     }
 
-    def populateValidParams(params) {
+    def populateValidLCParams(params) {
         assert params != null
-        params['category'] = 'category'
-        params['value'] = 'value'
+        params['name'] = 'name'
+        params['updatedDate'] = new Date()
+        params['createdBy'] = 0L
     }
 
     void "Test the index action returns the correct model"() {
-
         when:"The index action is executed"
             controller.index()
 
@@ -34,147 +45,44 @@ class LabelControllerSpec extends Specification implements ControllerUnitTest<La
             model.labelInstanceCount == 0
     }
 
-    void "Test the save action correctly persists an instance"() {
-
-        when:"The save action is executed with an invalid instance"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'POST'
-            def label = new Label()
-            label.validate()
-            controller.save(label)
-
-        then:"The index view is rendered again with the correct model"
-            model.labelInstance!= null
-            view == 'index'
-
-        when:"The save action is executed with a valid instance"
-            response.reset()
-            populateValidParams(params)
-            label = new Label(params)
-
-            controller.save(label)
-
-        then:"A redirect is issued to the show action"
-            response.redirectedUrl == '/admin/label/index'
-            controller.flash.message != null
-            Label.count() == 1
-    }
-
-    void "Test the update action performs an update on a valid domain instance"() {
-        when:"Update is called for a domain instance that doesn't exist"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'PUT'
-            controller.update(null)
-
-        then:"A 404 error is returned"
-            response.redirectedUrl == '/admin/label/index'
-            flash.message != null
-
-
-        when:"An invalid domain instance is passed to the update action"
-            response.reset()
-            def label = new Label()
-            label.validate()
-            controller.update(label)
-
-        then:"The edit view is rendered again with the invalid instance"
-            view == 'index'
-            model.labelInstance == label
-
-        when:"A valid domain instance is passed to the update action"
-            response.reset()
-            populateValidParams(params)
-            label = new Label(params).save(flush: true)
-            controller.update(label)
-
-        then:"A redirect is issues to the show action"
-            response.redirectedUrl == "/admin/label/index"
-            flash.message != null
-    }
-
-    void "Test that the delete action deletes an instance if it exists"() {
-        when:"The delete action is called for a null instance"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'POST'
-            controller.delete(null)
-
-        then:"A 404 is returned"
-            response.redirectedUrl == '/admin/label/index'
-            flash.message != null
-
-        when:"A domain instance is created"
-            response.reset()
-            populateValidParams(params)
-            def label = new Label(params).save(flush: true)
-
-        then:"It exists"
-            Label.count() == 1
-
-        when:"The domain instance is passed to the delete action"
-            controller.delete(label)
-
-        then:"The instance is deleted"
-            Label.count() == 0
-            response.redirectedUrl == '/admin/label/index'
-            flash.message != null
-    }
-
-    void "Test a user without Admin permission cannot save a label"() {
-        given:"The Collaborating service is a spy"
-            def userServiceStub = Stub(UserService) {
-                isAdmin() >> false
-            }
+    def "Test a user without Admin permission cannot save a message"() {
+        given:"The user is not a site admin"
+        def userServiceStub = Stub(UserService) {
+            isAdmin() >> false
+            currentUser >> new User([id: 123L])
+        }
 
         and:"The spy service is set on the controller"
-            controller.userService = userServiceStub
+        controller.userService = userServiceStub
 
         when:"The save action is executed with a valid instance"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'POST'
-            populateValidParams(params)
-            def label = new Label(params)
-            controller.save(label)
-
-        then: "A 403 status is returned (forbidden)"
-            response.status == 403
-    }
+        request.contentType = FORM_CONTENT_TYPE
+        request.method = 'POST'
 
-    void "Test a user without Admin permission cannot update a label"() {
-        given:"The Collaborating service is a spy"
-            def userServiceStub = Stub(UserService) {
-                isAdmin() >> false
-            }
+        controller.saveNewLabel()
 
-        and:"The spy service is set on the controller"
-            controller.userService = userServiceStub
-
-        when:"The update action is executed with a valid instance"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'PUT'
-            def label = new Label(category: 'category', value: 'value').save(flush: true)
-            controller.update(label)
-
-        then: "A 403 status is returned (forbidden)"
-            response.status == 403
+        then: "User is redirected to the home page"
+        view == "/notPermitted"
     }
 
-    void "Test a user without Admin permission cannot delete a label"() {
-        given:"The Collaborating service is a spy"
-            def userServiceStub = Stub(UserService) {
-                isAdmin() >> false
-            }
-
-        and:"The spy service is set on the controller"
-            controller.userService = userServiceStub
-
-        when:"The delete action is executed with a valid instance"
-            request.contentType = FORM_CONTENT_TYPE
-            request.method = 'POST'
-            populateValidParams(params)
-            def label = new Label(params)
-            controller.delete(label)
+    def "Test a category can be created"() {
+        when:"The save action is executed with an invalid instance"
+        request.contentType = FORM_CONTENT_TYPE
+        request.method = 'POST'
+//        def labelCategory = new LabelCategory()
+        controller.saveCategory()
 
-        then: "A 403 status is returned (forbidden)"
-            response.status == 403
+        then:"The index view is rendered again with the correct model"
+        view == '/label/createCategory'
+
+//        when:"The save action is executed with a valid instance"
+//        response.reset()
+//        populateValidLCParams(params)
+////        labelCategory = new LabelCategory(params as Map)
+//        controller.saveCategory()
+//
+//        then:"A redirect is issued to the category action"
+//        response.redirectedUrl == '/admin/label/index'
+//        controller.flash.message != null
     }
 }