diff --git a/backend/common/services/sendgrid.js b/backend/common/services/sendgrid.js
index 1f76afa29..604ce21ac 100644
--- a/backend/common/services/sendgrid.js
+++ b/backend/common/services/sendgrid.js
@@ -164,7 +164,10 @@ const SendgridService = {
             header_image_url = event.coverImage.url
         }
         let msg
-        if (event.eventType === EventTypes.physical.id) {
+        if (
+            event.eventType === EventTypes.physical.id ||
+            event.eventType === EventTypes.hybrid.id
+        ) {
             msg = SendgridService.buildTemplateMessage(
                 user.email,
                 global.gConfig.SENDGRID_GENERIC_TEMPLATE,
diff --git a/backend/migrations/28-add-gavel-login-to-registrations.js b/backend/migrations/28-add-gavel-login-to-registrations.js
new file mode 100644
index 000000000..fcb757f75
--- /dev/null
+++ b/backend/migrations/28-add-gavel-login-to-registrations.js
@@ -0,0 +1,26 @@
+const mongoose = require('mongoose')
+const Promise = require('bluebird')
+
+module.exports = {
+    index: 28,
+    name: '28-add-gavel-login-to-registrations',
+    description: 'Add gavel login link to registrations',
+    run: async () => {
+        const addGavelLogin = await mongoose.model('Registration').updateMany(
+            { gavelLogin: { $exists: false } },
+            {
+                $set: {
+                    gavelLogin: '',
+                },
+            },
+        )
+
+        console.log(
+            'Done adding gavel login link to registrations',
+            addGavelLogin.n,
+            addGavelLogin.nModified,
+        )
+
+        return Promise.resolve()
+    },
+}
diff --git a/backend/migrations/index.js b/backend/migrations/index.js
index 771df796c..9eb493d56 100644
--- a/backend/migrations/index.js
+++ b/backend/migrations/index.js
@@ -31,6 +31,7 @@ const migrations = [
     require('./25-add-emailConfig-to-event'),
     require('./26-fix-empty-senderEmail-in-event'),
     require('./27-add-experimental-flag-to-events'),
+    require('./28-add-gavel-login-to-registrations'),
 ]
 
 const run = async () => {
diff --git a/backend/modules/event/controller.js b/backend/modules/event/controller.js
index 88f17f2c5..cc924d480 100644
--- a/backend/modules/event/controller.js
+++ b/backend/modules/event/controller.js
@@ -42,6 +42,15 @@ controller.isEventOnline = id => {
     })
 }
 
+controller.isEventHybrid = id => {
+    Event.findById(id).then(event => {
+        if (event.eventType === 'hybrid') {
+            return true
+        }
+        return false
+    })
+}
+
 controller.getUnapprovedEvents = () => {
     return Event.find({ approved: false })
 }
diff --git a/backend/modules/event/graphql.js b/backend/modules/event/graphql.js
index 67eb99c50..f4c6bcf2f 100644
--- a/backend/modules/event/graphql.js
+++ b/backend/modules/event/graphql.js
@@ -714,7 +714,10 @@ const Resolvers = {
             )
         },
         _eventLocationFormatted: parent => {
-            if (parent.eventType === 'physical') {
+            if (
+                parent.eventType === 'physical' ||
+                parent.eventType === 'hybrid'
+            ) {
                 return `${parent.eventLocation.city}, ${parent.eventLocation.country}`
             }
             return 'Online'
diff --git a/backend/modules/event/model.js b/backend/modules/event/model.js
index 2dd6a5108..a072f21e8 100644
--- a/backend/modules/event/model.js
+++ b/backend/modules/event/model.js
@@ -105,9 +105,12 @@ const EventSchema = new mongoose.Schema({
         type: AddressSchema.mongoose,
         required: [
             function () {
-                return this.eventType === EventTypes.physical.id
+                return (
+                    this.eventType === EventTypes.physical.id ||
+                    this.eventType === EventTypes.hybrid.id
+                )
             },
-            `is required for physical events`,
+            `is required for physical or hydrid events`,
         ],
     },
     tracksEnabled: false,
@@ -326,7 +329,7 @@ const EventSchema = new mongoose.Schema({
         },
         senderName: {
             type: String,
-            default: '',
+            default: 'Junction team',
             trim: true,
             maxLength: 100,
         },
diff --git a/backend/modules/project/controller.js b/backend/modules/project/controller.js
index 8aed6abe9..703df6431 100644
--- a/backend/modules/project/controller.js
+++ b/backend/modules/project/controller.js
@@ -1,3 +1,4 @@
+const _ = require('lodash')
 const yup = require('yup')
 const bcrypt = require('bcrypt')
 const Promise = require('bluebird')
@@ -5,7 +6,6 @@ const { ProjectSchema } = require('@hackjunction/shared')
 const Project = require('./model')
 const { ForbiddenError } = require('../../common/errors/errors')
 const TeamController = require('../team/controller')
-const upload = require('../../misc/gridfs').upload
 
 const controller = {}
 
@@ -60,9 +60,7 @@ controller.createProjectForEventAndTeam = async (event, team, data) => {
 
 controller.updateProjectForEventAndTeam = async (event, team, data) => {
     const schema = yup.object().shape(ProjectSchema(event))
-    console.log('data :>> ', data)
     const validatedData = await schema.validate(data, { stripUnknown: true })
-    console.log('validatedData :>> ', validatedData)
     const projects = await controller.getProjectsByEventAndTeam(
         event._id,
         team._id,
@@ -75,11 +73,11 @@ controller.updateProjectForEventAndTeam = async (event, team, data) => {
 
 controller.generateChallengeLink = async (event, challengeSlug) => {
     const hashed = await bcrypt.hash(challengeSlug, global.gConfig.HASH_SALT)
-    //    console.log('inhere challenge :>> ')
     return {
         hash: hashed,
-        link: `${global.gConfig.FRONTEND_URL}/projects/${event.slug
-            }/challenge/${encodeURIComponent(hashed)}`,
+        link: `${global.gConfig.FRONTEND_URL}/projects/${
+            event.slug
+        }/challenge/${encodeURIComponent(hashed)}`,
     }
 }
 
@@ -88,8 +86,9 @@ controller.generateTrackLink = async (event, trackSlug) => {
     //    console.log('inhere track  :>> ')
     return {
         hash: hashed,
-        link: `${global.gConfig.FRONTEND_URL}/projects/${event.slug
-            }/tracks/${encodeURIComponent(hashed)}`,
+        link: `${global.gConfig.FRONTEND_URL}/projects/${
+            event.slug
+        }/tracks/${encodeURIComponent(hashed)}`,
     }
 }
 
@@ -175,7 +174,14 @@ controller.validateToken = async (event, token) => {
     if (Challengematches.length === 0 && Trackmatches === 0) {
         throw new ForbiddenError('Invalid token')
     }
-    return true
+    console.log('Matches :>> ', Challengematches, Trackmatches)
+    if (
+        (Array.isArray(Challengematches) && Challengematches.length > 0) ||
+        (Array.isArray(Trackmatches) && Trackmatches.length > 0)
+    ) {
+        return true
+    }
+    return false
 }
 
 controller.getFinalProjects = async event => {
@@ -211,3 +217,43 @@ controller.getFinalists = event => {
     return Project.find({ _id: { $in: event.finalists } })
 }
 module.exports = controller
+
+controller.getDataForPartnerReviewing = async (event, user) => {
+    const data = {}
+    const teams = await TeamController.getAllTeamsForEvent(event._id)
+    const projects = await controller.getProjectPreviewsByEvent(event._id)
+    const projectsWithExistingTeamsAndFinal = _.filter(projects, project => {
+        if (project.status === 'final') {
+            const teamFound = _.find(teams, team => {
+                return `${team._id}` === `${project.team}`
+            })
+            if (teamFound) {
+                return project
+            }
+        }
+    })
+
+    if (event.scoreCriteriaSettings.reviewAnyChallenge) {
+        data.projects = projectsWithExistingTeamsAndFinal
+    } else {
+        const challengeOrg = _.find(
+            event.recruiters,
+            recruiter => recruiter.recruiterId === user.sub,
+        )
+        if (challengeOrg) {
+            const challengeData = _.find(
+                event.challenges,
+                challenge => challenge.partner === challengeOrg.organization,
+            )
+            const projectsFilteredByChallenge = _.filter(
+                projectsWithExistingTeamsAndFinal,
+                project => _.includes(project.challenges, challengeData.slug),
+            )
+            data.projects = projectsFilteredByChallenge
+            data.challenge = challengeData
+        } else {
+            data.projects = []
+        }
+    }
+    return data
+}
diff --git a/backend/modules/project/model.js b/backend/modules/project/model.js
index 4b89337ad..53754c608 100644
--- a/backend/modules/project/model.js
+++ b/backend/modules/project/model.js
@@ -125,7 +125,7 @@ ProjectSchema.post('save', async function (doc, next) {
          */
         case ReviewingMethods.gavelPeerReview.id: {
             GavelController.ensureGavelProject(doc)
-            console.log("saved as gavel project")
+            console.log('saved as gavel project')
             break
         }
         default: {
diff --git a/backend/modules/project/routes.js b/backend/modules/project/routes.js
index 8a6c1d9c9..ca8a9b860 100644
--- a/backend/modules/project/routes.js
+++ b/backend/modules/project/routes.js
@@ -1,5 +1,4 @@
 const express = require('express')
-
 const router = express.Router()
 const asyncHandler = require('express-async-handler')
 
@@ -12,6 +11,7 @@ const {
     canSubmitProject,
     isEventOrganiser,
     getEventFromParams,
+    isEventPartner,
 } = require('../../common/middleware/events')
 
 router.route('/id/:projectId').get(
@@ -36,6 +36,22 @@ router
         }),
     )
 
+router
+    .route('/:slug/partner-review')
+    /** Get projects for partner review, only if their status is final, have a team and based on challenges */
+    .get(
+        hasToken,
+        isEventPartner,
+        getEventFromParams,
+        asyncHandler(async (req, res) => {
+            const data = await ProjectController.getDataForPartnerReviewing(
+                req.event,
+                req.user,
+            )
+            return res.status(200).json(data)
+        }),
+    )
+
 router
     .route('/:slug/validate')
     /** Validate project before submission on UI, non-blocking (doesn't prevent saving to db) */
diff --git a/backend/modules/project_score/controller.js b/backend/modules/project_score/controller.js
index 438843085..07aa8029a 100644
--- a/backend/modules/project_score/controller.js
+++ b/backend/modules/project_score/controller.js
@@ -1,3 +1,4 @@
+const _ = require('lodash')
 const Event = require('../event/model')
 const Project = require('../project/model')
 const { ProjectScore } = require('./model')
@@ -25,7 +26,6 @@ controller.addProjectScore = async score => {
         }
         projectScore.averageScore = averageScore
     }
-    console.log('ProjectScore from controller', projectScore)
     return projectScore.save()
 }
 
@@ -54,7 +54,6 @@ controller.updateProjectScore = async (id, updatedProjectScore) => {
         }
         projectScore.averageScore = averageScore
     }
-    console.log('updated project with token score', projectScore)
     await projectScore.save()
     return projectScore
 }
@@ -71,7 +70,7 @@ controller.getScoresByEventAndTeamId = (eventId, teamId) => {
         })
 }
 
-controller.getScoreByProjectId = (
+controller.getScoreByProjectId = async (
     projectId,
     challenge = null,
     track = null,
@@ -88,6 +87,18 @@ controller.getScoreByProjectId = (
     return ProjectScore.find(query)
 }
 
+controller.getScoreForProjectByReviewerId = async (projectId, reviewerId) => {
+    const testProjectScore = await controller.getScoreByProjectId(projectId)
+    if (testProjectScore && testProjectScore.length > 0) {
+        testProjectScore[0].reviewers.forEach(reviewer => {})
+        const scoreFromReviewer = _.find(
+            testProjectScore[0].reviewers,
+            reviewerScore => reviewerScore.userId === reviewerId,
+        )
+        return scoreFromReviewer
+    }
+}
+
 controller.getPublicScores = async eventId => {
     return ProjectScore.find({ event: eventId })
         .populate({ path: 'event', select: 'name' })
@@ -101,11 +112,8 @@ const limitDecimals = (number, decimalPlaces) => {
 
 const averageScoreCalculation = (reviewers, globalScore) => {
     const allScores = reviewers.map(review => review.score)
-    console.log('All scores from reviewers', allScores)
     allScores.push(globalScore)
-    console.log('All scores with global score', allScores)
     let scoreCount = allScores.length
-    console.log('Score count', scoreCount)
 
     const scoreSum = allScores.reduce((acc, current) => {
         if (current && current > 0) {
@@ -116,15 +124,10 @@ const averageScoreCalculation = (reviewers, globalScore) => {
         }
     }, 0)
 
-    console.log('Score sum', scoreSum)
-    console.log('Score count after', scoreCount)
     let finalScore = scoreSum / scoreCount
     if (!Number.isInteger(finalScore)) {
         finalScore = limitDecimals(finalScore, 2)
-        console.log('Not an integer')
     }
-    console.log('Score to submit', finalScore)
-    console.log('Score type', typeof finalScore)
     return finalScore
 }
 
@@ -139,39 +142,6 @@ controller.updateProjectScoreWithReviewers = async (
     projectScore.track = updatedProjectScore.track
     projectScore.challenge = updatedProjectScore.challenge
     projectScore.reviewers = updatedProjectScore.reviewers
-    console.log(
-        'Updated project score from controller BEFORE save',
-        projectScore,
-    )
-
-    // const allScores = projectScore.reviewers.map(review => review.score)
-    // console.log('All scores from reviewers', allScores)
-    // allScores.push(projectScore.score)
-    // console.log('All scores with global score', allScores)
-    // let scoreCount = allScores.length
-    // console.log('Score count', scoreCount)
-
-    // const scoreSum = allScores.reduce((acc, current) => {
-    //     if (current && current > 0) {
-    //         return acc + current
-    //     } else {
-    //         scoreCount = scoreCount - 1
-    //         return acc
-    //     }
-    // }, 0)
-    // function limitDecimals(number, decimalPlaces) {
-    //     const multiplier = Math.pow(10, decimalPlaces)
-    //     return Math.floor(number * multiplier) / multiplier
-    // }
-    // console.log('Score sum', scoreSum)
-    // console.log('Score count after', scoreCount)
-    // let finalScore = scoreSum / scoreCount
-    // if (!Number.isInteger(finalScore)) {
-    //     finalScore = limitDecimals(finalScore, 2)
-    //     console.log('Not an integer')
-    // }
-    // console.log('Score to submit', finalScore)
-    // console.log('Score type', typeof finalScore)
 
     projectScore.averageScore = projectScore.score
 
@@ -191,10 +161,6 @@ controller.updateProjectScoreWithReviewers = async (
     // projectScore.averageScore = projectScore.score +
 
     await projectScore.save()
-    console.log(
-        'Updated project score from controller AFTER save',
-        projectScore,
-    )
     return projectScore
 }
 
diff --git a/backend/modules/project_score/routes.js b/backend/modules/project_score/routes.js
index 20d04aa88..25b0635ce 100644
--- a/backend/modules/project_score/routes.js
+++ b/backend/modules/project_score/routes.js
@@ -14,7 +14,6 @@ const {
     isEventPartner,
     isOrganiserOrCanSubmitProject,
 } = require('../../common/middleware/events')
-const { registrationAccepted } = require('../email-task/types')
 
 const addProjectScore = asyncHandler(async (req, res) => {
     console.log('addProjectScore is running')
@@ -127,7 +126,6 @@ router.get(
     getScoreByProjectId,
 )
 
-
 router.post('/event/:slug', hasToken, isEventOrganiser, addProjectScore)
 router.put('/event/:slug/:id', hasToken, isEventOrganiser, updateProjectScore)
 
diff --git a/backend/modules/recruitment/controller.js b/backend/modules/recruitment/controller.js
index 1ee843222..36e79963c 100644
--- a/backend/modules/recruitment/controller.js
+++ b/backend/modules/recruitment/controller.js
@@ -33,7 +33,6 @@ controller.queryProfiles = async (query = {}, user) => {
         }
         console.log(34)
     } else if (query.filters && query.filters.length) {
-
         const whereFields = query.filters.map(filter => {
             //console.log("query.filter", filter.value)
             const formatted = MongoUtils.ensureObjectId(filter.value)
@@ -116,7 +115,7 @@ controller.queryProfiles = async (query = {}, user) => {
         //console.log(110)
     }
     // userQuery.$and = userQuery.$and.concat([matcher])
-    console.log('userquery', JSON.stringify(userQuery), "pag", pagination,)
+    console.log('userquery', JSON.stringify(userQuery), 'pag', pagination)
     //console.log("query", userQuery, "pag", pagination, "reg", JSON.stringify(userQuery.registrations))
     return UserController.queryProfiles({
         query: userQuery,
@@ -127,7 +126,7 @@ controller.queryProfiles = async (query = {}, user) => {
                 return controller.createRecruitmentProfile(profile, false)
             }),
         ).then(profiles => {
-
+            console.log('profiles', profiles)
             return { data: profiles, count: results.count }
         })
     })
diff --git a/backend/modules/registration/controller.js b/backend/modules/registration/controller.js
index b58191082..1f7ac5d0b 100644
--- a/backend/modules/registration/controller.js
+++ b/backend/modules/registration/controller.js
@@ -15,7 +15,7 @@ const Registration = require('./model')
 const { NotFoundError, ForbiddenError } = require('../../common/errors/errors')
 const RegistrationHelpers = require('./helpers')
 const EmailTaskController = require('../email-task/controller')
-const { checklistItemsOnline, checklistItemsPhysical } = require('./checklists')
+// const { checklistItemsOnline, checklistItemsPhysical } = require('./checklists')
 
 const STATUSES = RegistrationStatuses.asObject
 const TRAVEL_GRANT_STATUSES = RegistrationTravelGrantStatuses.asObject
@@ -28,56 +28,49 @@ controller.getUserRegistrations = user => {
 }
 
 controller.createRegistration = async (user, event, data) => {
-    console.log("user", user)
     const answers = await RegistrationHelpers.registrationFromUser(data)
     const registration = new Registration({
         event: event._id.toString(),
         user: user.sub,
         answers,
     })
-    if (event.eventType === 'online') {
-        registration.checklist = {
-            items: checklistItemsOnline(),
-        }
-    } else {
-        registration.checklist = {
-            items: checklistItemsPhysical(),
-        }
-    }
+    // if (event.eventType === 'online') {
+    //     registration.checklist = {
+    //         items: checklistItemsOnline(),
+    //     }
+    // } else {
+    //     registration.checklist = {
+    //         items: checklistItemsPhysical(),
+    //     }
+    // }
     registration.status = RegistrationStatuses.asObject.incomplete.id
-    console.log("createRegistration", registration)
+    console.log('createRegistration', registration)
     return registration.save()
-    /* .catch(function (err) {
-        console.log(err.name, err.errors)
-    }) */
 }
 
 controller.createPartnerRegistration = async (user, event, data) => {
-    console.log("user", user)
+    console.log('user', user)
     const answers = await RegistrationHelpers.registrationFromUser(data)
     const registration = new Registration({
         event: event._id.toString(),
         user: user,
         answers,
     })
-    if (event.eventType === 'online') {
-        registration.checklist = {
-            items: checklistItemsOnline(),
-        }
-    } else {
-        registration.checklist = {
-            items: checklistItemsPhysical(),
-        }
-    }
+    // if (event.eventType === 'online') {
+    //     registration.checklist = {
+    //         items: checklistItemsOnline(),
+    //     }
+    // } else {
+    //     registration.checklist = {
+    //         items: checklistItemsPhysical(),
+    //     }
+    // }
     registration.status = RegistrationStatuses.asObject.incomplete.id
-    console.log("createRegistration", registration)
+    console.log('create registration for partner', registration)
     return registration.save()
-    /* .catch(function (err) {
-        console.log(err.name, err.errors)
-    }) */
 }
 
-controller.getRegistration = (userId, eventId) => {
+controller.getRegistration = async (userId, eventId) => {
     return Registration.findOne({
         event: eventId,
         user: userId,
@@ -99,7 +92,6 @@ controller.updateRegistration = (user, event, data) => {
                 await RegistrationHelpers.validateAnswers(data, event)
             // answers are valid
             if (answers) {
-
                 return Registration.updateAllowed(registration, { answers })
             }
             return false
@@ -120,15 +112,20 @@ controller.finishRegistration = (user, event, data) => {
                         registration.status ===
                         RegistrationStatuses.asObject.incomplete.id
                     ) {
-                        if (event.eventType === EventTypes.physical.id) {
-                            registration.status =
-                                RegistrationStatuses.asObject.pending.id
-                        }
+                        registration.status =
+                            RegistrationStatuses.asObject.pending.id
+                        // if (
+                        //     event.eventType === EventTypes.physical.id ||
+                        //     event.eventType === EventTypes.hybrid.id
+                        // ) {
+                        //     registration.status =
+                        //         RegistrationStatuses.asObject.pending.id
+                        // }
                         // TODO we most likely don't want to do this here? Get desired state from event?
-                        if (event.eventType === EventTypes.online.id) {
-                            registration.status =
-                                RegistrationStatuses.asObject.checkedIn.id
-                        }
+                        // if (event.eventType === EventTypes.online.id) {
+                        //     registration.status =
+                        //         RegistrationStatuses.asObject.checkedIn.id
+                        // }
                     }
                     return Registration.updateAllowed(registration, { answers })
                 }
@@ -460,7 +457,7 @@ controller.rejectPendingTravelGrants = eventId => {
 controller.getFullRegistration = (eventId, registrationId) => {
     const query =
         mongoose.Types.ObjectId.isValid(registrationId) &&
-            registrationId.indexOf('|') === -1
+        registrationId.indexOf('|') === -1
             ? { _id: registrationId }
             : { user: registrationId }
     return Registration.findOne(query)
@@ -525,4 +522,42 @@ controller.rejectSoftRejected = async eventId => {
     return rejected
 }
 
+controller.addGavelLoginToRegistrations = async (eventId, gavelData) => {
+    console.log('Gavel data received', gavelData, typeof gavelData)
+    gavelData.forEach(gavel => {
+        if (
+            typeof gavel.registration !== 'string' ||
+            typeof gavel.link !== 'string'
+        ) {
+            throw new Error('Gavel data is invalid')
+        }
+    })
+    let updateCount = 0
+    const registrations = await Registration.find({
+        event: eventId,
+        status: RegistrationStatuses.asObject.checkedIn.id,
+    })
+    console.log('Registrations found', registrations.length)
+    console.log('Registrations data', registrations)
+    const registrationCount = registrations.length
+
+    gavelData.forEach(gavel => {
+        const registration = registrations.find(
+            r => r._id.toString() === gavel.registration,
+        )
+        if (registration) {
+            registration.gavelLogin = gavel.link
+            updateCount++
+            console.log('Registration full data', registration)
+            registration.save()
+        }
+    })
+
+    console.log(
+        'Modified counts, updated/total',
+        updateCount,
+        registrationCount,
+    )
+}
+
 module.exports = controller
diff --git a/backend/modules/registration/helpers.js b/backend/modules/registration/helpers.js
index e8f5647fa..ae8c9a48f 100644
--- a/backend/modules/registration/helpers.js
+++ b/backend/modules/registration/helpers.js
@@ -56,7 +56,6 @@ const RegistrationHelpers = {
             .validate(data, { stripUknown: true })
             .catch(e => {
                 // TODO proper log
-                console.log('error in validateAnswers', e)
                 return minSchema
                     .validate(data, { stripUknown: true })
                     .catch(ee => {
@@ -89,12 +88,8 @@ const RegistrationHelpers = {
         })
 
         const schema = yup.object().shape(validationSchema)
-        console.log('users', d)
 
-        const data = schema.validate(d, { stripUknown: true }).catch(e => {
-            console.log('RFU', e)
-        })
-        console.log('got data', data)
+        const data = schema.validate(d, { stripUknown: true }).catch(e => {})
         return data
     },
     buildAggregation: (eventId, userId, qp) => {
diff --git a/backend/modules/registration/model.js b/backend/modules/registration/model.js
index 3ae3e9c50..d753645de 100644
--- a/backend/modules/registration/model.js
+++ b/backend/modules/registration/model.js
@@ -79,6 +79,9 @@ const RegistrationSchema = new mongoose.Schema({
     travelGrantAmount: {
         type: Number,
     },
+    gavelLogin: {
+        type: String,
+    },
 })
 
 /* Only allow a single registration per event per user */
diff --git a/backend/modules/registration/routes.js b/backend/modules/registration/routes.js
index ef0367778..5706d9e93 100644
--- a/backend/modules/registration/routes.js
+++ b/backend/modules/registration/routes.js
@@ -32,15 +32,13 @@ const getRegistration = asyncHandler(async (req, res) => {
 })
 
 const createRegistration = asyncHandler(async (req, res) => {
-    console.log("creating registration with data:",
-        "user: ", req.user,
-        "event ", req.event,
-        "data ", req.body)
+    console.log('creating registration from routes')
     const registration = await RegistrationController.createRegistration(
         req.user,
         req.event,
         req.body,
     )
+    console.log('registration complete')
     return res.status(201).json(registration)
 })
 
@@ -217,31 +215,39 @@ const bulkRejectRegistrations = asyncHandler(async (req, res) => {
 })
 
 const addPartnerToRegistrated = asyncHandler(async (req, res) => {
-
-    console.log("addPartnerToRegistrated", req.body)
+    console.log('addPartnerToRegistrated', req.body)
     //TODO: should check if the user is registered already first
     try {
-        const hasRegistration = await RegistrationController.getRegistration(req.body.userId, req.event._id)
+        const hasRegistration = await RegistrationController.getRegistration(
+            req.body.userId,
+            req.event._id,
+        )
         return res.status(200).json(hasRegistration)
     } catch (e) {
-        console.log("hasRegistration", e)
-        const registration = await RegistrationController.createPartnerRegistration(
-            req.body.userId, //switch to actual user
-            req.event, //slug
-            req.body.profile, /*data: {
+        console.log('hasRegistration', e)
+        const registration =
+            await RegistrationController.createPartnerRegistration(
+                req.body.userId, //switch to actual user
+                req.event, //slug
+                req.body.profile /*data: {
                     firstName: 'seppo',
                     lastName: 'pykälä',
                     email: 'samu.rotko@gmail.com'
-                  }*/
-        )
+                  }*/,
+            )
         return res.status(200).json(registration)
     }
+})
 
+const addGavelLoginToRegistrations = asyncHandler(async (req, res) => {
+    console.log('Event id', req.event._id)
+    console.log('From routes, for gavel login', req.body)
+    await RegistrationController.addGavelLoginToRegistrations(
+        req.event._id.toString(),
+        req.body,
+    )
 
-
-
-
-
+    return res.status(200).json([])
 })
 
 router.route('/').get(hasToken, getUserRegistrations)
@@ -388,4 +394,13 @@ router
         addPartnerToRegistrated,
     )
 
+router
+    .route('/:slug/gavel')
+    .post(
+        hasToken,
+        hasPermission(Auth.Permissions.MANAGE_EVENT),
+        isEventOrganiser,
+        addGavelLoginToRegistrations,
+    )
+
 module.exports = router
diff --git a/frontend/src/components/UserMenu/index.js b/frontend/src/components/UserMenu/index.js
index 39b83b167..945ba4595 100644
--- a/frontend/src/components/UserMenu/index.js
+++ b/frontend/src/components/UserMenu/index.js
@@ -2,12 +2,7 @@ import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { push } from 'connected-react-router'
 import { makeStyles } from '@material-ui/core/styles'
-import {
-    Box,
-    ListItem,
-    ListItemText,
-    Grid,
-} from '@material-ui/core'
+import { Box, ListItem, ListItemText, Grid } from '@material-ui/core'
 import * as AuthSelectors from 'redux/auth/selectors'
 import JunctionTheme from 'junctionTheme.js'
 import Button from 'components/generic/Button'
@@ -45,17 +40,12 @@ export default () => {
 
     const idTokenPayload = useSelector(AuthSelectors.getIdTokenPayload)
     const userId = idTokenPayload?.sub
-    const [profile] = useMyProfilePreview()
     const dispatch = useDispatch()
     const classes = useStyles()
 
-
-
     if (!userId) {
         return (
             <Box display="flex" flexDirection="row" alignItems="center">
-
-
                 <Grid container spacing={0}>
                     <Grid item xs={12}>
                         <Button
@@ -67,31 +57,23 @@ export default () => {
                         </Button>
                     </Grid>
                 </Grid>
-
-
             </Box>
         )
     }
 
-
-
     return (
         <Box display="flex" flexDirection="row" alignItems="center">
-
-            <Grid container spacing={2} wrap="nowrap" >
+            <Grid container spacing={2} wrap="nowrap">
                 <Grid item xs={4}>
-
                     <Button
                         onClick={() => dispatch(push('/dashboard/default'))}
                         strong={true}
                         className={classes.menuBox}
                     >
-
                         {t('Dashboard_')}
                     </Button>
                 </Grid>
-                <Grid item xs={5} wrap='nowrap'>
-
+                <Grid item xs={5}>
                     <Button
                         onClick={() => dispatch(push('/logout'))}
                         strong={true}
@@ -104,6 +86,6 @@ export default () => {
                     <UserAvatar />
                 </Grid>
             </Grid>
-        </Box >
+        </Box>
     )
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/UserMenu/userMenu_deprecated/index.js b/frontend/src/components/UserMenu/userMenu_deprecated/index.js
deleted file mode 100644
index f6a9d70ca..000000000
--- a/frontend/src/components/UserMenu/userMenu_deprecated/index.js
+++ /dev/null
@@ -1,260 +0,0 @@
-//old usermenu
-
-
-import React, { useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
-import { push } from 'connected-react-router'
-import { makeStyles } from '@material-ui/core/styles'
-import {
-    Popover,
-    Avatar,
-    Box,
-    ListItem,
-    ListItemText,
-    Divider,
-    Grid,
-} from '@material-ui/core'
-import * as AuthSelectors from 'redux/auth/selectors'
-import MenuIcon from '@material-ui/icons/Menu'
-import JunctionTheme from 'junctionTheme.js'
-import LanguageMenu from 'components/LanguageMenu'
-import { useMyProfilePreview } from 'graphql/queries/userProfile'
-
-import { useTranslation } from 'react-i18next'
-
-const useStyles = makeStyles(theme => ({
-    menuDot: {
-        width: '8px',
-        height: '8px',
-        margin: '2px',
-        borderRadius: '2px',
-        backgroundColor: 'rgba(0,0,0,0.3)',
-    },
-    avatar: {
-        marginLeft: '16px',
-    },
-    hamburger: {
-        transition: theme.transitions.create(['transform'], {
-            duration: theme.transitions.duration.short,
-        }),
-    },
-    hamburgerOpen: {
-        transform: 'rotate(-90deg)',
-    },
-    hamburgerClosed: {
-        transform: 'rotate(0)',
-    },
-    tableBottom: {
-        borderBottom: 'none',
-    },
-    popover: {
-        borderRadius: '15px',
-    },
-    menuBox: {
-        width: '220px',
-        borderRadius: '15px',
-    },
-}))
-
-export default () => {
-    const { t } = useTranslation()
-
-    const idTokenPayload = useSelector(AuthSelectors.getIdTokenPayload)
-    const userId = idTokenPayload?.sub
-    const [profile] = useMyProfilePreview()
-    const dispatch = useDispatch()
-    const hasSuperAdmin = useSelector(AuthSelectors.hasSuperAdmin)
-    const hasRecruiterAccess = useSelector(AuthSelectors.hasRecruiterAccess)
-    const classes = useStyles()
-    const [anchorEl, setAnchorEl] = useState(null)
-    const color = JunctionTheme.palette
-
-    const handleMenuOpen = e => {
-        setAnchorEl(e.currentTarget)
-    }
-
-    const handleMenuClose = () => {
-        setAnchorEl(null)
-    }
-
-    if (!userId) {
-        return (
-            <Box display="flex" flexDirection="row" alignItems="center">
-                <MenuIcon
-                    fontSize="large"
-                    onClick={handleMenuOpen}
-                    className={`${classes.hamburger} ${anchorEl
-                        ? classes.hamburgerOpen
-                        : classes.hamburgerClosed
-                        }`}
-                />
-
-                <Popover
-                    open={Boolean(anchorEl)}
-                    onClose={handleMenuClose}
-                    anchorEl={anchorEl}
-                    anchorOrigin={{
-                        vertical: 'bottom',
-                        horizontal: 'right',
-                    }}
-                    transformOrigin={{
-                        vertical: 'top',
-                        horizontal: 'right',
-                    }}
-                    classes={{
-                        paper: classes.menuBox,
-                    }}
-                >
-                    <Box className={classes.menuBox}>
-                        <Grid container spacing={0}>
-                            <Grid item xs={12}>
-                                <ListItem button>
-                                    <ListItemText
-                                        primary={t('Sign_in_')}
-                                        onClick={() => dispatch(push('/login'))}
-                                    />
-                                </ListItem>
-                            </Grid>
-                            <Grid item xs={12}>
-                                <Divider variant="middle" />
-                            </Grid>
-                            <Grid item xs={6}>
-                                <LanguageMenu />
-                            </Grid>
-                        </Grid>
-                    </Box>
-                </Popover>
-            </Box>
-        )
-    }
-
-    const renderEventItems = () => {
-        const items = []
-        TODO: Add links to event dashboard here for ongoing events
-        return null
-    }
-
-    const renderOtherItems = () => {
-        const items = []
-
-        if (hasOrganiserAccess) {
-            items.push({
-                label: 'Create Event',
-                onClick: () => dispatch(push('/organise')),
-            })
-        }
-
-        if (hasRecruiterAccess) {
-            items.push({
-                label: 'Recruitment',
-                onClick: () => dispatch(push('/recruitment')),
-            })
-        }
-
-        if (hasSuperAdmin) {
-            items.push({
-                label: 'Admin',
-                onClick: () => dispatch(push('/admin')),
-            })
-        }
-        Grid Item isn't neccessary here, but put it in for consistency
-        if (items.length > 0) {
-            return (
-                <>
-                    {items.map(({ label, onClick }) => (
-                        <Grid key={label} item xs={12}>
-                            <ListItem button onClick={onClick}>
-                                <ListItemText primary={label} />
-                            </ListItem>
-                        </Grid>
-                    ))}
-                </>
-            )
-        }
-
-        return null
-    }
-
-    return (
-        <Box display="flex" flexDirection="row" alignItems="center">
-            <MenuIcon
-                fontSize="large"
-                onClick={handleMenuOpen}
-                className={`${classes.hamburger} ${anchorEl ? classes.hamburgerOpen : classes.hamburgerClosed
-                    }`}
-            />
-
-            <Popover
-                open={Boolean(anchorEl)}
-                onClose={handleMenuClose}
-                anchorEl={anchorEl}
-                anchorOrigin={{
-                    vertical: 'bottom',
-                    horizontal: 'right',
-                }}
-                transformOrigin={{
-                    vertical: 'top',
-                    horizontal: 'right',
-                }}
-                classes={{
-                    paper: classes.menuBox,
-                }}
-            >
-                <div className='tw-border-8 tw-border-white'>
-                    <Box className={classes.menuBox}>
-                        <Grid container spacing={0}>
-                            <Grid item xs={6}>
-                                <ListItem button>
-                                    <ListItemText
-                                        primary={t('Dashboard_')}
-                                        onClick={() => dispatch(push('/account'))}
-                                    />
-                                </ListItem>
-                            </Grid>
-                            <Grid item xs={6}>
-                                <ListItem
-                                    button
-                                    onClick={() => dispatch(push('/logout'))}
-                                >
-                                    <ListItemText primary={t('Log_out_')} />
-                                </ListItem>
-                            </Grid>
-                            <Grid item xs={12}>
-                                <ListItem button>
-                                    <ListItemText
-                                        primary={t('Edit_profile_')}
-                                        onClick={() =>
-                                            dispatch(push('/account/profile'))
-                                        }
-                                    />
-                                </ListItem>
-                            </Grid>
-                            {renderEventItems()}
-                            {renderOtherItems()}
-
-                            <Grid item xs={12}>
-                                <Divider variant="middle" />
-                            </Grid>
-                            <Grid item xs={6}>
-                                <LanguageMenu />
-                            </Grid>
-                        </Grid>
-                    </Box>
-                </div>
-            </Popover>
-            <div className='tw-ml-16 tw-rounded-full tw-border-8 tw-border-white'>
-                <Avatar
-                    className='tw-ml-16 tw-rounded-full tw-border-8 tw-border-white'//TODO: what is wrong with the border
-                    src={profile?.avatar}
-                    alt="Avatar"
-                    style={{
-                        width: '50px',
-                        height: '50px',
-                        border: `2px solid ${color['primary'].main}`,
-                        borderRadius: '50%',
-                    }}
-                />
-            </div>
-        </Box>
-    )
-}
diff --git a/frontend/src/components/generic/PageHeader/index.js b/frontend/src/components/generic/PageHeader/index.js
index 2565a39df..c7a7e8ad7 100644
--- a/frontend/src/components/generic/PageHeader/index.js
+++ b/frontend/src/components/generic/PageHeader/index.js
@@ -1,20 +1,12 @@
 import React from 'react'
 
-import { makeStyles } from '@material-ui/core/styles'
-import { Box, Typography } from '@material-ui/core'
-
-// const useStyles = makeStyles(theme => ({
-//     subheading: {
-//         marginTop: theme.spacing(1),
-//         marginLeft: theme.spacing(0.5),
-//         fontFamily: 'Lato',
-//     },
-// }))
+import { Link, Typography } from '@material-ui/core'
 
 const PageHeader = ({
     heading,
     subheading = null,
     details = null,
+    link = null,
     alignment = 'center',
 }) => {
     const styling = {
@@ -23,9 +15,7 @@ const PageHeader = ({
         right: 'tw-items-end tw-text-right',
     }
 
-    // const classes = useStyles()
     return (
-        // <Box pb={2} pt={2}>
         <div className={`tw-flex tw-flex-col tw-gap-2 ${styling[alignment]}`}>
             <Typography
                 className="tw-font-bold tw-tracking-tight"
@@ -45,25 +35,18 @@ const PageHeader = ({
                 <Typography variant="body1" color="secondary" component="p">
                     {details}
                 </Typography>
-            </div>
-            {/* <Typography
-                    className="tw-font-bold tw-tracking-tight"
-                    variant="h3"
-                    component="h3"
-                >
-                    {heading}
-                </Typography>
-                {subheading && (
-                    <Typography
-                        className="tw-text-lg tw-text-gray-600"
-                        variant="body1"
-                        component="p"
+                {!!link && (
+                    <Link
+                        component="a"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        href={link}
                     >
-                        {subheading}
-                    </Typography>
-                )} */}
+                        Open in new tab
+                    </Link>
+                )}
+            </div>
         </div>
-        // </Box>
     )
 }
 
diff --git a/frontend/src/components/generic/RadioScore/index.js b/frontend/src/components/generic/RadioScore/index.js
index 06bf6a6b8..a26e4eb52 100644
--- a/frontend/src/components/generic/RadioScore/index.js
+++ b/frontend/src/components/generic/RadioScore/index.js
@@ -58,19 +58,27 @@ export default ({ category, label, onSelectionChange, value = null }) => {
                         checkedIcon={
                             <div className="tw-flex tw-items-center tw-justify-center tw-bg-gray-300 tw-w-8 tw-h-8 tw-rounded-full">
                                 <span
-                                    className={`tw-w-5 tw-h-5 tw-rounded-full ${classes.bgPrimary}`}
-                                ></span>
+                                    className={`tw-w-5 tw-h-5 tw-rounded-full tw-flex tw-justify-center tw-items-center tw-text-sm tw-font-bold tw-text-white ${classes.bgPrimary}`}
+                                >
+                                    {score}
+                                </span>
                             </div>
                         }
                         icon={
                             index < selectedIndex ? (
                                 <div className="tw-flex tw-items-center tw-justify-center tw-bg-gray-300 tw-w-8 tw-h-8 tw-rounded-full">
                                     <span
-                                        className={`tw-w-5 tw-h-5 tw-rounded-full ${classes.bgPrimary}`}
-                                    ></span>
+                                        className={`tw-w-5 tw-h-5 tw-rounded-full tw-flex tw-justify-center tw-items-center tw-text-sm tw-text-gray-400 ${classes.bgPrimary}`}
+                                    >
+                                        {score}
+                                    </span>
                                 </div>
                             ) : (
-                                <span className={classes.icon} />
+                                <span
+                                    className={`tw-flex tw-justify-center tw-items-center tw-text-sm ${classes.icon}`}
+                                >
+                                    {score}
+                                </span>
                             )
                         }
                     />
diff --git a/frontend/src/components/inputs/MarkdownInput/index.js b/frontend/src/components/inputs/MarkdownInput/index.js
index 092032b84..14ea89df4 100644
--- a/frontend/src/components/inputs/MarkdownInput/index.js
+++ b/frontend/src/components/inputs/MarkdownInput/index.js
@@ -20,7 +20,7 @@ const useStyles = makeStyles(theme => ({
     },
 }))
 
-export default ({ name, value, placeholder, onChange, onBlur }) => {
+export default ({ name, value, placeholder, onChange, onBlur, maxLength }) => {
     const classes = useStyles()
     const [isPreview, setIsPreview] = useState(false)
 
@@ -58,6 +58,7 @@ export default ({ name, value, placeholder, onChange, onBlur }) => {
                         value={value}
                         onChange={onChange}
                         onBlur={onBlur}
+                        maxLength={maxLength}
                     />
                 )}
             </Box>
diff --git a/frontend/src/components/inputs/Select/index.js b/frontend/src/components/inputs/Select/index.js
index 563efe335..139f7c8eb 100644
--- a/frontend/src/components/inputs/Select/index.js
+++ b/frontend/src/components/inputs/Select/index.js
@@ -243,7 +243,7 @@ SingleValue.propTypes = {
     /**
      * Props passed to the wrapping element for the group.
      */
-    innerProps: PropTypes.any.isRequired,
+    innerProps: PropTypes.any,
     selectProps: PropTypes.object.isRequired,
 }
 
@@ -436,6 +436,9 @@ export default function IntegrationReactSelect({
                 })
                 .filter(item => !!item)
         } else {
+            if (Array.isArray(value)) {
+                value = value[0]
+            }
             return _options.find(o => o.value === value)
         }
     }, [_options, isMulti, value])
diff --git a/frontend/src/components/inputs/TextAreaInput/index.js b/frontend/src/components/inputs/TextAreaInput/index.js
index 75fa9c790..120595496 100644
--- a/frontend/src/components/inputs/TextAreaInput/index.js
+++ b/frontend/src/components/inputs/TextAreaInput/index.js
@@ -1,9 +1,8 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useState } from 'react'
 
 import { TextField } from '@material-ui/core'
-import { makeStyles, useTheme, withStyles } from '@material-ui/core/styles'
+import { makeStyles } from '@material-ui/core/styles'
 
-// const theme = useTheme()
 const useTextField = makeStyles(theme => ({
     root: {
         '& .MuiFilledInput-root': {
@@ -11,10 +10,14 @@ const useTextField = makeStyles(theme => ({
             border: `2px solid #e2e8f0`,
             borderRadius: '6px',
         },
-        // backgroundColor: '#f8f8f8',
     },
 }))
 
+const errorLengthBase = {
+    error: false,
+    helperText: '',
+}
+
 const TextAreaInput = React.memo(
     ({
         disabled,
@@ -28,36 +31,78 @@ const TextAreaInput = React.memo(
         autoFocus,
         minRows = 10,
         maxRows = 100,
+        maxLength,
     }) => {
+        const [errorLength, setErrorLength] = useState(errorLengthBase)
+
         const classes = useTextField()
 
         const handleChange = useCallback(
             e => {
+                if (maxLength) {
+                    if (e.target.value.length > maxLength) {
+                        setErrorLength({
+                            error: true,
+                            helperText: `${e.target.value.length}/${maxLength}`,
+                        })
+                    } else {
+                        setErrorLength(errorLengthBase)
+                    }
+                }
                 onChange(e.target.value)
             },
             [onChange],
         )
 
-        return (
-            <TextField
-                classes={classes}
-                type="text"
-                variant="filled"
-                autoFocus={autoFocus}
-                disabled={disabled}
-                fullWidth
-                label={label}
-                name={name}
-                onBlur={onBlur}
-                onChange={handleChange}
-                placeholder={placeholder}
-                required={required}
-                value={value}
-                multiline
-                minRows={minRows}
-                maxRows={maxRows}
-            />
-        )
+        let textFieldFormat
+
+        if (maxLength) {
+            textFieldFormat = (
+                <TextField
+                    classes={classes}
+                    type="text"
+                    variant="filled"
+                    autoFocus={autoFocus}
+                    disabled={disabled}
+                    fullWidth
+                    label={label}
+                    name={name}
+                    onBlur={onBlur}
+                    onChange={handleChange}
+                    placeholder={placeholder}
+                    required={required}
+                    value={value}
+                    multiline
+                    minRows={minRows}
+                    maxRows={maxRows}
+                    error={errorLength.error}
+                    helperText={errorLength.helperText}
+                />
+            )
+        } else {
+            textFieldFormat = (
+                <TextField
+                    classes={classes}
+                    type="text"
+                    variant="filled"
+                    autoFocus={autoFocus}
+                    disabled={disabled}
+                    fullWidth
+                    label={label}
+                    name={name}
+                    onBlur={onBlur}
+                    onChange={handleChange}
+                    placeholder={placeholder}
+                    required={required}
+                    value={value}
+                    multiline
+                    minRows={minRows}
+                    maxRows={maxRows}
+                />
+            )
+        }
+
+        return textFieldFormat
     },
 )
 
diff --git a/frontend/src/components/modals/EditProjectModal/index.js b/frontend/src/components/modals/EditProjectModal/index.js
index 749eb13ee..26a4700c6 100644
--- a/frontend/src/components/modals/EditProjectModal/index.js
+++ b/frontend/src/components/modals/EditProjectModal/index.js
@@ -32,12 +32,17 @@ import EventsService from 'services/events'
 
 import { Formik, Form, Field, ErrorMessage } from 'formik'
 import Button from 'components/generic/Button'
+import { projectURLgenerator } from 'utils/dataModifiers'
 
 export default ({ project, onClose = () => {}, onEdited = () => {} }) => {
     const dispatch = useDispatch()
     const idToken = useSelector(AuthSelectors.getIdToken)
     const event = useSelector(OrganiserSelectors.event)
     const teams = useSelector(OrganiserSelectors.teams)
+    let projectURL
+    if (project) {
+        projectURL = projectURLgenerator(event.slug, project._id)
+    }
     const [finalistChecked, setFinalistChecked] = useState(false)
     const [projectScores, setProjectScores] = useState([
         {
@@ -84,6 +89,7 @@ export default ({ project, onClose = () => {}, onEdited = () => {} }) => {
                             <PageHeader
                                 heading={project.name}
                                 subheading={project.track}
+                                link={projectURL}
                             />
                             <ExpansionPanel>
                                 <ExpansionPanelSummary
diff --git a/frontend/src/components/modals/ProjectReviewModal/index.js b/frontend/src/components/modals/ProjectReviewModal/index.js
index ab9745e48..2957cd742 100644
--- a/frontend/src/components/modals/ProjectReviewModal/index.js
+++ b/frontend/src/components/modals/ProjectReviewModal/index.js
@@ -1,12 +1,6 @@
 import React from 'react'
 
-import {
-    Typography,
-    Dialog,
-    DialogTitle,
-    DialogContent,
-    Avatar,
-} from '@material-ui/core'
+import { Dialog, DialogTitle, DialogContent } from '@material-ui/core'
 import ReviewElement from './ReviewElement'
 
 const ProjectScoreModal = ({
@@ -15,7 +9,6 @@ const ProjectScoreModal = ({
     projectScoreData,
     showScore = false,
 }) => {
-
     return (
         <Dialog open={open} onClose={onClose}>
             <DialogTitle>Feedback received</DialogTitle>
@@ -36,9 +29,10 @@ const ProjectScoreModal = ({
                             />
                         )}
                     {projectScoreData?.reviewers?.length > 0 &&
-                        projectScoreData.reviewers.map(reviewer => {
+                        projectScoreData.reviewers.map((reviewer, index) => {
                             return (
                                 <ReviewElement
+                                    key={index}
                                     reviewer={reviewer}
                                     showScore={showScore}
                                 />
diff --git a/frontend/src/components/projects/ProjectDetail/ShareProject.js b/frontend/src/components/projects/ProjectDetail/ShareProject.js
index f8ac3be2e..db0e86ccf 100644
--- a/frontend/src/components/projects/ProjectDetail/ShareProject.js
+++ b/frontend/src/components/projects/ProjectDetail/ShareProject.js
@@ -4,6 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { popupCenter } from '../../../utils/misc'
 import { makeStyles } from '@material-ui/core/styles'
 import Container from 'components/generic/Container'
+import { projectURLgenerator } from 'utils/dataModifiers'
 
 const useStyles = makeStyles(theme => ({
     socialIcon: {
@@ -15,11 +16,7 @@ const useStyles = makeStyles(theme => ({
 }))
 
 const ShareProject = (event, project) => {
-    const shareurl =
-        'https://app.hackjunction.com/projects/' +
-        event.slug +
-        '/view/' +
-        project._id // TODO: remove hard coded base URL
+    const shareurl = projectURLgenerator(event.slug, project._id)
     const sharetext = `I just applied to ${event.name}!`
 
     const classes = useStyles()
@@ -35,7 +32,7 @@ const ShareProject = (event, project) => {
                         container
                         spacing={1}
                         direction="row"
-                        justify="center"
+                        justifyContent="center"
                         alignItems="center"
                     >
                         <Grid item>
diff --git a/frontend/src/components/projects/ProjectDetail/index.js b/frontend/src/components/projects/ProjectDetail/index.js
index 281a55550..fd1a4e25b 100644
--- a/frontend/src/components/projects/ProjectDetail/index.js
+++ b/frontend/src/components/projects/ProjectDetail/index.js
@@ -217,15 +217,21 @@ const ProjectDetail = ({
                 />
                 <meta
                     name="title"
-                    content={project ? `Junction App || ${project.name}` : ''}
+                    content={
+                        project ? `${project.name} - Junction Platform` : ''
+                    }
                 />
                 <meta
                     property="og:title"
-                    content={project ? `Junction App || ${project.name}` : ''}
+                    content={
+                        project ? `${project.name} - Junction Platform` : ''
+                    }
                 />
                 <meta
                     name="twitter:title"
-                    content={project ? `Junction App || ${project.name}` : ''}
+                    content={
+                        project ? `${project.name} - Junction Platform` : ''
+                    }
                 />
                 <meta
                     name="description"
@@ -361,8 +367,11 @@ const ProjectDetail = ({
                                                     {section.answers.length >
                                                         0 &&
                                                         section.answers.map(
-                                                            answer => (
-                                                                <div className="tw-flex tw-flex-col tw-gap-2">
+                                                            (answer, index) => (
+                                                                <div
+                                                                    key={index}
+                                                                    className="tw-flex tw-flex-col tw-gap-2"
+                                                                >
                                                                     <Typography variant="h6">
                                                                         {
                                                                             answer.question
diff --git a/frontend/src/components/projects/ProjectSubmissionFields/ChallengesField/index.js b/frontend/src/components/projects/ProjectSubmissionFields/ChallengesField/index.js
index e2d94125c..137b4c34b 100644
--- a/frontend/src/components/projects/ProjectSubmissionFields/ChallengesField/index.js
+++ b/frontend/src/components/projects/ProjectSubmissionFields/ChallengesField/index.js
@@ -19,7 +19,7 @@ const ChallengesField = ({
                     return (
                         <FormControl
                             label="Challenges"
-                            hint="Which partner challenges do you want to submit your project in? You can choose up to 5. Note: make sure you read the event guidelines about how many challenges you can set here!"
+                            hint="For which challenge are you submitting your project?"
                             touched={
                                 form.touched[field.name] ||
                                 props.submitCount > 0
@@ -37,7 +37,6 @@ const ChallengesField = ({
                                     onBlur={() =>
                                         form.setFieldTouched(field.name)
                                     }
-                                    isMulti
                                 />
                             </div>
                         </FormControl>
diff --git a/frontend/src/components/projects/ProjectsGrid/index.js b/frontend/src/components/projects/ProjectsGrid/index.js
index fafd96606..69e18a7d3 100644
--- a/frontend/src/components/projects/ProjectsGrid/index.js
+++ b/frontend/src/components/projects/ProjectsGrid/index.js
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react'
 
-import { sortBy } from 'lodash-es'
 import moment from 'moment-timezone'
 import { Grid } from '@material-ui/core'
 import { EventHelpers } from '@hackjunction/shared'
@@ -10,109 +9,164 @@ import ProjectScoresService from 'services/projectScores'
 import { useSelector } from 'react-redux'
 
 import * as AuthSelectors from 'redux/auth/selectors'
-import * as UserSelectors from 'redux/user/selectors'
 import _ from 'lodash'
+import Filter from 'components/Team/Filter'
 
 const ProjectsGrid = ({
     projects,
     event,
     onSelect,
-    sortField = 'location',
-    showFullTeam = false,
     showScore = false,
     showTags = true,
     token = '',
     showReviewers = false,
+    reviewerGrid = false,
+    filterEnabled = false,
 }) => {
     const idToken = useSelector(AuthSelectors.getIdToken)
-
+    const userId = useSelector(AuthSelectors.getUserId)
     const isOngoingEvent = EventHelpers.isEventOngoing(event, moment)
     const [sorted, setSorted] = useState(projects)
+    const projectScoreLogic = async project => {
+        if (!token) {
+            const scoresNotToken =
+                await ProjectScoresService.getScoreByEventSlugAndProjectId(
+                    idToken,
+                    event.slug,
+                    project._id,
+                )
+            return scoresNotToken
+        } else {
+            const scoresWithToken =
+                await ProjectScoresService.getScoreByEventSlugAndProjectIdAndPartnerToken(
+                    token,
+                    event.slug,
+                    project._id,
+                )
+            return scoresWithToken
+        }
+    }
     const fetchData = useCallback(async () => {
-        const nprojects = await Promise.all(
+        // TODO add loading indicator
+        const projectScoreData = await Promise.allSettled(
             projects.map(async project => {
-                const projectScoreLogic = async () => {
-                    if (!token) {
-                        return ProjectScoresService.getScoreByEventSlugAndProjectId(
-                            idToken,
-                            event.slug,
-                            project._id,
-                        )
-                    } else {
-                        return ProjectScoresService.getScoreByEventSlugAndProjectIdAndPartnerToken(
-                            token,
-                            event.slug,
-                            project._id,
-                        )
-                    }
-                }
-                return projectScoreLogic()
+                return projectScoreLogic(project)
                     .then(score => {
-                        if (score[0]) {
-                            return Object.assign(score[0], project)
-                        }
-                        return Object.assign(
-                            { score: 0, message: 'Not rated' },
-                            project,
-                        )
+                        return score[0]
                     })
                     .catch(e => {
                         console.log('got error', e)
-                        return Object.assign(
-                            { score: 0, message: 'Not rated' },
-                            project,
-                        )
                     })
             }),
         )
-        setSorted(sortBy(nprojects, p => -p['score']))
+        const returnProjects = projects.map(project => {
+            const scoreData = projectScoreData.find(
+                score => score?.value?.project === project._id,
+            )
+            if (scoreData) {
+                if (reviewerGrid) {
+                    const userScore = scoreData?.value?.reviewers?.find(
+                        reviewer => {
+                            return reviewer?.userId === userId
+                        },
+                    )
+                    if (userScore) {
+                        project.scoreData = userScore
+                    }
+                } else {
+                    project.scoreData = scoreData?.value
+                }
+            }
+            return project
+        })
+        let sortedProjects
+        if (reviewerGrid) {
+            sortedProjects = _.sortBy(
+                returnProjects,
+                p => -(p.scoreData?.score || 0),
+            )
+        } else if (showScore) {
+            sortedProjects = _.sortBy(
+                returnProjects,
+                p => -(p.scoreData?.averageScore || 0),
+            )
+        }
+        if (sortedProjects) {
+            setSorted(sortedProjects)
+        } else {
+            setSorted(returnProjects)
+        }
     }, [event.slug, projects, token])
 
     useEffect(() => {
         if (showScore || showReviewers) {
             fetchData()
         } else {
-            setSorted(
-                sortField ? sortBy(projects, p => p[sortField]) : projects,
-            )
+            setSorted(projects)
         }
-    }, [fetchData, projects, showScore, sortField])
+    }, [fetchData, projects, showScore])
+
+    const allFilterLabel = 'All projects'
+    const [filter, setFilter] = useState(allFilterLabel)
+    const onFilterChange = filter => {
+        setFilter(filter)
+    }
+
+    const filterArray = [
+        { label: 'Reviewed', value: 'reviewed' },
+        { label: 'Pending review', value: 'pending' },
+    ]
+
+    const projectsToRender = useCallback(
+        (projects, filterSelected) => {
+            switch (filterSelected) {
+                case 'reviewed':
+                    return projects.filter(
+                        project => project.scoreData?.userId === userId,
+                    )
+                case 'pending':
+                    return projects.filter(
+                        project => project.scoreData?.userId !== userId,
+                    )
+                default:
+                    return projects
+            }
+        },
+        [sorted],
+    )
 
     return (
-        <Grid
-            container
-            spacing={1}
-            direction="row"
-            alignItems="stretch"
-            justify="center"
-        >
-            {sorted.map((project, index) => {
-                const projectScore = project?.averageScore
-                    ? project.averageScore
-                    : project?.score
-                let projectMessage
-                if (project?.message) {
-                    projectMessage = project.message
-                } else if (project?.reviewers?.length > 0) {
-                    projectMessage = project.reviewers[0].message
-                }
-                return (
-                    <ProjectsGridItem
-                        key={index}
-                        project={project}
-                        event={event}
-                        showTableLocation={isOngoingEvent}
-                        // showFullTeam={showFullTeam}
-                        onClickMore={() => onSelect(project)}
-                        score={projectScore}
-                        message={projectMessage}
-                        showTags={showTags}
-                        showReviewers={showReviewers}
-                        showScore={showScore}
-                    />
-                )
-            })}
-        </Grid>
+        <>
+            {filterEnabled && (
+                <Filter
+                    noFilterOption={allFilterLabel}
+                    onChange={onFilterChange}
+                    filterArray={filterArray}
+                />
+            )}
+            <Grid
+                container
+                spacing={1}
+                direction="row"
+                alignItems="stretch"
+                justifyContent="center"
+            >
+                {projectsToRender(sorted, filter).map((project, index) => {
+                    return (
+                        <ProjectsGridItem
+                            key={index}
+                            project={project}
+                            event={event}
+                            showTableLocation={isOngoingEvent}
+                            onClickMore={() => onSelect(project)}
+                            showTags={showTags}
+                            showReviewers={showReviewers}
+                            showScore={showScore}
+                        />
+                    )
+                })}
+            </Grid>
+        </>
     )
 }
 
diff --git a/frontend/src/components/projects/ProjectsGridItem/index.js b/frontend/src/components/projects/ProjectsGridItem/index.js
index 7d7ac430d..3f1c6dcfa 100644
--- a/frontend/src/components/projects/ProjectsGridItem/index.js
+++ b/frontend/src/components/projects/ProjectsGridItem/index.js
@@ -3,7 +3,6 @@ import React, { useState } from 'react'
 import { makeStyles } from '@material-ui/core/styles'
 import {
     Avatar,
-    Box,
     Card,
     CardActions,
     CardContent,
@@ -15,10 +14,6 @@ import {
 
 import Image from 'components/generic/Image'
 import Button from 'components/generic/Button'
-import Tag from 'components/generic/Tag'
-import theme from 'material-ui-theme'
-import Filter from 'components/Team/Filter'
-import Masonry, { ResponsiveMasonry } from 'react-responsive-masonry'
 import _ from 'lodash'
 import { EventHelpers } from '@hackjunction/shared'
 import moment from 'moment-timezone'
@@ -70,20 +65,27 @@ const ProjectsGridItem = ({
     onClickMore,
     label,
     labelBackground = 'primary',
-    score = null,
-    message = null,
     showTags = false,
     showReviewers = false,
     showScore = false,
 }) => {
     const [openReviewModal, setOpenReviewModal] = useState(false)
-    const isVotingPast = EventHelpers.isVotingPast(event, moment)
-    const isVotingOpen = EventHelpers.isVotingOpen(event, moment)
+    const isReviewingOpen = EventHelpers.isReviewingOpen(event, moment)
     const isEventOver = EventHelpers.isEventOver(event, moment)
     const classes = useStyles({ labelBackground })
     const previewImage =
         project.images.length > 0 ? project.images[0].publicId : ''
 
+    let score
+    let message
+    if (project?.scoreData) {
+        score = project.scoreData?.averageScore
+            ? project.scoreData?.averageScore
+            : project.scoreData?.score
+
+        message = project.scoreData?.message
+    }
+
     const statusTag = status => {
         switch (status) {
             case 'final':
@@ -96,9 +98,9 @@ const ProjectsGridItem = ({
     }
 
     const scoreTag = score => {
-        if (score && score > 0 && (isVotingPast || isEventOver)) {
+        if (score && score > 0) {
             return <Chip color="primary" label="Reviewed" />
-        } else if (isVotingOpen) {
+        } else if (isReviewingOpen) {
             return <Chip color="secondary" label="Open for review" />
         } else if (score && score === 0 && isEventOver) {
             return <Chip color="secondary" label="Score unavailable" />
@@ -116,6 +118,24 @@ const ProjectsGridItem = ({
         }
     }
 
+    const styling = {
+        punchlineMaxLength: 150,
+    }
+
+    const stylingModifiers = styleRules => {
+        if (showTableLocation) {
+            styleRules.punchlineMaxLength = styleRules.punchlineMaxLength - 25
+        }
+        if (showScore) {
+            styleRules.punchlineMaxLength = styleRules.punchlineMaxLength - 25
+        }
+        if (showReviewers) {
+            styleRules.punchlineMaxLength = styleRules.punchlineMaxLength - 50
+        }
+    }
+
+    stylingModifiers(styling)
+
     return (
         <Grid item xs={12} sm={6} md={4} style={{ display: 'flex' }}>
             <Card
@@ -163,9 +183,14 @@ const ProjectsGridItem = ({
                                     />
                                 ))}
                             </div>
-                            {/* <Typography variant="body1" component="p">
-                                {_.truncate(project.punchline, { length: 30 })}
-                            </Typography> */}
+                            {project?.punchline && (
+                                <Typography variant="body1" component="p">
+                                    {showTableLocation && showScore}
+                                    {_.truncate(project.punchline, {
+                                        length: styling.punchlineMaxLength,
+                                    })}
+                                </Typography>
+                            )}
                         </div>
                         {showTableLocation && project.location && (
                             <div className="tw-flex tw-gap-2">
@@ -180,14 +205,14 @@ const ProjectsGridItem = ({
                                 </Typography>
                             </div>
                         )}
-                        {showScore && (
+                        {showScore && score && (
                             <div className="tw-flex tw-flex-col tw-gap-2">
                                 <div className="tw-flex tw-gap-2">
                                     <Typography variant="body1">
                                         <strong>Score</strong> {score}
                                     </Typography>
                                 </div>
-                                {showReviewers && (
+                                {message && (
                                     <Typography variant="body1">
                                         {_.truncate(message, { length: 20 })}
                                     </Typography>
@@ -219,55 +244,56 @@ const ProjectsGridItem = ({
                     </div>
                     {showReviewers && (
                         <div className="tw-flex tw-gap-1 tw-w-full">
-                            {project.score > 0 && (
-                                <Tooltip title="Reviewed by Organizer">
-                                    <Avatar>O</Avatar>
-                                </Tooltip>
-                            )}
-                            {project?.reviewers?.map((reviewer, index) => {
-                                if (index === reviewIndexLimit) {
+                            {project?.scoreData?.reviewers?.map(
+                                (reviewer, index) => {
+                                    if (index === reviewIndexLimit) {
+                                        return (
+                                            <Tooltip
+                                                key={index}
+                                                title={`Reviewed by ${
+                                                    project.reviewers.length - 1
+                                                } more ${
+                                                    project.reviewers.length -
+                                                        1 >
+                                                    1
+                                                        ? 'people'
+                                                        : 'person'
+                                                }`}
+                                            >
+                                                <Avatar>
+                                                    +
+                                                    {project.reviewers.length -
+                                                        1}
+                                                </Avatar>
+                                            </Tooltip>
+                                        )
+                                    } else if (index > reviewIndexLimit) {
+                                        return null
+                                    }
                                     return (
                                         <Tooltip
                                             key={index}
                                             title={`Reviewed by ${
-                                                project.reviewers.length - 1
-                                            } more ${
-                                                project.reviewers.length - 1 > 1
-                                                    ? 'people'
-                                                    : 'person'
+                                                reviewer?.userFirstname
+                                                    ? reviewer.userFirstname
+                                                    : 'judge'
                                             }`}
                                         >
-                                            <Avatar>
-                                                +{project.reviewers.length - 1}
-                                            </Avatar>
+                                            {reviewer?.avatar ? (
+                                                <Avatar src={reviewer.avatar} />
+                                            ) : (
+                                                <Avatar>
+                                                    {reviewer?.userFirstname
+                                                        ? reviewer?.userFirstname.charAt(
+                                                              0,
+                                                          )
+                                                        : 'R'}
+                                                </Avatar>
+                                            )}
                                         </Tooltip>
                                     )
-                                } else if (index > reviewIndexLimit) {
-                                    return null
-                                }
-                                return (
-                                    <Tooltip
-                                        key={index}
-                                        title={`Reviewed by ${
-                                            reviewer?.userFirstname
-                                                ? reviewer.userFirstname
-                                                : 'judge'
-                                        }`}
-                                    >
-                                        {reviewer?.avatar ? (
-                                            <Avatar src={reviewer.avatar} />
-                                        ) : (
-                                            <Avatar>
-                                                {reviewer?.userFirstname
-                                                    ? reviewer?.userFirstname.charAt(
-                                                          0,
-                                                      )
-                                                    : 'R'}
-                                            </Avatar>
-                                        )}
-                                    </Tooltip>
-                                )
-                            })}
+                                },
+                            )}
                         </div>
                     )}
                 </CardActions>
@@ -276,7 +302,7 @@ const ProjectsGridItem = ({
                 <ProjectReviewModal
                     open={openReviewModal}
                     onClose={() => setOpenReviewModal(false)}
-                    projectScoreData={project}
+                    projectScoreData={project?.scoreData}
                 />
             )}
         </Grid>
diff --git a/frontend/src/components/tables/AttendeeTable/index.js b/frontend/src/components/tables/AttendeeTable/index.js
index 9b6bf84a1..3b6720bb7 100644
--- a/frontend/src/components/tables/AttendeeTable/index.js
+++ b/frontend/src/components/tables/AttendeeTable/index.js
@@ -13,12 +13,10 @@ import * as OrganiserSelectors from 'redux/organiser/selectors'
 import EditRegistrationModal from 'components/modals/EditRegistrationModal'
 import BulkEditRegistrationModal from 'components/modals/BulkEditRegistrationModal'
 import BulkEmailModal from 'components/modals/BulkEmailModal'
-//import Button from 'components/generic/Button'
-import { Button, IconButton } from '@material-ui/core'
-import DeleteIcon from '@material-ui/icons/Delete'
 
 import { Table, Filters, Sorters } from 'components/generic/_Table'
 import { CSVLink } from 'react-csv'
+import _ from 'lodash'
 
 export default ({
     emptyRenderer,
@@ -73,17 +71,27 @@ export default ({
         [dispatch],
     )
     // TODO move somewhere else
+    const skipArray = ['_id', '__v', 'section', 'key', 'id', 'checklist']
     function flattenObject(ob) {
-        var toReturn = {}
-        for (var i in ob) {
-            if (!ob.hasOwnProperty(i)) continue
+        let toReturn = {}
+        for (let i in ob) {
+            if (!ob.hasOwnProperty(i) || skipArray.some(val => val === i))
+                continue
 
-            if (typeof ob[i] == 'object' && ob[i] !== null) {
-                var flatObject = flattenObject(ob[i])
-                for (var x in flatObject) {
-                    if (!flatObject.hasOwnProperty(x)) continue
-
-                    toReturn[i + '.' + x] = flatObject[x]
+            if (typeof ob[i] === 'object' && ob[i] !== null) {
+                if (i === 'CustomAnswers') {
+                    for (let j in ob[i]) {
+                        if (!ob[i].hasOwnProperty(j)) continue
+                        const customAnswerLabel = ob[i][j].label
+                        const customAnswerValue = ob[i][j].value
+                        toReturn[customAnswerLabel] = customAnswerValue
+                    }
+                } else {
+                    let flatObject = flattenObject(ob[i])
+                    for (let x in flatObject) {
+                        if (!flatObject.hasOwnProperty(x)) continue
+                        toReturn[i + '.' + x] = flatObject[x]
+                    }
                 }
             } else {
                 toReturn[i] = ob[i]
@@ -132,7 +140,7 @@ export default ({
             }
         })
     }, [attendees, teams])
-    console.log("attendeesWithTeam",attendeesWithTeam)
+    console.log('attendeesWithTeam', attendeesWithTeam)
     const columns = useMemo(() => {
         return [
             {
@@ -173,8 +181,7 @@ export default ({
                 accessor: 'user',
                 ...Filters.MultipleSelect,
                 ...Sorters.Alphabetic,
-                Cell: ({ cell: { value } }) =>
-                    value.split('|')[0]
+                Cell: ({ cell: { value } }) => value.split('|')[0],
             },
             {
                 Header: 'Rating',
@@ -281,9 +288,9 @@ export default ({
                                     textDecoration: 'none',
                                     color: 'inherit',
                                 }}
-                                data={selected.map(item =>
-                                    flattenObject(item.original),
-                                )}
+                                data={selected.map(item => {
+                                    return flattenObject(item.original)
+                                })}
                                 filename="export.csv"
                             >
                                 Export registrations
diff --git a/frontend/src/components/tables/ProjectsTable/index.js b/frontend/src/components/tables/ProjectsTable/index.js
index 2bf1a4c9e..bd913912b 100644
--- a/frontend/src/components/tables/ProjectsTable/index.js
+++ b/frontend/src/components/tables/ProjectsTable/index.js
@@ -5,22 +5,37 @@ import * as OrganiserSelectors from 'redux/organiser/selectors'
 
 import { Table, Filters, Sorters } from 'components/generic/_Table'
 import EditProjectModal from 'components/modals/EditProjectModal'
-import ProjectsService from 'services/projects'
-import * as AuthSelectors from 'redux/auth/selectors'
-import CsvExporterService from 'services/csvExporter'
-import { debugGroup } from 'utils/debuggingTools'
 import _ from 'lodash'
-// import team from 'pages/_sandbox/team'
+import { CSVLink } from 'react-csv'
+import { projectURLgenerator } from 'utils/dataModifiers'
 
-const ProjectsTable = ({ projects, baseURL }) => {
+const ProjectsTable = ({ projects }) => {
     const teams = useSelector(OrganiserSelectors.teams)
     const event = useSelector(OrganiserSelectors.event)
 
-    //const dispatch = useDispatch()
-    //const location = useLocation()
+    const skipArray = ['_id', '__v', 'id', 'key', 'section']
+    function flattenObject(ob) {
+        let toReturn = {}
+        for (let i in ob) {
+            if (!ob.hasOwnProperty(i) || skipArray.some(val => val === i))
+                continue
+
+            if (typeof ob[i] === 'object' && ob[i] !== null) {
+                let flatObject = flattenObject(ob[i])
+                for (let x in flatObject) {
+                    if (!flatObject.hasOwnProperty(x)) continue
+                    toReturn[i + '.' + x] = flatObject[x]
+                }
+            } else {
+                toReturn[i] = ob[i]
+            }
+        }
+        return toReturn
+    }
+
+    const [selected, setSelected] = useState([])
 
     const [selectedProject, setSelectedProject] = useState(null)
-    const idToken = useSelector(AuthSelectors.getIdToken)
 
     // TODO config columsn (table only in physical events)
     const openSingleEdit = useCallback(row => {
@@ -62,29 +77,12 @@ const ProjectsTable = ({ projects, baseURL }) => {
                 accessor: 'source',
                 ...Filters.ContainsSearch,
             },
-            /*
-            {
-                Header: 'Location',
-                accessor: 'location',
-                ...Filters.ContainsSearch,
-            },
-            */
         ]
     }, [])
 
-    // const onProjectSelected = useCallback(
-    //     project => {
-    //         dispatch(push(`${baseURL}${project.original._id}`))
-    //     },
-    //     [baseURL, dispatch],
-    // )
-
-    // TODO refactor forloops
-
     const data = projects
         .map(project => {
             const teamFound = teams.find(team => {
-                console.log(team._id, project.team)
                 return team._id === project.team
             })
             if (teamFound) {
@@ -96,57 +94,8 @@ const ProjectsTable = ({ projects, baseURL }) => {
         })
         .filter(project => project.teamCode !== 'No team')
 
-    // const data = projects.map(project => {
-    //     for (const i in teams) {
-    //         const team = teams[i]
-    //         if (project.team === team._id) {
-    //             project.teamCode = team.code
-    //             break
-    //         }
-    //     }
-    //     return project
-    // })
-
-    debugGroup('Project data', data)
-    debugGroup('Teams data', teams)
-
-    const fetchExportProjectData = exportSelectedProjects => {
-        const exportData = _.filter(projects, project =>
-            exportSelectedProjects.includes(project._id),
-        ).map(project => {
-            if (project.submissionFormAnswers) {
-                let submissionFormAnswersFormatted = ''
-                Object.keys(project.submissionFormAnswers).map(key => {
-                    Object.keys(project.submissionFormAnswers[key]).map(
-                        answerKey => {
-                            if (answerKey === 'key') {
-                                submissionFormAnswersFormatted = `${project.submissionFormAnswers[key][answerKey]}: ${submissionFormAnswersFormatted}`
-                            } else if (answerKey === 'value') {
-                                submissionFormAnswersFormatted += `${project.submissionFormAnswers[key][answerKey]}`
-                            }
-                        },
-                    )
-                })
-                console.log(submissionFormAnswersFormatted)
-                project.submissionFormAnswers = submissionFormAnswersFormatted
-            }
-
-            // project.submissionFormAnswers &&
-            //     (project.submissionFormAnswers = Object.keys(project.submissionFormAnswers)
-            return project
-        })
-        //TODO stringify the submissions questions
-        console.log('exportData :>> ', exportData)
-        CsvExporterService.exportToCsv(exportData, 'project-export')
-
-        // ProjectsService.exportProjects(
-        //     idToken,
-        //     event.slug,
-        //     exportSelectedProjects,
-        // ).then(response => {
-        //     console.log('response :>> ', response)
-        //     CsvExporterService.exportToCsv(response, 'project-export')
-        // })
+    const exportProjects = selectedRows => {
+        setSelected(selectedRows)
     }
 
     return (
@@ -163,11 +112,26 @@ const ProjectsTable = ({ projects, baseURL }) => {
                 bulkActions={[
                     {
                         key: 'export-projects',
-                        label: 'Export selected',
-                        action: rows => {
-                            const projectIds = rows.map(row => row.original._id)
-                            fetchExportProjectData(projectIds)
-                        },
+                        label: (
+                            <CSVLink
+                                style={{
+                                    textDecoration: 'none',
+                                    color: 'inherit',
+                                }}
+                                data={selected.map(item => {
+                                    item.original.projectURL =
+                                        projectURLgenerator(
+                                            event.slug,
+                                            item.original._id,
+                                        )
+                                    return flattenObject(item.original)
+                                })}
+                                filename="export.csv"
+                            >
+                                Export selected
+                            </CSVLink>
+                        ),
+                        action: exportProjects,
                     },
                 ]}
             />
diff --git a/frontend/src/graphql/queries/registrations.js b/frontend/src/graphql/queries/registrations.js
index a768a48cf..efaa36d7b 100644
--- a/frontend/src/graphql/queries/registrations.js
+++ b/frontend/src/graphql/queries/registrations.js
@@ -37,6 +37,6 @@ export const useRegistrationsByUser = userId => {
             userId,
         },
     })
-    console.log("useRegistrationsByUser", userId, data, loading, error)
+    console.log('useRegistrationsByUser', userId, data, loading, error)
     return [data?.registrationsByUser, loading, error]
 }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/CreateEventCard.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/CreateEventCard.js
index 8c1edf35c..bb9d422c6 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/CreateEventCard.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/CreateEventCard.js
@@ -28,34 +28,32 @@ const fillerContent = makeStyles({
         height: '10px',
         background: '#cbd2e0',
         borderRadius: '5px',
-        margin: '5px'
+        margin: '5px',
     },
     filler40: {
         width: '40%',
         height: '10px',
         background: '#cbd2e0',
         borderRadius: '5px',
-        margin: '5px'
+        margin: '5px',
     },
     filler60: {
         width: '60%',
         height: '10px',
         background: '#cbd2e0',
         borderRadius: '5px',
-        margin: '5px'
+        margin: '5px',
     },
     filler80: {
         width: '80%',
         height: '10px',
         background: '#cbd2e0',
         borderRadius: '5px',
-        margin: '5px'
+        margin: '5px',
     },
 })
 
-
 const useStyles = makeStyles(theme => ({
-
     wrapper: {
         background: 'white',
         borderRadius: '12px',
@@ -72,7 +70,7 @@ const useStyles = makeStyles(theme => ({
         display: 'flex',
         justifyContent: 'flex-end',
         alignItems: 'flex-end',
-        borderBottom: `2px ${theme.palette.primary.main} solid`
+        borderBottom: `2px ${theme.palette.primary.main} solid`,
     },
     topWrapper: {
         display: 'flex',
@@ -116,14 +114,11 @@ const useStyles = makeStyles(theme => ({
     },
 }))
 
-
-
-
 export default () => {
     const [hover, setHover] = useState(false)
     const { t } = useTranslation()
     const [name, setName] = useState('')
-    const [error, setError] = useState()
+    const [error, setError] = useState('')
     const [loading, setLoading] = useState(false)
     const hasError = Boolean(error)
     const classes = useStyles()
@@ -141,78 +136,66 @@ export default () => {
     }
 
     useEffect(() => {
-        if (hasError) {
-            if (name.length < 5) {
-                setError(t('Name_must_five_'))
-            } else if (name.length >= 50) {
-                setError(t('Name_must_under_'))
-            } else if (name === "default") {
-                setError(t('Name_not_default_'))
-            } else {
-                setError()
-            }
-        }
-    }, [name, hasError, t])
+        checkName()
+    }, [name])
 
     const checkName = useCallback(() => {
         if (name.length < 5) {
-            setError(t('Name_must_five_'))
+            setError('Event name must be at least 5 characters')
             return false
         } else if (name.length >= 50) {
-            setError(t('Name_must_under_'))
+            setError('Event name must be under 50 characters')
             return false
-        } else if (name === "default") {
-            setError(t('Name_not_default_'))
+        } else if (name === 'default') {
+            setError('Event name cannot be default')
             return false
         }
+        setError('')
         return true
-    }, [name.length, t])
+    }, [name.length])
 
     const handleCreate = useCallback(() => {
-        if (!checkName()) return
         setLoading(true)
-        EventsService.createEvent(idToken, { name })
-            .then(data => {
-                dispatch(push(`/organise/${data.slug}`))
-                dispatch(SnackbarActions.success(`Created ${data.name}`))
-            })
-            .catch(e => {
-                dispatch(SnackbarActions.error(t('Unable_to_create_')))
-            })
-            .finally(() => {
-                setLoading(false)
-            })
-    }, [checkName, idToken, name, dispatch, t])
-
-
+        if (checkName()) {
+            EventsService.createEvent(idToken, { name })
+                .then(data => {
+                    dispatch(push(`/organise/${data.slug}`))
+                    dispatch(SnackbarActions.success(`Created ${data.name}`))
+                })
+                .catch(e => {
+                    dispatch(SnackbarActions.error(t('Unable_to_create_')))
+                    if (error) {
+                    }
+                })
+        } else {
+            dispatch(SnackbarActions.error(t('Unable_to_create_')))
+            dispatch(SnackbarActions.error(error))
+        }
+        setLoading(false)
+    }, [checkName, idToken, name, dispatch])
 
     //TODO: make same size, add border color = primary
     return (
         <Card
             onMouseEnter={() => setHover(true)}
             onMouseLeave={() => setHover(false)}
-            onClick={() =>
-                console.log("click")
-            }
-            className={`tw-bg-white tw-m-4 tw-text-left tw-rounded-lg tw-shadow-md tw-min-h-600px tw-max-w-xs tw-flex tw-flex-col tw-bg-gray-200 tw-rounded-t-2xl tw-border-8 tw-border-black tw-justify-between ${styling.cardHover}`}
+            onClick={() => console.log('click')}
+            className={`tw-m-4 tw-text-left tw-rounded-lg tw-shadow-md tw-min-h-600px tw-max-w-xs tw-flex tw-flex-col tw-bg-gray-200 tw-rounded-t-2xl tw-border-8 tw-border-black tw-justify-between ${styling.cardHover}`}
         >
             <CardContent className="tw-flex tw-flex-col tw-p-0">
                 <div className="tw-h-40 tw-w-full tw-my-0 tw-mx-auto tw-relative tw-flex tw-justify-end tw-items-end">
                     <Image
                         className={classes.image}
                         defaultImage={require('assets/images/default_cover_image.png')}
-
                         transformation={{
                             width: 400,
                         }}
                     />
-
-
-
-
                 </div>
                 <div className="tw-p-4 tw-flex tw-flex-col tw-gap-4">
-                    <Typography variant="h4">{t('Create_new_event_')}</Typography>
+                    <Typography variant="h4">
+                        {t('Create_new_event_')}
+                    </Typography>
                 </div>
                 <div className={content.filler80}></div>
                 <div className={content.filler60}></div>
@@ -226,7 +209,12 @@ export default () => {
                 <div className={content.filler80}></div>
 
                 <div className="tw-p-4 tw-flex tw-flex-col tw-gap-4">
-                    <Grid container spacing={4} direction="row" alignItems="flex-end" >
+                    <Grid
+                        container
+                        spacing={4}
+                        direction="row"
+                        alignItems="flex-end"
+                    >
                         <Grid item xs={12} sm={6}>
                             <TextInput
                                 label={t('Event_name_')}
@@ -245,14 +233,12 @@ export default () => {
                                 color="primary"
                                 variant="contained"
                             >
-                                {"+ Create"}
+                                {'+ Create'}
                             </Button>
                         </Grid>
                     </Grid>
                 </div>
             </CardContent>
-
-
-        </Card >
+        </Card>
     )
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
index a3dc38afb..cf5b256bc 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/Organizer.js
@@ -16,8 +16,7 @@ import * as UserActions from 'redux/user/actions'
 
 import CreateEventCard from './CreateEventCard'
 import TextInput from '../../../../../components/inputs/TextInput'
-
-
+import { debugGroup } from 'utils/debuggingTools'
 
 //TODO: make this to use theme colors and make prettier
 const useStyles = makeStyles({
@@ -66,49 +65,48 @@ export default () => {
     var date = new Date()
     const isodate = date.toISOString()
 
-    const [searchTerm, setSearchTerm] = React.useState('')
+    const [searchTerm, setSearchTerm] = useState('')
     const [searchResults, setSearchResults] = useState(organizerEvents)
     const [name, setName] = useState('')
     const [error, setError] = useState()
     const [loading, setLoading] = useState(false)
     const hasError = Boolean(error)
 
-
-
     const isOrganizer = useSelector(AuthSelectors.idTokenData)?.roles?.some(r =>
-        ["Organiser", "AssistantOrganiser", "SuperAdmin"].includes(r)
+        ['Organiser', 'AssistantOrganiser', 'SuperAdmin'].includes(r),
     )
 
-
-    useEffect(() => {
-        if (hasError) {
-            if (name.length < 5) {
-                setError(t('Name_must_five_'))
-            } else if (name.length >= 50) {
-                setError(t('Name_must_under_'))
-            } else if (name === "default") {
-                setError(t('Name_not_default_'))
-            } else {
-                setError()
-            }
-        }
-    }, [name, hasError, t])
-
-    const checkName = useCallback(() => {
-        if (name.length < 5) {
-            setError(t('Name_must_five_'))
-            return false
-        } else if (name.length >= 50) {
-            setError(t('Name_must_under_'))
-            return false
-        } else if (name === "default") {
-            setError(t('Name_not_default_'))
-            return false
-        }
-        return true
-    }, [name.length, t])
-
-    console.log("organizerEvents", organizerEvents)
+    // useEffect(() => {
+    //     if (hasError) {
+    //         if (name.length < 5) {
+    //             setError(t('Name_must_five_'))
+    //         } else if (name.length >= 50) {
+    //             setError(t('Name_must_under_'))
+    //         } else if (name === 'default') {
+    //             setError(t('Name_not_default_'))
+    //         } else {
+    //             setError()
+    //         }
+    //     }
+    // }, [name, hasError, t])
+
+    // const checkName = useCallback(() => {
+    //     if (name.length < 5) {
+    //         setError(t('Name_must_five_'))
+    //         return false
+    //     } else if (name.length >= 50) {
+    //         setError(t('Name_must_under_'))
+    //         return false
+    //     } else if (name === 'default') {
+    //         setError(t('Name_not_default_'))
+    //         return false
+    //     }
+    //     return true
+    // }, [name.length, t])
+
+    console.log('organizerEvents', organizerEvents)
+
+    //TODO implement pagination to improve performance of organize tab
 
     useEffect(() => {
         const results = organizerEvents.filter(
@@ -119,108 +117,100 @@ export default () => {
         setSearchResults(results)
     }, [organizerEvents, searchTerm])
 
-
     //TODO: super slow on superadmin. fix the rendering
-    return (organizerEvents.length === 0 || !isOrganizer) ?
-        (
-            (
-                <>
-
-                    <PageHeader
-                        heading="Your Admin Events"
-                        subheading="You don't have any events yet. Wanna create one?"
-                    />
-                    <Box mt={3}>
-                        <Grid container spacing={3}>
-                            <CreateEventCard></CreateEventCard>
-                        </Grid>
-                    </Box>
-                </>
-            )
-        )
-        :
-        (
-            <>
-
-
-                <PageHeader
-                    heading="Your admin events"
-                    subheading="You are organizing these events"
-                />
-                <Box mt={3}>
-                    <Grid
-                        container
-                        direction="row"
-                        justify="flex-start"
-                        alignItems="center"
-                        spacing={3}
-                    >
-                        <Grid item>
-                            <SearchIcon />
-                        </Grid>
-                        <Grid item xs>
-                            <TextInput
-                                value={searchTerm}
-                                onChange={setSearchTerm}
-                                placeholder={t('Search_')}
-                            />
-                        </Grid>
+    return organizerEvents.length === 0 || !isOrganizer ? (
+        <>
+            <PageHeader
+                heading="Your Admin Events"
+                subheading="You don't have any events yet. Wanna create one?"
+            />
+            <Box mt={3}>
+                <Grid container spacing={3}>
+                    <CreateEventCard></CreateEventCard>
+                </Grid>
+            </Box>
+        </>
+    ) : (
+        <>
+            <PageHeader
+                heading="Your admin events"
+                subheading="You are organizing these events"
+            />
+            <Box mt={3}>
+                <Grid
+                    container
+                    direction="row"
+                    justify="flex-start"
+                    alignItems="center"
+                    spacing={3}
+                >
+                    <Grid item>
+                        <SearchIcon />
                     </Grid>
-                    <Grid container spacing={3}>
-                        <CreateEventCard></CreateEventCard>
-                        {searchResults.map(event => (
-                            <Grid item xs={12} md={6} lg={4}>
-                                <div className={classes.statusText}>
-                                    {event.published && event.approved ? (
-                                        <span className={classes.green}>
-                                            Published!
-                                        </span>
-                                    ) : null}
-                                    {event.published && !event.approved ? (
-                                        <span className={classes.yellow}>
-                                            Waiting approval
-                                        </span>
-                                    ) : null}
-                                    {!event.published ? (
-                                        <span className={classes.orange}>
-                                            Not published
-                                        </span>
-                                    ) : null}
-                                </div>
-
-                                <NewEventCard
-                                    event={event}
-                                    buttons={[
-
-                                        <Button
-                                            size="small"
-                                            onClick={() =>
-                                                dispatch(push('/events/' + event.slug))
-                                            }
-                                        >
-                                            {t('See_more_')}
-                                        </Button>,
-                                        <Button
-                                            size="small"
-                                            onClick={() => {
-                                                dispatch(UserActions.setAccessRight('organizer'))
-                                                dispatch(
-                                                    push(`/organise/${event.slug}`),
-                                                )
-                                            }
-                                            }
-                                        >
-                                            {t('Manage_')}
-                                        </Button>,
-                                    ]}
-                                />
-
-                            </Grid>
-                        ))}
+                    <Grid item xs>
+                        <TextInput
+                            value={searchTerm}
+                            onChange={setSearchTerm}
+                            placeholder={t('Search_')}
+                        />
                     </Grid>
-                </Box>
-            </>
-        )
-
-
-}
\ No newline at end of file
+                </Grid>
+                <Grid container spacing={3}>
+                    <CreateEventCard />
+                    {searchResults.map(event => (
+                        <Grid item xs={12} md={6} lg={4}>
+                            <div className={classes.statusText}>
+                                {event.published && event.approved ? (
+                                    <span className={classes.green}>
+                                        Published!
+                                    </span>
+                                ) : null}
+                                {event.published && !event.approved ? (
+                                    <span className={classes.yellow}>
+                                        Waiting approval
+                                    </span>
+                                ) : null}
+                                {!event.published ? (
+                                    <span className={classes.orange}>
+                                        Not published
+                                    </span>
+                                ) : null}
+                            </div>
+
+                            <NewEventCard
+                                event={event}
+                                buttons={[
+                                    <Button
+                                        size="small"
+                                        onClick={() =>
+                                            dispatch(
+                                                push('/events/' + event.slug),
+                                            )
+                                        }
+                                    >
+                                        {t('See_more_')}
+                                    </Button>,
+                                    <Button
+                                        size="small"
+                                        onClick={() => {
+                                            dispatch(
+                                                UserActions.setAccessRight(
+                                                    'organizer',
+                                                ),
+                                            )
+                                            dispatch(
+                                                push(`/organise/${event.slug}`),
+                                            )
+                                        }}
+                                    >
+                                        {t('Manage_')}
+                                    </Button>,
+                                ]}
+                            />
+                        </Grid>
+                    ))}
+                </Grid>
+            </Box>
+        </>
+    )
+}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
index 001ac223b..314b1fb6d 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/Participant.js
@@ -14,13 +14,10 @@ import Button from 'components/generic/Button'
 import PageWrapper from 'components/layouts/PageWrapper'
 import Container from 'components/generic/Container'
 
-
 import * as AuthSelectors from 'redux/auth/selectors'
 import * as DashboardSelectors from 'redux/dashboard/selectors'
 import * as UserActions from 'redux/user/actions'
 
-
-
 export default () => {
     const userId = useSelector(AuthSelectors.getUserId)
     const activeEvents = useSelector(DashboardSelectors.activeEvents)
@@ -28,11 +25,9 @@ export default () => {
     const [registrations, loading, error] = useRegistrationsByUser(userId)
     //useSelector(UserSelectors.registrations)
 
-
-
-    console.log("activeEvents", activeEvents)
-    console.log("pastEvents", pastEvents)
-    console.log("registrations", registrations)
+    console.log('activeEvents', activeEvents)
+    console.log('pastEvents', pastEvents)
+    console.log('registrations', registrations)
 
     const dispatch = useDispatch()
     const { t } = useTranslation()
@@ -40,7 +35,6 @@ export default () => {
     const isodate = date.toISOString()
 
     function renderEvents() {
-
         return (
             <>
                 <PageHeader
@@ -51,12 +45,12 @@ export default () => {
                 <Box p={2}>
                     <Grid container spacing={3}>
                         <Grid item xs={12}>
-
-                            {registrations.length === 0 && (
-                                <Typography variant="body1">
-                                    {t('Looks_like_register_')}
-                                </Typography>
-                            )}
+                            {Array.isArray(registrations) &&
+                                registrations.length === 0 && (
+                                    <Typography variant="body1">
+                                        {t('Looks_like_register_')}
+                                    </Typography>
+                                )}
                         </Grid>
 
                         {registrations?.map(registration => (
@@ -64,45 +58,63 @@ export default () => {
                                 <EventCardSmall
                                     event={registration.event}
                                     handleClick={event => {
-                                        dispatch(UserActions.setAccessRight('participant'))//TODO: make this a schema
-                                        dispatch(push(`/dashboard/event/${event?.slug}`))
-                                    }
-                                    }
+                                        dispatch(
+                                            UserActions.setAccessRight(
+                                                'participant',
+                                            ),
+                                        ) //TODO: make this a schema
+                                        dispatch(
+                                            push(
+                                                `/dashboard/event/${event?.slug}`,
+                                            ),
+                                        )
+                                    }}
                                 />
                             </Grid>
                         ))}
                     </Grid>
                 </Box>
 
-
-                <h1 >Upcoming Events</h1>
+                <h1>Upcoming Events</h1>
 
                 <Box mt={3}>
                     <Grid container spacing={3}>
-                        {activeEvents?.filter(event =>
-                            registrations?.map(e => e.event?.slug).indexOf(event?.slug) === -1
-                        )
+                        {activeEvents
+                            ?.filter(
+                                event =>
+                                    registrations
+                                        ?.map(e => e.event?.slug)
+                                        .indexOf(event?.slug) === -1,
+                            )
                             .map(event => {
                                 const canApply =
                                     isodate < event.registrationEndTime &&
                                     isodate > event.registrationStartTime
 
                                 const eventStarted = isodate > event.startTime
-                                console.log("button render", event.slug, canApply && !event.galleryOpen, event.galleryOpen && eventStarted)
+                                console.log(
+                                    'button render',
+                                    event.slug,
+                                    canApply && !event.galleryOpen,
+                                    event.galleryOpen && eventStarted,
+                                )
                                 return (
                                     <NewEventCard
                                         event={event}
                                         buttons={[
-                                            (
-                                                <Button
-                                                    size="small"
-                                                    onClick={() =>
-                                                        dispatch(push('/events/' + event.slug))
-                                                    }
-                                                >
-                                                    {t('See_more_')}
-                                                </Button>
-                                            ),
+                                            <Button
+                                                size="small"
+                                                onClick={() =>
+                                                    dispatch(
+                                                        push(
+                                                            '/events/' +
+                                                                event.slug,
+                                                        ),
+                                                    )
+                                                }
+                                            >
+                                                {t('See_more_')}
+                                            </Button>,
                                             canApply && (
                                                 <Button
                                                     size="small"
@@ -110,8 +122,8 @@ export default () => {
                                                         dispatch(
                                                             push(
                                                                 '/events/' +
-                                                                event.slug +
-                                                                '/register/',
+                                                                    event.slug +
+                                                                    '/register/',
                                                             ),
                                                         )
                                                     }
@@ -119,35 +131,34 @@ export default () => {
                                                     Register
                                                 </Button>
                                             ),
-                                            event.galleryOpen && eventStarted && (
-                                                <Button
-                                                    size="small"
-                                                    onClick={() => {
-                                                        console.log('/projects/' + event.slug)
-                                                        dispatch(
-                                                            push('/projects/' + event.slug),
-                                                        )
-                                                    }
-                                                    }
-                                                >
-                                                    Projects
-                                                </Button>
-                                            ),
-
-
-
-
-
-
+                                            event.galleryOpen &&
+                                                eventStarted && (
+                                                    <Button
+                                                        size="small"
+                                                        onClick={() => {
+                                                            console.log(
+                                                                '/projects/' +
+                                                                    event.slug,
+                                                            )
+                                                            dispatch(
+                                                                push(
+                                                                    '/projects/' +
+                                                                        event.slug,
+                                                                ),
+                                                            )
+                                                        }}
+                                                    >
+                                                        Projects
+                                                    </Button>
+                                                ),
                                         ]}
-                                    />)
-                            }
-                            )
-                        }
+                                    />
+                                )
+                            })}
                     </Grid>
-                </Box >
+                </Box>
 
-                <h1 >Past Events</h1>
+                <h1>Past Events</h1>
 
                 <Box mt={3}>
                     <Grid container spacing={3}>
@@ -161,38 +172,43 @@ export default () => {
                                 <NewEventCard
                                     event={event}
                                     buttons={[
-                                        (
-                                            <Button
-                                                size="small"
-                                                onClick={() =>
-                                                    dispatch(push('/events/' + event.slug))
-                                                }
-                                            >
-                                                {t('See_more_')}
-                                            </Button>
-                                        ),
-
+                                        <Button
+                                            size="small"
+                                            onClick={() =>
+                                                dispatch(
+                                                    push(
+                                                        '/events/' + event.slug,
+                                                    ),
+                                                )
+                                            }
+                                        >
+                                            {t('See_more_')}
+                                        </Button>,
                                         event.galleryOpen && eventStarted && (
                                             <Button
                                                 size="small"
                                                 onClick={() => {
-                                                    console.log('/projects/' + event.slug)
+                                                    console.log(
+                                                        '/projects/' +
+                                                            event.slug,
+                                                    )
                                                     dispatch(
-                                                        push('/projects/' + event.slug),
+                                                        push(
+                                                            '/projects/' +
+                                                                event.slug,
+                                                        ),
                                                     )
-                                                }
-                                                }
+                                                }}
                                             >
                                                 Projects
                                             </Button>
                                         ),
                                     ]}
-                                />)
-                        }
-                        )
-                        }
+                                />
+                            )
+                        })}
                     </Grid>
-                </Box >
+                </Box>
 
                 <Box textAlign="center" padding={5}>
                     <Button
@@ -210,12 +226,7 @@ export default () => {
     return (
         <PageWrapper
             loading={loading}
-            render={() => (
-                <Container center>
-                    {renderEvents()}
-                </Container>
-            )
-            }
+            render={() => <Container center>{renderEvents()}</Container>}
         />
     )
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/default/events/Partner.js b/frontend/src/pages/_dashboard/renderDashboard/default/events/Partner.js
index c525ba2e7..3f55618ea 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/default/events/Partner.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/default/events/Partner.js
@@ -4,7 +4,6 @@ import { push } from 'connected-react-router'
 import { useSelector } from 'react-redux'
 import { useRegistrationsByUser } from 'graphql/queries/registrations'
 
-
 import PageHeader from 'components/generic/PageHeader'
 import NewEventCard from 'components/events/NewEventCard'
 import Button from 'components/generic/Button'
@@ -22,14 +21,16 @@ export default () => {
     const userId = useSelector(AuthSelectors.getUserId)
     const activeEvents = useSelector(DashboardSelectors.activeEvents)
     const pastEvents = useSelector(DashboardSelectors.pastEvents)
-    const recruiterEvents = useSelector(UserSelectors.userProfileRecruiterEvents)
+    const recruiterEvents = useSelector(
+        UserSelectors.userProfileRecruiterEvents,
+    )
     const [registrations, loading, error] = useRegistrationsByUser(userId)
     const [partnerEvents, setPartnerEvents] = useState([])
 
-    console.log("activeEvents", activeEvents)
-    console.log("pastEvents", pastEvents)
-    console.log("registrations", registrations)
-    console.log("recruiterEvents", recruiterEvents)
+    console.log('activeEvents', activeEvents)
+    console.log('pastEvents', pastEvents)
+    console.log('registrations', registrations)
+    console.log('recruiterEvents', recruiterEvents)
 
     const dispatch = useDispatch()
     const { t } = useTranslation()
@@ -37,13 +38,11 @@ export default () => {
     useEffect(() => {
         const foundPartnerEvents = registrations?.filter(registration => {
             const recEvents = recruiterEvents?.map(e => e.eventId)
-            return recEvents?.some(r => r === registration?.event._id)
+            return recEvents?.some(r => r === registration?.event?._id)
         })
         setPartnerEvents(foundPartnerEvents)
     }, [registrations, recruiterEvents])
-    console.log("partnerEvents", partnerEvents)
-
-
+    console.log('partnerEvents', partnerEvents)
 
     function renderEvents() {
         return (
@@ -55,17 +54,23 @@ export default () => {
 
                 <Box mt={3}>
                     <Grid container spacing={3}>
-                        {partnerEvents?.map(registration => {//TODO: fiter current event away
+                        {partnerEvents?.map(registration => {
+                            //TODO: fiter current event away
 
                             return (
                                 <NewEventCard
                                     event={registration.event}
                                     buttons={[
-
                                         <Button
                                             size="small"
                                             onClick={() =>
-                                                dispatch(push('/events/' + registration.event.slug))
+                                                dispatch(
+                                                    push(
+                                                        '/events/' +
+                                                            registration.event
+                                                                .slug,
+                                                    ),
+                                                )
                                             }
                                         >
                                             {t('See_more_')}
@@ -74,19 +79,30 @@ export default () => {
                                         <Button
                                             size="small"
                                             onClick={() => {
-                                                console.log('/dashboard/event/' + registration.event.slug)
-                                                dispatch(UserActions.setAccessRight('partner'))
-                                                dispatch(push(`/dashboard/event/${registration.event?.slug}`))
-                                            }
-                                            }
+                                                console.log(
+                                                    '/dashboard/event/' +
+                                                        registration.event.slug,
+                                                )
+                                                dispatch(
+                                                    UserActions.setAccessRight(
+                                                        'partner',
+                                                    ),
+                                                )
+                                                dispatch(
+                                                    push(
+                                                        `/dashboard/event/${registration.event?.slug}`,
+                                                    ),
+                                                )
+                                            }}
                                         >
                                             {t('Dashboard_')}
                                         </Button>,
                                     ]}
-                                />)
+                                />
+                            )
                         })}
                     </Grid>
-                </Box >
+                </Box>
             </>
         )
     }
@@ -94,12 +110,7 @@ export default () => {
     return (
         <PageWrapper
             loading={loading}
-            render={() => (
-                <Container center>
-                    {renderEvents()}
-                </Container>
-            )
-            }
+            render={() => <Container center>{renderEvents()}</Container>}
         />
     )
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/ReviewingPeriodBlock.js b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/ReviewingPeriodBlock.js
index b9ebd44d2..461b73462 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/ReviewingPeriodBlock.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/ReviewingPeriodBlock.js
@@ -21,23 +21,30 @@ export default () => {
             dispatch(DashboardActions.updateAnnotator(event.slug))
         }
     }, [event, dispatch])
-    if (event.reviewMethod === 'manualReview' && EventHelpers.isVotingOpen(event, moment)) return (
-        <Grid item xs={12}>
-            <GradientBox p={3} color="theme_purple">
-                <Typography variant="button">Reviewing period</Typography>
-                <Typography variant="h4">Reviewing period is open!</Typography>
-                <Typography variant="h6" gutterBottom>
-                    Reviewing ends {moment(event.reviewingEndTime).fromNow()}
-                </Typography>
-                <Typography variant="body1" gutterBottom>
-                    Sit back and relax while we review your project!
-                </Typography>
-                <Box mt={2}></Box>
-            </GradientBox>
-        </Grid>
+    if (
+        event.reviewMethod === 'gavelPeerReview' &&
+        EventHelpers.isReviewingOpen(event, moment)
     )
+        return (
+            <Grid item xs={12}>
+                <GradientBox p={3} color="theme_purple">
+                    <Typography variant="button">Reviewing period</Typography>
+                    <Typography variant="h4">
+                        Reviewing period is open!
+                    </Typography>
+                    <Typography variant="h6" gutterBottom>
+                        Reviewing ends{' '}
+                        {moment(event.reviewingEndTime).fromNow()}
+                    </Typography>
+                    <Typography variant="body1" gutterBottom>
+                        Sit back and relax while your project is reviewed!
+                    </Typography>
+                    <Box mt={2}></Box>
+                </GradientBox>
+            </Grid>
+        )
 
-    if (!EventHelpers.isVotingOpen(event, moment)) return null
+    if (!EventHelpers.isReviewingOpen(event, moment)) return null
 
     return (
         <Grid item xs={12}>
@@ -55,7 +62,9 @@ export default () => {
                 <Box mt={2}></Box>
                 <Button
                     onClick={() =>
-                        dispatch(push(`/dashboard/event/${event.slug}/reviewing`))
+                        dispatch(
+                            push(`/dashboard/event/${event.slug}/reviewing`),
+                        )
                     }
                     color="theme_white"
                     variant="contained"
diff --git a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/TravelGrantStatusBlock.js b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/TravelGrantStatusBlock.js
index 888f43518..456e654cf 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/TravelGrantStatusBlock.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/TravelGrantStatusBlock.js
@@ -13,7 +13,7 @@ const STATUSES = RegistrationStatuses.asObject
 export default () => {
     const event = useSelector(DashboardSelectors.event)
     const registration = useSelector(DashboardSelectors.registration)
-    if (event?.eventType !== EventTypes.physical.id) return null
+    if (event?.eventType === EventTypes.online.id) return null
     if (!registration?.answers?.needsTravelGrant) return null
 
     // TODO: When status is checkedIn, show the travel grant details submission form here
diff --git a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/VisaInvitationBlock.js b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/VisaInvitationBlock.js
index 2649f55fb..2ce4c0e4b 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/VisaInvitationBlock.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/Blocks/VisaInvitationBlock.js
@@ -16,7 +16,7 @@ const VisaInvitationDrawer = React.lazy(() =>
 export default () => {
     const event = useSelector(DashboardSelectors.event)
     const registration = useSelector(DashboardSelectors.registration)
-    if (event?.eventType !== EventTypes.physical.id) return null
+    if (event?.eventType === EventTypes.online.id) return null
 
     const statuses = [STATUSES.accepted.id, STATUSES.confirmed.id]
 
diff --git a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/index.js b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/index.js
index 9032582fd..070923594 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/generalPages/default/index.js
@@ -6,47 +6,37 @@ import config from 'constants/config'
 import RegistrationStatusBlock from './Blocks/RegistrationStatusBlock'
 import ProjectBlock from './Blocks/ProjectBlock'
 import TeamStatusBlock from './Blocks/TeamStatusBlock'
-import VisaInvitationBlock from './Blocks/VisaInvitationBlock'
-import TravelGrantStatusBlock from './Blocks/TravelGrantStatusBlock'
+// import VisaInvitationBlock from './Blocks/VisaInvitationBlock'
+// import TravelGrantStatusBlock from './Blocks/TravelGrantStatusBlock'
 import GavelReviewingBlock from './Blocks/GavelReviewingBlock'
 import ProjectSubmissionsBlock from './Blocks/ProjectSubmissionsBlock'
-//import PartnerReviewingBlock from './Blocks/PartnerReviewingBlock'
 import ReviewingPeriodBlock from './Blocks/ReviewingPeriodBlock'
 import CertificateBlock from './Blocks/CertificateBlock'
 import EventOverBlock from './Blocks/EventOverBlock'
 import SocialMediaBlock from './Blocks/SocialMediaBlock'
-import EventTimeline from 'pages/_events/slug/default/EventTimeline'
-import TimeLineBlock from './Blocks/TimeLineBlock'
+// import EventTimeline from 'pages/_events/slug/default/EventTimeline'
+// import TimeLineBlock from './Blocks/TimeLineBlock'
 import AlertBlock from './Blocks/AlertBlock'
 import EventPageScriptIFrame from 'components/events/EventPageScriptIFrame'
 import { EventPageScripts } from '@hackjunction/shared'
 import { useSelector } from 'react-redux'
 import * as DashboardSelectors from 'redux/dashboard/selectors'
-import * as AuthSelectors from 'redux/auth/selectors'
+// import * as AuthSelectors from 'redux/auth/selectors'
 import * as UserSelectors from 'redux/user/selectors'
-import PartnerReviewingBlock from './Blocks/PartnerReviewingBlock'
+// import PartnerReviewingBlock from './Blocks/PartnerReviewingBlock'
 export default ({ alerts }) => {
     const user = useSelector(UserSelectors.userProfile)
     const event = useSelector(DashboardSelectors.event)
     const projects = useSelector(DashboardSelectors.projects)
-    const isPartner =
-        user.userId == 'google-oauth2|108766439620242776277' ||
-        (useSelector(AuthSelectors.idTokenData)?.roles?.includes('Recruiter') &&
-            !useSelector(AuthSelectors.idTokenData)?.roles?.includes(
-                'SuperAdmin',
-            ))
+    // const isPartner =
+    //     user.userId == 'google-oauth2|108766439620242776277' ||
+    //     (useSelector(AuthSelectors.idTokenData)?.roles?.includes('Recruiter') &&
+    //         !useSelector(AuthSelectors.idTokenData)?.roles?.includes(
+    //             'SuperAdmin',
+    //         ))
     return (
         <Box>
             <PageHeader heading="Dashboard" />
-            {/*isPartner ? (
-                <a href="https://junction-partner-guidebook-2022.notion.site/Partner-Guidebook-7f5b37bee5a9466cb801211c2b7d99e2">
-                    Click here for guidebook!
-                </a>
-            ) : (
-                <a href="https://guidebook2022.notion.site/guidebook2022/Participant-Guidebook-a98e9f36c4594c1ca757a1e2c120b587">
-                    Click here for guidebook!
-                </a>
-            )*/}
 
             <Helmet>
                 <title>Junction App || Dashboard</title>
@@ -111,7 +101,6 @@ export default ({ alerts }) => {
 
                 <GavelReviewingBlock />
                 <SocialMediaBlock />
-
             </Grid>
             {event && (
                 <EventPageScriptIFrame
diff --git a/frontend/src/pages/_dashboard/renderDashboard/index.js b/frontend/src/pages/_dashboard/renderDashboard/index.js
index 216ea4c56..ff48dd25b 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/index.js
@@ -82,8 +82,6 @@ export default role => {
             ['Organiser', 'AssistantOrganiser', 'SuperAdmin'].includes(r),
         ) && organizerEvents?.map(e => e._id).includes(event?._id)
 
-    console.log(isPartner, 'user is partner', isOrganizer, 'user is organizer')
-
     // Set up browser notifications
     useEffect(() => {
         if ('Notification' in window && Notification.permission !== 'granted') {
@@ -96,13 +94,7 @@ export default role => {
         dispatch(DashboardActions.updateEvent(slug))
         dispatch(DashboardActions.updateRegistration(slug))
         dispatch(DashboardActions.updateTeam(slug))
-
-        //TODO dont use OrganiserSelectors here
-        dispatch(OrganiserActions.updateProjects(slug))
-        dispatch(OrganiserActions.updateGavelProjects(slug))
-        dispatch(OrganiserActions.updateRankings(slug))
-        dispatch(OrganiserActions.generateResults(slug)) // TODO do we need to get results always?
-    }, [slug, dispatch])
+    }, [slug])
 
     // Must use lazy query because event is fetched asynchnronously
     const [getAlerts, { loading: alertsLoading, data: alertsData }] =
@@ -118,14 +110,10 @@ export default role => {
 
     useEffect(() => {
         dispatch(UserActions.organizerEvents(organizerEvents))
-        console.log(' dispatch(UserActions.organizerEvents)')
-        console.log(loadingActive, loadingPast)
         if (!loadingActive) {
             dispatch(DashboardActions.activeEvents(activeEvents))
         }
-        console.log('dipatch past?', loadingPast, pastEvents)
         if (!loadingPast) {
-            console.log('dipatch past', pastEvents)
             dispatch(DashboardActions.pastEvents(pastEvents))
         }
     }, [organizerEvents, activeEvents, pastEvents])
@@ -170,17 +158,13 @@ export default role => {
 
     useEffect(() => {
         //does not take multiple roles into a count
-        console.log('setting access', isPartner, isOrganizer)
         if (isPartner) {
             dispatch(UserActions.setAccessRight('partner'))
-            console.log('partner', userAccessRight)
         } else if (isOrganizer) {
             dispatch(UserActions.setAccessRight('organizer'))
-            console.log('organizer', userAccessRight)
         }
     }, [])
 
-    console.log('userAccess', userAccessRight)
     //TODO: reconstruct to contain partner, organizer & participnat pages
     switch (userAccessRight) {
         case 'partner': {
@@ -196,6 +180,7 @@ export default role => {
                         originalAlertCount={alertCount}
                         originalAlerts={alerts}
                         shownPages={shownPages}
+                        lockedPages={lockedPages}
                     />
                 </PageWrapper>
             )
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js
index 1c29fad4b..62493f2d6 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js
@@ -210,7 +210,7 @@ export default ({ value, onChange }) => {
                     label="Challenge name"
                     value={name}
                     onChange={handleNameChange}
-                    maxLength={100}
+                    maxLength={50}
                 />
                 <Typography variant="caption">
                     The unique publicly visible name of the challenge.
@@ -221,6 +221,7 @@ export default ({ value, onChange }) => {
                     label="Unique slug"
                     value={slug}
                     onChange={setSlug}
+                    maxLength={50}
                 />
                 <Typography variant="caption">
                     A unique slug for the challenge. This will be used in e.g.
@@ -279,6 +280,7 @@ export default ({ value, onChange }) => {
                     value={description}
                     onChange={setDescription}
                     placeholder="Description goes here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">
                     Challenge description.
@@ -291,6 +293,7 @@ export default ({ value, onChange }) => {
                     value={insights}
                     onChange={setInsights}
                     placeholder="Insights go here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">Challenge insights.</Typography>
             </Grid>
@@ -301,6 +304,7 @@ export default ({ value, onChange }) => {
                     value={resources}
                     onChange={setResources}
                     placeholder="Resource go here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">Challenge resources.</Typography>
             </Grid>
@@ -311,6 +315,7 @@ export default ({ value, onChange }) => {
                     value={prizes}
                     onChange={setPrizes}
                     placeholder="Prizes go here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">Challenge Prizes.</Typography>
             </Grid>
@@ -321,6 +326,7 @@ export default ({ value, onChange }) => {
                     value={criteria}
                     onChange={setCriteria}
                     placeholder="Criteria go here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">Challenge criteria.</Typography>
             </Grid>
@@ -331,6 +337,7 @@ export default ({ value, onChange }) => {
                     value={companyInfo}
                     onChange={setCompanyInfo}
                     placeholder="Company info goes here"
+                    maxLength={1000}
                 />
                 <Typography variant="caption">Company Info</Typography>
             </Grid>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/configuration/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/configuration/index.js
index 05a5480c3..ed8bda140 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/configuration/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/configuration/index.js
@@ -98,7 +98,10 @@ export default () => {
                                             null,
                                         )
                                     }
-                                    if (value === 'physical') {
+                                    if (
+                                        value === 'physical' ||
+                                        value === 'hybrid'
+                                    ) {
                                         await form.setFieldValue(
                                             'eventLocation',
                                             form.values.eventLocation ?? {}, //checks whether the eventLocation is null || undefined => if true, set it to an empty object
@@ -120,7 +123,8 @@ export default () => {
                     name="eventLocation"
                     render={({ field, form }) => {
                         if (
-                            form.values.eventType === 'physical' &&
+                            (form.values.eventType === 'physical' ||
+                                form.values.eventType === 'hybrid') &&
                             field.value
                         ) {
                             return (
@@ -145,7 +149,7 @@ export default () => {
                     }}
                 />
             </Grid>
-            <Grid item xs={12}>
+            {/* <Grid item xs={12}>
                 <Field
                     name="travelGrantConfig"
                     render={({ field, form }) => {
@@ -162,7 +166,7 @@ export default () => {
                         return null
                     }}
                 />
-            </Grid>
+            </Grid> */}
             <Grid item xs={12}>
                 <FastField
                     name="tracksEnabled"
@@ -219,7 +223,7 @@ export default () => {
                     name="reviewMethod"
                     render={({ field, form }) => (
                         <FormControl
-                            label="Reviewing method"
+                            label="Reviewing method to select overall winner"
                             hint={
                                 form.values.tracksEnabled
                                     ? 'Which method should be used to determine the ranking of projects within tracks?'
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/CustomSectionList/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/CustomSectionList/index.js
index 786dc6421..3d67949d4 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/CustomSectionList/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/CustomSectionList/index.js
@@ -7,7 +7,6 @@ import Button from 'components/generic/Button'
 import CustomSectionListItem from './CustomSectionListItem'
 import { useTranslation } from 'react-i18next'
 import { now } from 'moment'
-import { debugGroup } from 'utils/debuggingTools'
 
 export default ({ sections = [], onChange, projectsExist = false }) => {
     const { t } = useTranslation()
@@ -71,18 +70,18 @@ export default ({ sections = [], onChange, projectsExist = false }) => {
         [onChange, sections],
     )
 
-    const handleEditDone = useCallback(
-        section => {
-            const newValue = sections.map(s => {
-                if (s.name === section.name) {
-                    return section
-                }
-                return s
-            })
-            onChange(newValue)
-        },
-        [onChange, sections],
-    )
+    // const handleEditDone = useCallback(
+    //     section => {
+    //         const newValue = sections.map(s => {
+    //             if (s.name === section.name) {
+    //                 return section
+    //             }
+    //             return s
+    //         })
+    //         onChange(newValue)
+    //     },
+    //     [onChange, sections],
+    // )
 
     const renderAdd = () => (
         <Button
@@ -127,7 +126,6 @@ export default ({ sections = [], onChange, projectsExist = false }) => {
         )
     }
 
-    debugGroup('Custom section list')
     return (
         <>
             {sections.length === 0 ? renderEmpty() : renderList()}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/index.js
index 60c91068a..57b120099 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/questions/index.js
@@ -8,66 +8,6 @@ import FormControl from 'components/inputs/FormControl'
 import QuestionSelect from './QuestionSelect'
 
 export default () => {
-    // const buildColumns = useCallback((form, field, fieldValue) => {
-    //     return [
-    //         {
-    //             Header: 'Name',
-    //             accessor: 'label',
-    //         },
-    //         {
-    //             Header: 'Category',
-    //             accessor: 'category',
-    //         },
-    //         {
-    //             Header: 'Enabled?',
-    //             accessor: 'enabled',
-    //             Cell: props => {
-    //                 const row = props.row.original
-    //                 return (
-    //                     <Switch
-    //                         color="primary"
-    //                         disabled={!row.editable}
-    //                         checked={row.enable}
-    //                         onChange={(e, enable) => {
-    //                             form.setFieldValue(field.name, {
-    //                                 ...fieldValue,
-    //                                 [row.key]: {
-    //                                     ...fieldValue[row.key],
-    //                                     enable,
-    //                                     require: !enable ? false : row.require,
-    //                                 },
-    //                             })
-    //                         }}
-    //                     />
-    //                 )
-    //             },
-    //         },
-    //         {
-    //             Header: 'Required?',
-    //             accessor: 'require',
-    //             Cell: props => {
-    //                 const row = props.row.original
-    //                 return (
-    //                     <Switch
-    //                         color="primary"
-    //                         disabled={!row.editable || !row.enable}
-    //                         checked={row.require}
-    //                         onChange={(e, require) => {
-    //                             form.setFieldValue(field.name, {
-    //                                 ...fieldValue,
-    //                                 [row.key]: {
-    //                                     ...fieldValue[row.key],
-    //                                     require,
-    //                                 },
-    //                             })
-    //                         }}
-    //                     />
-    //                 )
-    //             },
-    //         },
-    //     ]
-    // }, [])
-
     return (
         <Grid container spacing={3}>
             <Grid item xs={12}>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/submission/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/submission/index.js
index 2d18e34a8..6a0d0fcb8 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/submission/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/edit/submission/index.js
@@ -7,7 +7,7 @@ import * as OrganiserSelectors from 'redux/organiser/selectors'
 import { useSelector } from 'react-redux'
 import _ from 'lodash'
 import { useTranslation } from 'react-i18next'
-import Switch from '../../../../../../components/generic/Switch'
+import Switch from 'components/generic/Switch'
 import Button from 'components/generic/Button'
 
 export default () => {
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js
index 7b7ff259b..d0c4ddb0c 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/index.js
@@ -150,19 +150,13 @@ export default () => {
                         label: 'Projects',
                         component: ProjectsPage,
                     },
-                    {
-                        key: 'results',
-                        path: '/results',
-                        icon: <AssessmentIcon />,
-                        label: 'Results',
-                        component: ResultsPage,
-                    },
                     {
                         key: 'checkin',
                         path: '/check-in',
                         exact: true,
-                        locked: event.eventType !== EventTypes.physical.id,
-                        lockedDescription: 'Only for physical events',
+                        locked: event.eventType === EventTypes.online.id,
+                        lockedDescription:
+                            'Only for physical and hybrid events',
                         icon: <CropFreeIcon />,
                         label: 'Check-in',
                         component: CheckinPage,
@@ -184,6 +178,15 @@ export default () => {
                         component: AlertsPage,
                     },
                     //Experimental
+
+                    {
+                        key: 'results',
+                        path: '/results',
+                        hidden: !event?.experimental,
+                        icon: <AssessmentIcon />,
+                        label: 'Results',
+                        component: ResultsPage,
+                    },
                     {
                         key: 'travel-grants',
                         path: '/travel-grants',
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/admin/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/admin/index.js
index b5d25d8e3..3c04e79d9 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/admin/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/admin/index.js
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import React, { useMemo, useState } from 'react'
 
 import { useDispatch, useSelector } from 'react-redux'
 import { groupBy, filter } from 'lodash-es'
@@ -12,10 +12,14 @@ import * as AuthSelectors from 'redux/auth/selectors'
 import * as OrganiserActions from 'redux/organiser/actions'
 import * as SnackbarActions from 'redux/snackbar/actions'
 import RegistrationsService from 'services/registrations'
+import Button from 'components/generic/Button'
+
+import TextAreaInput from 'components/inputs/TextAreaInput'
 
 const STATUSES = RegistrationStatuses.asObject
 
 export default () => {
+    const isSuperAdmin = useSelector(AuthSelectors.hasSuperAdmin)
     const dispatch = useDispatch()
 
     const registrations = useSelector(OrganiserSelectors.registrations)
@@ -93,6 +97,32 @@ export default () => {
     const total = registrations.length
     const rated = filter(registrations, reg => reg.rating).length
 
+    const [gavelInputs, setGavelInputs] = useState('')
+    // let gavelInputs = ''
+    const gavelData = str => {
+        setGavelInputs(str)
+    }
+
+    const submitGavelLoginData = async data => {
+        return RegistrationsService.addGavelLoginToRegistrations(
+            idToken,
+            event.slug,
+            data,
+        )
+            .then(data => {
+                dispatch(SnackbarActions.success('Gavel logins added.'))
+            })
+            .catch(err => {
+                dispatch(SnackbarActions.error(`Something went wrong...`))
+            })
+            .finally(() => {
+                dispatch(
+                    OrganiserActions.updateRegistrationsForEvent(event.slug),
+                )
+                return
+            })
+    }
+
     return (
         <PageWrapper loading={loading}>
             <Typography variant="h5" paragraph>
@@ -226,6 +256,36 @@ export default () => {
                     </Paper>
                 </Grid>
             </Grid>
+            {isSuperAdmin && (
+                <>
+                    <Typography variant="h5" paragraph>
+                        Gavel tools
+                    </Typography>
+                    <TextAreaInput
+                        value={gavelInputs}
+                        label="Gavel inputs"
+                        onChange={gavelData}
+                        placeholder="Only stringified JSON accepted"
+                    />
+                    <Button
+                        variant="jContained"
+                        onClick={() => {
+                            try {
+                                const valueTest = JSON.parse(gavelInputs)
+                                submitGavelLoginData(valueTest)
+                            } catch (e) {
+                                dispatch(
+                                    SnackbarActions.error(
+                                        `Invalid JSON data. Please check your input.`,
+                                    ),
+                                )
+                            }
+                        }}
+                    >
+                        Add gavel logins
+                    </Button>
+                </>
+            )}
         </PageWrapper>
     )
 }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js
index fd2e2ff59..d22c0fc85 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/participants/index.js
@@ -8,7 +8,7 @@ import PageHeader from 'components/generic/PageHeader'
 import DefaultTab from './default'
 import TeamsTab from './teams'
 import AssignedTab from './assigned'
-import TravelTab from './travel'
+// import TravelTab from './travel'
 import AdminTab from './admin'
 
 export default () => {
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js
index 53d2edbd0..1d327c177 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-challenge/index.js
@@ -18,9 +18,24 @@ import * as OrganiserSelectors from 'redux/organiser/selectors'
 export default () => {
     const event = useSelector(OrganiserSelectors.event)
     const projects = useSelector(OrganiserSelectors.projects)
+    const teams = useSelector(OrganiserSelectors.teams)
 
     const getProjectsForChallenge = slug => {
-        return projects.filter(project => {
+        const projectsWithTeam = projects
+            .map(project => {
+                const teamFound = teams.find(team => {
+                    console.log(team._id, project.team)
+                    return team._id === project.team
+                })
+                if (teamFound) {
+                    project.teamCode = teamFound.code
+                } else {
+                    project.teamCode = 'No team'
+                }
+                return project
+            })
+            .filter(project => project.teamCode !== 'No team')
+        return projectsWithTeam.filter(project => {
             return project.challenges && project.challenges.indexOf(slug) !== -1
         })
     }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-track/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-track/index.js
index 29238b6fc..051d4fc99 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-track/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/by-track/index.js
@@ -17,9 +17,24 @@ import TrackLink from './TrackLink'
 export default () => {
     const event = useSelector(OrganiserSelectors.event)
     const projects = useSelector(OrganiserSelectors.projects)
+    const teams = useSelector(OrganiserSelectors.teams)
 
     const getProjectsForTrack = slug => {
-        return projects.filter(project => project.track === slug)
+        const projectsWithTeam = projects
+            .map(project => {
+                const teamFound = teams.find(team => {
+                    console.log(team._id, project.team)
+                    return team._id === project.team
+                })
+                if (teamFound) {
+                    project.teamCode = teamFound.code
+                } else {
+                    project.teamCode = 'No team'
+                }
+                return project
+            })
+            .filter(project => project.teamCode !== 'No team')
+        return projectsWithTeam.filter(project => project.track === slug)
     }
 
     return (
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/finalist-selection/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/finalist-selection/index.js
index fc8066909..67c764476 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/finalist-selection/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/finalist-selection/index.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 
 import {
     Grid,
@@ -45,18 +45,18 @@ export default () => {
     const idToken = useSelector(AuthSelectors.getIdToken)
     const [loading, setLoading] = useState(false)
 
-    const [checked, setChecked] = React.useState([])
-    const [left, setLeft] = React.useState([])
-    const [filteredLeft, setFilteredLeft] = React.useState([])
+    const [checked, setChecked] = useState([])
+    const [left, setLeft] = useState([])
+    const [filteredLeft, setFilteredLeft] = useState([])
 
-    const [right, setRight] = React.useState([])
-    const [filter, setFilter] = React.useState('')
+    const [right, setRight] = useState([])
+    const [filter, setFilter] = useState('')
     const debouncedFilter = useDebounce(filter, 300)
 
     const leftChecked = intersection(checked, left)
     const rightChecked = intersection(checked, right)
 
-    React.useEffect(() => {
+    useEffect(() => {
         const newLeft =
             projects
                 ?.filter(project => !event?.finalists?.includes(project._id))
@@ -70,7 +70,7 @@ export default () => {
         )
     }, [projects, event])
 
-    React.useEffect(() => {
+    useEffect(() => {
         if (debouncedFilter) {
             const availableProjects = projects.filter(p => left.includes(p._id))
             setFilteredLeft(
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js
index 7d87972b8..ce2be0e7f 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/index.js
@@ -11,8 +11,8 @@ import PageHeader from 'components/generic/PageHeader'
 import DefaultTab from './default'
 import ChallengesTab from './by-challenge'
 import TracksTab from './by-track'
-import GavelTab from './gavel'
-import AnnotatorsTab from './annotators'
+// import GavelTab from './gavel'
+// import AnnotatorsTab from './annotators'
 import WinnersTab from './winners'
 import FinalistSelectionTab from './finalist-selection'
 import VotingTokensTab from './votingTokens'
@@ -51,19 +51,19 @@ export default () => {
             })
         }
 
-        data.push({
-            path: '/gavel',
-            key: 'gavel',
-            label: 'Gavel voting',
-            component: GavelTab,
-        })
+        // data.push({
+        //     path: '/gavel',
+        //     key: 'gavel',
+        //     label: 'Gavel voting',
+        //     component: GavelTab,
+        // })
 
-        data.push({
-            path: '/annotators',
-            key: 'annotators',
-            label: 'Gavel annotators',
-            component: AnnotatorsTab,
-        })
+        // data.push({
+        //     path: '/annotators',
+        //     key: 'annotators',
+        //     label: 'Gavel annotators',
+        //     component: AnnotatorsTab,
+        // })
 
         if (
             event?.overallReviewMethod ===
diff --git a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js
index b160d164d..1b777b90a 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/organiser/projects/winners/index.js
@@ -16,6 +16,7 @@ import EventsService from 'services/events'
 
 import WinnerVoteService from 'services/winnerVote'
 import VotingTokenService from 'services/votingToken'
+import { debugGroup } from 'utils/debuggingTools'
 
 export default () => {
     const event = useSelector(OrganiserSelectors.event)
@@ -86,15 +87,13 @@ export default () => {
 
         return (
             <>
-
                 <strong>{total}</strong> <br />
                 Participant votes: {scoreFromUsers} <br />
                 Token votes: {scoreFromTokenVoters}
-
             </>
         )
     }
-    console.log('resus are', results)
+    debugGroup('Results', results)
     return (
         <PageWrapper loading={loading}>
             <PageHeader heading="Results" subheading="Finalist vote results" />
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
index 0e2b74838..16a5c73cb 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/index.js
@@ -78,13 +78,6 @@ export default ({
     useEffect(() => {
         setAlerts(originalAlerts)
         setAlertCount(originalAlertCount)
-        console.log(
-            'set alerts',
-            alerts,
-            originalAlerts,
-            alertCount,
-            originalAlertCount,
-        )
     }, [originalAlerts, originalAlertCount])
 
     return (
@@ -121,14 +114,6 @@ export default ({
                         return DefaultPage({ alerts })
                     },
                 },
-                {
-                    key: 'map',
-                    path: '/map',
-                    exact: false,
-                    icon: <PlaceIcon />,
-                    label: 'Map',
-                    component: MapPage,
-                },
                 {
                     key: 'finals',
                     path: '/finalist-voting',
@@ -195,11 +180,11 @@ export default ({
                     key: 'challenges',
                     path: '/challenges',
                     exact: true,
+                    hidden: !shownPages.challengesEnabled,
                     icon: <FormatListBulletedIcon />,
                     label: 'Challenges',
                     component: ChallengesIndex,
                 },
-
                 {
                     key: 'calendar',
                     path: '/calendar',
@@ -210,6 +195,15 @@ export default ({
                     component: CalendarPage,
                 },
                 // Experimental
+                {
+                    key: 'map',
+                    hidden: !shownPages.experimental,
+                    path: '/map',
+                    exact: false,
+                    icon: <PlaceIcon />,
+                    label: 'Map',
+                    component: MapPage,
+                },
                 {
                     key: 'chat',
                     hidden: !shownPages.experimental,
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/project/ProjectsList.js b/frontend/src/pages/_dashboard/renderDashboard/participant/project/ProjectsList.js
index f1bf146a9..dced7d63b 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/project/ProjectsList.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/project/ProjectsList.js
@@ -4,19 +4,13 @@ import { Paper, Typography, Chip, Box, Grid } from '@material-ui/core'
 
 import * as DashboardSelectors from 'redux/dashboard/selectors'
 
-import ProjectScoreModal from 'components/modals/ProjectScoreModal'
 import Button from 'components/generic/Button'
 
 export default props => {
     const event = useSelector(DashboardSelectors.event)
     const projects = useSelector(DashboardSelectors.projects)
-    const projectScores = useSelector(DashboardSelectors.projectScores)
-
     const projectSelectedCallback = props.projectSelectedCallback
 
-    const [selectedProjectScore, setSelectedProjectStore] = useState(null)
-    const [projectScoreModalOpen, setProjectScoreModalOpen] = useState(false)
-
     const [challengeAndTrackSlugState, setChallengeAndTrackSlugState] =
         useState({})
 
@@ -35,42 +29,6 @@ export default props => {
         }
         setChallengeAndTrackSlugState(challengeAndTrackSlugToNameMap)
     }, [event])
-
-    useEffect(() => {
-        if (projectScoreModalOpen) {
-            setSelectedProjectStore(
-                projectScores.find(s => s._id === selectedProjectScore._id),
-            )
-        }
-    }, [projectScoreModalOpen, projectScores, selectedProjectScore])
-
-    // const showProjectScore = project => {
-    //     const score = projectScores.find(
-    //         score => score.project._id === project._id,
-    //     )
-    //     setSelectedProjectStore(score)
-    //     setProjectScoreModalOpen(true)
-    // }
-
-    // Checks whether there are more unique challenges that the competitor has not submitted
-    // a solution to yet.
-    // const canAddMoreSubmissions = () => {
-    //     if (event && event.challenges && projects) {
-    //         const challengesWithSubmittedProjects = [].concat.apply(
-    //             [],
-    //             projects.map(project => project.challenges),
-    //         )
-    //         return (
-    //             event.challenges.filter(
-    //                 challenge =>
-    //                     challengesWithSubmittedProjects.indexOf(
-    //                         challenge.slug,
-    //                     ) < 0,
-    //             ).length > 0
-    //         )
-    //     }
-    //     return false
-    // }
     const ProjectCard = props => {
         const project = props.project
         return (
@@ -114,13 +72,6 @@ export default props => {
                         >
                             Edit Submission
                         </Button>
-                        {/*<Button
-                            variant="contained"
-                            color="theme_orange"
-                            onClick={() => showProjectScore(project)}
-                        >
-                            View Score
-                        </Button>*/}
                     </Box>
                 </Paper>
             </Grid>
@@ -167,11 +118,11 @@ export default props => {
                 )
             }
 
-            <ProjectScoreModal
+            {/* <ProjectScoreModal
                 score={selectedProjectScore}
                 open={projectScoreModalOpen}
                 onClose={() => setProjectScoreModalOpen(false)}
-            />
+            /> */}
         </Grid>
     )
 }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
index 361c55602..bf9b45239 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/project/SubmissionForm.js
@@ -12,14 +12,13 @@ import * as DashboardActions from 'redux/dashboard/actions'
 import * as SnackbarActions from 'redux/snackbar/actions'
 import * as AuthSelectors from 'redux/auth/selectors'
 import { makeStyles } from '@material-ui/core/styles'
-import { useTranslation } from 'react-i18next'
 import SubmissionFormCustomInput from 'components/inputs/SubmissionFormCustomInput'
 import BottomBar from 'components/inputs/BottomBar'
 import NameField from 'components/projects/ProjectSubmissionFields/NameField'
 import _ from 'lodash'
 import StatusField from 'components/projects/ProjectSubmissionFields/StatusField'
 import ProjectFieldsComponents from 'constants/projectFields'
-import { debugGroup } from 'utils/debuggingTools'
+import { projectURLgenerator } from 'utils/dataModifiers'
 
 const useStyles = makeStyles(theme => ({
     uppercase: { 'text-transform': 'uppercase' },
@@ -27,22 +26,19 @@ const useStyles = makeStyles(theme => ({
 
 // TODO make the form labels and hints customizable
 const SubmissionForm = props => {
-    debugGroup('SubmissionForm >>', props)
     const id = props.id
+    const projectURL = projectURLgenerator(props?.eventSlug, id)
     const handleProjectSelected = props.handleProjectSelected
     const classes = useStyles()
     const dispatch = useDispatch()
     const event = useSelector(DashboardSelectors.event)
     const idTokenData = useSelector(AuthSelectors.idTokenData)
-    const idToken = useSelector(AuthSelectors.getIdToken)
-    const { t } = useTranslation()
     const projects = useSelector(DashboardSelectors.projects)
     const projectLoading = useSelector(DashboardSelectors.projectsLoading)
     const [project, setProject] = useState(null)
     const [projectStatus, setProjectStatus] = useState('')
 
     useEffect(() => {
-        debugGroup('useEffect in submissionForm', [project, id])
         if (projects && projects.length > 0 && id) {
             const foundProject = projects.find(p => p._id === id)
             setProject(foundProject)
@@ -94,7 +90,10 @@ const SubmissionForm = props => {
     }, [event])
 
     const locationEnabled = useMemo(() => {
-        return event.eventType === EventTypes.physical.id
+        return (
+            event.eventType === EventTypes.physical.id ||
+            event.eventType === EventTypes.hybrid.id
+        )
     }, [event])
 
     const valuesFormatter = values => {
@@ -104,6 +103,7 @@ const SubmissionForm = props => {
             event.submissionFormQuestions.forEach(section => {
                 const sec = section.name
                 section.questions.forEach(question => {
+                    const label = question?.label
                     const que = question.name
                     const value = values[que]
                     const custom = {
@@ -111,11 +111,11 @@ const SubmissionForm = props => {
                         key: que,
                         value: value,
                     }
+                    if (label) custom['label'] = label
                     formData['submissionFormAnswers'].push(custom)
                 })
             })
         }
-        console.log('formData after formatting:>> ', formData)
         return formData
     }
 
@@ -166,10 +166,27 @@ const SubmissionForm = props => {
                     >
                         {projectStatus}
                     </Typography>
-                    <Typography variant="body1">
-                        Remember to update the project status to final if you
-                        want this project to be graded!
-                    </Typography>
+                    {projectStatus !== 'final' ? (
+                        <Typography variant="body1">
+                            Remember to update the project status to final if
+                            you want this project to be graded!
+                        </Typography>
+                    ) : (
+                        projectURL && (
+                            <>
+                                <Typography variant="body1">
+                                    Your project's public URL is:
+                                </Typography>
+                                <a
+                                    href={projectURL}
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    {projectURL}
+                                </a>
+                            </>
+                        )
+                    )}
                 </GradientBox>
                 <Box className="tw-p-6 tw-rounded-md tw-flex tw-flex-col tw-gap-4 tw-bg-white tw-shadow-md">
                     <Grid container spacing={6}>
@@ -276,7 +293,6 @@ const SubmissionForm = props => {
                         )
                     }
                 } catch (error) {
-                    console.error('An error occurred:', error)
                     dispatch(
                         SnackbarActions.error('Oops, something went wrong...', {
                             autoHideDuration: 10000,
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/project/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/project/index.js
index 437d42134..1edf7859e 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/project/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/project/index.js
@@ -223,6 +223,7 @@ export default () => {
                     <SubmissionForm
                         id={selectedProjectId}
                         handleProjectSelected={handleProjectSelected}
+                        eventSlug={event?.slug}
                     />
                 )}
             </>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/CompareProjects.js b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/CompareProjects.js
index cdd023b84..afcdffc31 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/CompareProjects.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/CompareProjects.js
@@ -102,7 +102,8 @@ export default ({ annotator, prevId, nextId, isFirstChoice }) => {
                     </Typography>
                     <Markdown
                         source={
-                            event.eventType === 'physical'
+                            event.eventType === 'physical' ||
+                            event.eventType === 'hybrid'
                                 ? t('Gavel_compare_projects_physical_')
                                 : t('Gavel_compare_projects_online_')
                         }
@@ -126,7 +127,8 @@ export default ({ annotator, prevId, nextId, isFirstChoice }) => {
                     </Typography>
                     <Markdown
                         source={
-                            event.eventType === 'physical'
+                            event.eventType === 'physical' ||
+                            event.eventType === 'hybrid'
                                 ? t('Gavel_compare_projects_physical2_')
                                 : t('Gavel_compare_projects_online2_')
                         }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/FirstProject.js b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/FirstProject.js
index a24c75560..086cf2a40 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/FirstProject.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/FirstProject.js
@@ -123,7 +123,8 @@ export default ({ projectId }) => {
                     </Typography>
                     <Markdown
                         source={
-                            event.eventType === 'physical'
+                            event.eventType === 'physical' ||
+                            event.eventType === 'hybrid'
                                 ? t('Gavel_first_project_physical_')
                                 : t('Gavel_first_project_online_')
                         }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/index.js
index 56be684ed..552710d5b 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/reviewing/index.js
@@ -1,24 +1,28 @@
 import React, { useEffect } from 'react'
 
 import { useDispatch, useSelector } from 'react-redux'
-import { Typography } from '@material-ui/core'
+import { Box, Typography } from '@material-ui/core'
 
 import PageWrapper from 'components/layouts/PageWrapper'
 import GradientBox from 'components/generic/GradientBox'
 
-import Instructions from './Instructions'
-import FirstProject from './FirstProject'
-import CompareProjects from './CompareProjects'
-import Complete from './Complete'
+// import Instructions from './Instructions'
+// import FirstProject from './FirstProject'
+// import CompareProjects from './CompareProjects'
+// import Complete from './Complete'
 import Disabled from './Disabled'
 
 import * as DashboardSelectors from 'redux/dashboard/selectors'
 import * as DashboardActions from 'redux/dashboard/actions'
+import PageHeader from 'components/generic/PageHeader'
+import Button from 'components/generic/Button'
+import Countdown from 'react-countdown-now'
 
 export default () => {
     const dispatch = useDispatch()
     const team = useSelector(DashboardSelectors.team)
     const event = useSelector(DashboardSelectors.event)
+    const registration = useSelector(DashboardSelectors.registration)
     const annotator = useSelector(DashboardSelectors.annotator)
     const annotatorError = useSelector(DashboardSelectors.annotatorError)
     const annotatorLoading = useSelector(DashboardSelectors.annotatorLoading)
@@ -40,32 +44,169 @@ export default () => {
             )
         }
 
-        if (!annotator) {
-            return <Instructions />
+        if (registration?.gavelLogin) {
+            return (
+                <div>
+                    <PageHeader heading="Reviewing" />
+                    <Box
+                        display="flex"
+                        flexDirection="column"
+                        alignItems="center"
+                    >
+                        <Countdown
+                            daysInHours
+                            date={event.reviewingStartTime}
+                            renderer={({ formatted, completed }) => {
+                                if (completed) {
+                                    return (
+                                        <Countdown
+                                            daysInHours
+                                            date={event.reviewingEndTime}
+                                            renderer={({
+                                                formatted,
+                                                completed,
+                                            }) => {
+                                                if (!completed) {
+                                                    return (
+                                                        <>
+                                                            <Typography
+                                                                variant="subtitle1"
+                                                                style={{
+                                                                    fontWeight:
+                                                                        'bold',
+                                                                }}
+                                                                gutterBottom
+                                                            >
+                                                                The reviewing
+                                                                period is open!
+                                                                Time left:{' '}
+                                                                {
+                                                                    formatted.hours
+                                                                }
+                                                                :
+                                                                {
+                                                                    formatted.minutes
+                                                                }
+                                                                :
+                                                                {
+                                                                    formatted.seconds
+                                                                }
+                                                            </Typography>
+                                                            <Typography
+                                                                variant="body1"
+                                                                paragraph
+                                                            >
+                                                                Once you click
+                                                                "Start
+                                                                reviewing", a
+                                                                new tab will
+                                                                open on your
+                                                                browser were you
+                                                                can start
+                                                                reviewing the
+                                                                projects.
+                                                            </Typography>
+                                                            <Button
+                                                                onClick={() => {
+                                                                    window.open(
+                                                                        `${registration?.gavelLogin}`,
+                                                                        '_blank',
+                                                                    )
+                                                                }}
+                                                                color="primary"
+                                                                variant="contained"
+                                                            >
+                                                                Start reviewing
+                                                                projects
+                                                            </Button>
+                                                            <p>
+                                                                Copy this link
+                                                                if for some
+                                                                reason the
+                                                                button doesn't
+                                                                work:
+                                                                {
+                                                                    registration?.gavelLogin
+                                                                }
+                                                            </p>
+                                                        </>
+                                                    )
+                                                } else {
+                                                    return (
+                                                        <Typography
+                                                            variant="subtitle1"
+                                                            style={{
+                                                                fontWeight:
+                                                                    'bold',
+                                                            }}
+                                                            gutterBottom
+                                                        >
+                                                            The reviewing period
+                                                            is over! Thanks for
+                                                            participating!
+                                                        </Typography>
+                                                    )
+                                                }
+                                            }}
+                                        />
+                                    )
+                                } else {
+                                    return (
+                                        <>
+                                            <Typography
+                                                variant="subtitle1"
+                                                style={{ fontWeight: 'bold' }}
+                                            >
+                                                The reviewing period begins in{' '}
+                                                {formatted.hours}:
+                                                {formatted.minutes}:
+                                                {formatted.seconds}
+                                            </Typography>
+                                            <Typography
+                                                variant="body1"
+                                                paragraph
+                                                gutterBottom
+                                            >
+                                                Come back here then!
+                                            </Typography>
+                                        </>
+                                    )
+                                }
+                            }}
+                        />
+                    </Box>
+                </div>
+            )
         }
 
-        if (!annotator.active) {
-            return <Disabled />
-        }
+        return <Disabled />
 
-        if (!annotator.prev && annotator.next) {
-            return <FirstProject projectId={annotator.next} />
-        }
+        // if (!annotator) {
+        //     return <Instructions />
+        // }
 
-        if (annotator.prev && annotator.next) {
-            return (
-                <CompareProjects
-                    annotator={annotator}
-                    prevId={annotator.prev}
-                    nextId={annotator.next}
-                    isFirstChoice={annotator.ignore.length === 1}
-                />
-            )
-        }
+        // if (!annotator.active) {
+        //     return <Disabled />
+        // }
+
+        // if (!annotator.prev && annotator.next) {
+        //     return <FirstProject projectId={annotator.next} />
+        // }
+
+        // if (annotator.prev && annotator.next) {
+        //     return (
+        //         <CompareProjects
+        //             annotator={annotator}
+        //             prevId={annotator.prev}
+        //             nextId={annotator.next}
+        //             isFirstChoice={annotator.ignore.length === 1}
+        //         />
+        //     )
+        // }
 
-        return <Complete />
+        // return <Complete />
     }
-    console.log("annotator", annotator, annotatorError)
+    // console.log("annotator", annotator, annotatorError)
     return (
         <PageWrapper loading={annotatorLoading} error={annotatorError}>
             {renderContent()}
diff --git a/frontend/src/pages/_dashboard/renderDashboard/participant/team/teams/index.js b/frontend/src/pages/_dashboard/renderDashboard/participant/team/teams/index.js
index a409ebfc9..822652da4 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/participant/team/teams/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/participant/team/teams/index.js
@@ -21,7 +21,7 @@ export default () => {
     const dispatch = useDispatch()
     const event = useSelector(DashboardSelectors.event)
     const { slug } = event
-
+    //TODO create pagination component
     const teams = useSelector(DashboardSelectors.teams)
     const hasTeam = useSelector(DashboardSelectors.hasTeam)
     const [selected, setSelected] = useState(false)
@@ -90,8 +90,6 @@ export default () => {
     }, [currentPage])
 
     const renderPagination = () => {
-        console.log('props', currentPage, totalResults, totalPages)
-
         return (
             <Box display="flex" flexDirection="row" alignItems="center">
                 <IconButton
diff --git a/frontend/src/pages/_dashboard/renderDashboard/partner/index.js b/frontend/src/pages/_dashboard/renderDashboard/partner/index.js
index a53d5bf26..69f23fdef 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/partner/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/partner/index.js
@@ -27,9 +27,10 @@ import { useTranslation } from 'react-i18next'
 import Badge from '@material-ui/core/Badge'
 
 import ProjectsPage from './projects'
-import * as DashboardSelectors from 'redux/dashboard/selectors'
 import { QuestionAnswerSharp } from '@material-ui/icons'
 import { Chat } from 'components/messaging/chat'
+// import PartnerReviewingBlock from '../generalPages/default/Blocks/PartnerReviewingBlock'
+
 const useStyles = makeStyles(theme => ({
     sidebarTop: {
         padding: theme.spacing(3),
@@ -45,7 +46,13 @@ const useStyles = makeStyles(theme => ({
     },
 }))
 
-export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
+export default ({
+    event,
+    originalAlertCount,
+    originalAlerts,
+    shownPages,
+    lockedPages,
+}) => {
     const classes = useStyles()
     const { t } = useTranslation()
     const match = useRouteMatch()
@@ -53,11 +60,6 @@ export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
     const [alertCount, setAlertCount] = useState(originalAlertCount)
     const [alerts, setAlerts] = useState(originalAlerts)
 
-    // const event = useSelector(DashboardSelectors.event)
-
-    console.log('props', originalAlertCount, originalAlerts, shownPages)
-    console.log(originalAlertCount, alertCount)
-
     return (
         <SidebarLayout
             baseRoute={match.url}
@@ -94,23 +96,17 @@ export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
                     component: () => {
                         setAlertCount(0)
                         if (shownPages?.experimental) {
-                            return <p> Test</p>
+                            return <p>Experimental enabled</p>
                         }
                         return DefaultPage({ alerts })
                     },
                 },
-                {
-                    key: 'map',
-                    path: '/map',
-                    exact: false,
-                    icon: <PlaceIcon />,
-                    label: 'Map',
-                    component: MapPage,
-                },
                 {
                     key: 'Review',
-                    path: '/Review',
-                    hidden: !shownPages?.reviewingByScoreCriteria,
+                    path: '/review',
+                    // hidden: !shownPages?.reviewingByScoreCriteria,
+                    locked: lockedPages.reviewing,
+                    lockedDescription: 'Reviewing closed',
                     exact: false,
                     icon: <RateReviewIcon />,
                     label: 'Review',
@@ -119,7 +115,7 @@ export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
                     },
                 },
                 {
-                    key: 'calendar',
+                    key: 'meetings',
                     path: '/calendar',
                     exact: true,
                     hidden: !shownPages?.meetings,
@@ -127,6 +123,15 @@ export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
                     label: 'Meetings',
                     component: CalendarPage,
                 },
+                {
+                    key: 'hackerpack',
+                    path: '/hackerpack',
+                    exact: true,
+                    icon: <AmpStoriesIcon />,
+                    hidden: !shownPages?.hackerPack,
+                    label: t('Hackerpack_'),
+                    component: HackerpackPage,
+                },
                 {
                     key: 'recruitment',
                     path: '/recruitment',
@@ -134,17 +139,18 @@ export default ({ event, originalAlertCount, originalAlerts, shownPages }) => {
                     icon: <WorkIcon />,
                     label: 'Recruitment',
                     component: RecruitmentPage,
+                    locked: true,
+                    lockedDescription: 'Currently unavailable',
                 },
                 //Experimental
                 {
-                    key: 'hackerpack',
-                    path: '/hackerpack',
-                    exact: true,
-                    icon: <AmpStoriesIcon />,
-                    hidden:
-                        !shownPages?.experimental && !shownPages?.hackerPack,
-                    label: t('Hackerpack_'),
-                    component: HackerpackPage,
+                    key: 'map',
+                    path: '/map',
+                    exact: false,
+                    icon: <PlaceIcon />,
+                    hidden: !shownPages?.experimental,
+                    label: 'Map',
+                    component: MapPage,
                 },
                 {
                     key: 'challenges',
diff --git a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/SearchResults/index.js b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/SearchResults/index.js
index 2e1a0a813..6450ed5ba 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/SearchResults/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/SearchResults/index.js
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import Empty from 'components/generic/Empty'
 import ResultCard from './ResultCard'
 import { useDispatch, useSelector } from 'react-redux'
-import { useRouteMatch } from 'react-router'
+// import { useRouteMatch } from 'react-router'
 import { Grid, Box, Typography, CircularProgress } from '@material-ui/core'
 
 import * as RecruitmentSelectors from 'redux/recruitment/selectors'
@@ -11,10 +11,11 @@ import * as DashboardActions from 'redux/dashboard/actions'
 import { useTranslation } from 'react-i18next'
 import Pagination from './Pagination'
 import LoadingCard from './LoadingCard'
+import { debugGroup } from 'utils/debuggingTools'
 
 export default ({ items, organisation }) => {
     const dispatch = useDispatch()
-    const match = useRouteMatch()
+    // const match = useRouteMatch()
     const searchResults =
         items ?? useSelector(RecruitmentSelectors.searchResults)
     const searchResultsCount = useSelector(
@@ -26,9 +27,15 @@ export default ({ items, organisation }) => {
     const page = useSelector(RecruitmentSelectors.page)
     const paginationEnabled = !items
     const isFavorited = !!items
-    const { slug } = match.params
+    // const { slug } = match.params
     const { t } = useTranslation()
 
+    debugGroup('RecruitmentSearchResults', [
+        useSelector(RecruitmentSelectors.searchResults),
+        searchResults,
+        searchResultsCount,
+    ])
+
     useEffect(() => {
         //dispatch(DashboardActions.updateEvent(slug))
         dispatch(RecruitmentActions.updateSearchResults())
@@ -50,7 +57,7 @@ export default ({ items, organisation }) => {
                                 xs={12}
                                 sm={6}
                                 md={4}
-                            //lg={3}
+                                //lg={3}
                             >
                                 <LoadingCard />
                             </Grid>
@@ -84,7 +91,7 @@ export default ({ items, organisation }) => {
                         xs={12}
                         sm={6}
                         md={4}
-                    //lg={3}
+                        //lg={3}
                     >
                         <ResultCard data={user} organisation={organisation} />
                     </Grid>
diff --git a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/index.js b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/index.js
index a28120fe8..484d08108 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/default/index.js
@@ -1,8 +1,6 @@
-
-
 import React, { useEffect, useState } from 'react'
 
-import { makeStyles } from '@material-ui/core/styles'
+// import { makeStyles } from '@material-ui/core/styles'
 import { Box } from '@material-ui/core'
 import { useSelector, useDispatch } from 'react-redux'
 
@@ -20,25 +18,26 @@ import * as AuthSelectors from 'redux/auth/selectors'
 import ToggleFavorites from './ToggleFavorites'
 import { useTranslation } from 'react-i18next'
 import { useToggle } from 'hooks/customHooks'
+import { debugGroup } from 'utils/debuggingTools'
 
-const useStyles = makeStyles(theme => ({
-    root: {
-        flex: 1,
-        backgroundColor: theme.palette.background.default,
-        padding: theme.spacing(3),
-    },
-}))
+// const useStyles = makeStyles(theme => ({
+//     root: {
+//         flex: 1,
+//         backgroundColor: theme.palette.background.default,
+//         padding: theme.spacing(3),
+//     },
+// }))
 
 export default () => {
     const { t } = useTranslation()
-    const classes = useStyles()
+    // const classes = useStyles()
     const dispatch = useDispatch()
     const idTokenData = useSelector(AuthSelectors.idTokenData)
     const favorites = useSelector(RecruitmentSelectors.favorites)
-    const event = useSelector(DashboardSelectors.event)._id
+    const eventId = useSelector(DashboardSelectors.event)._id
     const recEvents = useSelector(UserSelectors.userProfileRecruiterEvents)
 
-    const [recruiterOrganisation, SetRecruiterOrganisation] = useState("")
+    const [recruiterOrganisation, SetRecruiterOrganisation] = useState('')
     const [showFavorites, toggleFavorites] = useToggle(false)
 
     useEffect(() => {
@@ -55,14 +54,14 @@ export default () => {
         //dispatch(RecruitmentActions.updateEvents())
 
         const organisation = recEvents.find(e => {
-            return e.eventId === event
+            return e.eventId === eventId
         }).organisation
         SetRecruiterOrganisation(organisation)
 
         dispatch(RecruitmentActions.updateActionHistory(organisation))
     }, [dispatch])
 
-
+    debugGroup('Recruitment', [recruiterOrganisation, recEvents])
 
     return (
         <>
@@ -74,20 +73,24 @@ export default () => {
                         justifyContent="flex-end"
                         mb={2}
                     >
-
                         <ToggleFavorites
                             count={favorites.length}
                             active={showFavorites}
                             onChange={toggleFavorites}
                         />
-                    </Box >
+                    </Box>
 
                     {showFavorites ? (
-                        <SearchResults items={favorites} organisation={recruiterOrganisation} />
+                        <SearchResults
+                            items={favorites}
+                            organisation={recruiterOrganisation}
+                        />
                     ) : (
                         <>
                             <Filters />
-                            <SearchResults organisation={recruiterOrganisation} />
+                            <SearchResults
+                                organisation={recruiterOrganisation}
+                            />
                         </>
                     )}
                 </Container>
@@ -96,5 +99,3 @@ export default () => {
         </>
     )
 }
-
-
diff --git a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/index.js b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/index.js
index 89ce8d54c..b679e9c9a 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/partner/partnerrecruitment/index.js
@@ -1,7 +1,13 @@
 import React, { useEffect, useLayoutEffect } from 'react'
 import { useRouteMatch } from 'react-router'
 import { useDispatch } from 'react-redux'
-import { Switch, Route, Redirect, useLocation, useParams } from 'react-router-dom'
+import {
+    Switch,
+    Route,
+    Redirect,
+    useLocation,
+    useParams,
+} from 'react-router-dom'
 
 import PageWrapper from 'components/layouts/PageWrapper'
 import * as RecruitmentActions from 'redux/recruitment/actions'
@@ -9,15 +15,14 @@ import * as RecruitmentActions from 'redux/recruitment/actions'
 import GlobalNavBar from 'components/navbars/GlobalNavBar'
 
 import SearchPage from './default'
-import AdminPage from './admin'
+// import AdminPage from './admin'
 import DetailPage from './id'
 
 export default () => {
-    const dispatch = useDispatch()
-    const location = useLocation()
+    // const dispatch = useDispatch()
+    // const location = useLocation()
     const match = useRouteMatch()
 
-
     //console.log(match.url)
 
     return (
@@ -29,47 +34,16 @@ export default () => {
                 path={`${match.url}/:id`}
                 component={DetailPage}
             />
+            {/* <Route
+                exact={false}
+                path={`${match.url}/admin`}
+                component={AdminPage}
+            /> */}
             <Redirect to={`${match.url}`} />
         </Switch>
     )
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // import React, { useEffect, useRef } from 'react'
 // import FormControl from '@material-ui/core/FormControl'
 // import FormGroup from '@material-ui/core/FormGroup'
@@ -82,9 +56,6 @@ export default () => {
 
 // export default () => {
 
-
-
-
 //     return (
 //         <>
 //             {/* button for DEV to swithc between participant / partner view */}
@@ -101,4 +72,4 @@ export default () => {
 //             </div>
 //         </>
 //     )
-// }
\ No newline at end of file
+// }
diff --git a/frontend/src/pages/_dashboard/renderDashboard/partner/projects/index.js b/frontend/src/pages/_dashboard/renderDashboard/partner/projects/index.js
index 63cb6f63f..ea246726b 100644
--- a/frontend/src/pages/_dashboard/renderDashboard/partner/projects/index.js
+++ b/frontend/src/pages/_dashboard/renderDashboard/partner/projects/index.js
@@ -7,7 +7,6 @@ import PageHeader from 'components/generic/PageHeader'
 import ProjectsGrid from 'components/projects/ProjectsGrid'
 
 import ProjectsService from 'services/projects'
-import Filter from 'components/Team/Filter'
 import _ from 'lodash'
 
 import ProjectDetail from 'components/projects/ProjectDetail'
@@ -17,7 +16,6 @@ import ProjectScoresService from 'services/projectScores'
 import EvaluationForm from 'pages/_projects/slug/view/projectId/EvaluationForm'
 import Empty from 'components/generic/Empty'
 import * as SnackbarActions from 'redux/snackbar/actions'
-import ScoreForm from 'pages/_projects/slug/view/projectId/ScoreForm'
 
 const projectScoreBase = {
     project: '',
@@ -37,16 +35,12 @@ export default ({ event }) => {
     const idToken = useSelector(AuthSelectors.getIdToken)
     const userId = useSelector(AuthSelectors.getUserId)
     const userProfile = useSelector(userSelectors.userProfile)
-    const allFilterLabel = 'All projects'
     const dispatch = useDispatch()
     const { slug } = event
     const [data, setData] = useState({})
     const [projects, setProjects] = useState([])
-    const [draftsProjects, setDraftsProjects] = useState([])
-    const [finalProjects, setFinalProjects] = useState([])
     const [loading, setLoading] = useState(true)
     const [error, setError] = useState(false)
-    const [filter, setFilter] = useState(allFilterLabel)
 
     const [selected, setSelected] = useState(null)
     const [scoreExists, setScoreExists] = useState(false)
@@ -55,10 +49,7 @@ export default ({ event }) => {
     const resetProjectData = () => {
         setSelected(null)
         setScoreExists(false)
-    }
-
-    const onFilterChange = filter => {
-        setFilter(filter)
+        setProjectScore(projectScoreBase)
     }
 
     if (event.scoreCriteriaSettings === undefined) {
@@ -68,46 +59,21 @@ export default ({ event }) => {
     const fetchProjects = useCallback(async () => {
         setLoading(true)
         try {
-            const dataOt = await ProjectsService.getProjectsByEvent(slug)
-            const partnerData = _.find(
-                event.recruiters,
-                recruiter => recruiter.recruiterId === userId,
+            const dataOt = await ProjectsService.getProjectsByEventAsPartner(
+                idToken,
+                slug,
             )
-            let challengeOrg
-            let filteredProjects = []
             const data = {
                 event,
-            }
-            if (event.scoreCriteriaSettings.reviewAnyChallenge) {
-                data.projects = dataOt
-            } else if (partnerData) {
-                challengeOrg = _.find(
-                    event.challenges,
-                    challenge => challenge.partner === partnerData.organization,
-                )
-                if (challengeOrg) {
-                    data.challenge = challengeOrg
-                    filteredProjects = _.filter(dataOt, project =>
-                        _.includes(project.challenges, challengeOrg.slug),
-                    )
-                    if (filteredProjects.length > 0) {
-                        data.projects = filteredProjects
-                    }
-                }
+                ...dataOt,
             }
             setData(data)
-            setDraftsProjects(
-                data.projects.filter(project => project.status === 'draft'),
-            )
-            setFinalProjects(
-                data.projects.filter(project => project.status === 'final'),
-            )
             setProjects(data.projects)
         } catch (err) {
-            console.log("err", err)
             setError(true)
+        } finally {
+            setLoading(false)
         }
-        setLoading(false)
     }, [slug, idToken, projectScore])
 
     const handleSubmit = async (values, { setSubmitting, resetForm }) => {
@@ -153,7 +119,6 @@ export default ({ event }) => {
                     submissionValues,
                 )
             } else {
-                console.log("no score")
                 await ProjectScoresService.addScoreByEventSlugAndProjectIdAndPartnerAccount(
                     idToken,
                     event.slug,
@@ -182,6 +147,7 @@ export default ({ event }) => {
         return null
     }
 
+    //TODO perform this on the backend
     useEffect(() => {
         if (idToken && selected && event) {
             ProjectScoresService.getScoreByEventSlugAndProjectIdAndPartnerAccount(
@@ -189,7 +155,6 @@ export default ({ event }) => {
                 event.slug,
                 selected._id,
             ).then(score => {
-                console.log('Score', score)
                 if (score[0]) {
                     const reviewerData = _.find(
                         score[0].reviewers,
@@ -221,17 +186,6 @@ export default ({ event }) => {
         }
     }, [event, idToken, selected])
 
-    const projectsToRender = filter => {
-        switch (filter) {
-            case 'draft':
-                return draftsProjects
-            case 'final':
-                return finalProjects
-            default:
-                return projects
-        }
-    }
-
     const renderProjects = inputData => {
         return (
             <>
@@ -241,31 +195,25 @@ export default ({ event }) => {
                             heading={inputData?.challenge.name}
                             subheading={`By ${inputData?.challenge.partner}`}
                             alignment="left"
-                            details={`${inputData?.projects.length} project${inputData?.projects.length > 1 ||
+                            details={`${inputData?.projects.length} project${
+                                inputData?.projects.length > 1 ||
                                 inputData?.projects.length < 1
-                                ? 's'
-                                : ''
-                                }`}
+                                    ? 's'
+                                    : ''
+                            }`}
                         />
                     )}
-                    <Filter
-                        noFilterOption={allFilterLabel}
-                        onChange={onFilterChange}
-                        filterArray={[
-                            { label: 'Final projects', value: 'final' },
-                            { label: 'Draft projects', value: 'draft' },
-                        ]}
-                    />
                 </div>
 
                 <Box height={20} />
                 <ProjectsGrid
-                    projects={projectsToRender(filter)}
+                    filterEnabled={true}
+                    projects={projects}
                     event={inputData.event}
                     onSelect={setSelected}
                     showScore={true}
                     token={idToken}
-                    showReviewers={true}
+                    reviewerGrid={true}
                 />
 
                 <Box height={200} />
@@ -284,22 +232,15 @@ export default ({ event }) => {
                     {idToken ? (
                         <Container center>
                             {scoreCriteriaBase &&
-                                scoreCriteriaBase.length > 0 ? (
-                                <EvaluationForm
-                                    event={event}
-                                    project={selected}
-                                    submit={handleSubmit}
-                                    score={projectScore}
-                                    scoreCriteria={scoreCriteriaBase}
-                                />
-                            ) : (
-                                <ScoreForm
-                                    event={event}
-                                    project={selected}
-                                    submit={handleSubmit}
-                                    score={projectScore}
-                                />
-                            )}
+                                scoreCriteriaBase.length > 0 && (
+                                    <EvaluationForm
+                                        event={event}
+                                        project={selected}
+                                        submit={handleSubmit}
+                                        score={projectScore}
+                                        scoreCriteria={scoreCriteriaBase}
+                                    />
+                                )}
                             <Box height={200} />
                         </Container>
                     ) : null}
diff --git a/frontend/src/pages/_events/slug/context.js b/frontend/src/pages/_events/slug/context.js
index 4a978bbf0..74b2c024b 100644
--- a/frontend/src/pages/_events/slug/context.js
+++ b/frontend/src/pages/_events/slug/context.js
@@ -194,7 +194,6 @@ export const EventDetailProvider = ({ children }) => {
     })
     const createRegistration = useCallback(
         formData => {
-            console.log('creatin regigiigi', idToken, slug, formData)
             return RegistrationsService.createRegistration(
                 idToken,
                 slug,
diff --git a/frontend/src/pages/_events/slug/register/RegistrationSection/index.js b/frontend/src/pages/_events/slug/register/RegistrationSection/index.js
index 3e0fce984..ee7a9a479 100644
--- a/frontend/src/pages/_events/slug/register/RegistrationSection/index.js
+++ b/frontend/src/pages/_events/slug/register/RegistrationSection/index.js
@@ -107,7 +107,7 @@ export default props => {
                                     <Grid
                                         item
                                         xs={12}
-                                        key={field.fieldName}
+                                        key={`${field.fieldName}-${index}`}
                                         className={classes.question}
                                     >
                                         <div className={classes.questionInner}>
diff --git a/frontend/src/pages/_events/slug/register/index.js b/frontend/src/pages/_events/slug/register/index.js
index fcac225e1..ab8da2982 100644
--- a/frontend/src/pages/_events/slug/register/index.js
+++ b/frontend/src/pages/_events/slug/register/index.js
@@ -279,8 +279,10 @@ export default RequiresPermission(() => {
                 const sec = section.name
                 section.questions.forEach(question => {
                     const que = question.name
+                    const label = question?.label || 'custom question'
                     const value = formData[sec][que]
                     const custom = {
+                        label: label,
                         section: sec,
                         key: que,
                         value: value + '',
diff --git a/frontend/src/pages/_projects/slug/challenge/token/index.js b/frontend/src/pages/_projects/slug/challenge/token/index.js
index e715d8fcb..2e4440fc6 100644
--- a/frontend/src/pages/_projects/slug/challenge/token/index.js
+++ b/frontend/src/pages/_projects/slug/challenge/token/index.js
@@ -7,7 +7,6 @@ import PageWrapper from 'components/layouts/PageWrapper'
 import Container from 'components/generic/Container'
 import PageHeader from 'components/generic/PageHeader'
 import ProjectsGrid from 'components/projects/ProjectsGrid'
-import { makeStyles } from '@material-ui/core/styles'
 
 import ProjectsService from 'services/projects'
 import Filter from 'components/Team/Filter'
@@ -17,12 +16,8 @@ import _ from 'lodash'
 export default ({ event }) => {
     const baseFilter = { value: 'final', label: 'Final projects' }
     const match = useRouteMatch()
-    console.log('match', match)
-    console.log('match URL', match.url)
     const dispatch = useDispatch()
     const { slug } = event
-    const { reviewMethod } = event
-    console.log('event data', event)
     const { token } = match.params
     const [data, setData] = useState({})
     const [projects, setProjects] = useState([])
@@ -111,7 +106,8 @@ export default ({ event }) => {
                         onSelect={project =>
                             dispatch(push(`${match.url}/view/${project._id}`))
                         }
-                        showScore={reviewMethod === 'manualReview'}
+                        showScore={true}
+                        showReviewers={true}
                         token={token}
                     />
                     <Box height={200} />
diff --git a/frontend/src/pages/_projects/slug/view/projectId/EvaluationForm.js b/frontend/src/pages/_projects/slug/view/projectId/EvaluationForm.js
index 069a2974d..d0af0a652 100644
--- a/frontend/src/pages/_projects/slug/view/projectId/EvaluationForm.js
+++ b/frontend/src/pages/_projects/slug/view/projectId/EvaluationForm.js
@@ -1,6 +1,5 @@
-import React, { useState } from 'react'
-import { Formik, Form, Field, ErrorMessage } from 'formik'
-import Button from 'components/generic/Button'
+import React from 'react'
+import { Formik, Form, Field } from 'formik'
 import { Box, Typography } from '@material-ui/core'
 import RadioScore from 'components/generic/RadioScore'
 import TextAreaInput from 'components/inputs/TextAreaInput'
@@ -8,15 +7,7 @@ import FormControl from 'components/inputs/FormControl'
 import BottomBar from 'components/inputs/BottomBar'
 import _ from 'lodash'
 
-const EvaluationForm = ({
-    event,
-    project,
-    submit = () => {},
-    score,
-    scoreCriteria,
-}) => {
-    console.log('Score from eval form', score)
-
+const EvaluationForm = ({ submit = () => {}, score, scoreCriteria }) => {
     const allScoresSet = evalScores => {
         const scoreList = evalScores.map(value => {
             return value?.score ? value.score : null
@@ -26,16 +17,13 @@ const EvaluationForm = ({
 
     const calculateScore = (criterias, decimalPlaces) => {
         const multiplier = Math.pow(10, decimalPlaces)
-        console.log('Multiplier', multiplier)
         const scoreAverage =
             criterias.reduce((acc, curr) => {
                 if (!curr.score) return acc
                 return curr.score + acc
             }, 0) / criterias.length
-        console.log('Score average before format', scoreAverage)
         const scoreAverageFormatted =
             Math.floor(scoreAverage * multiplier) / multiplier
-        console.log('Score average', scoreAverageFormatted)
         return scoreAverageFormatted
     }
 
@@ -54,23 +42,14 @@ const EvaluationForm = ({
         score.scoreCriteria = scoreFiltered
     }
 
-    // if (score.scoreCriteria.map) {
-
     return (
         <>
             <Formik
                 initialValues={{ ...score }}
-                // initialValues={{
-                //     ...score,
-                //     scoreCriteria: [
-                //         { ...scoreCriteria, score: score.scoreCriteria.score },
-                //     ],
-                // }}
                 enableReinitialize={true}
                 onSubmit={submit}
             >
                 {formikProps => {
-                    console.log('formikProps from EvaluationForm', formikProps)
                     return (
                         <Form className="tw-flex tw-flex-col tw-gap-8">
                             <Field name="scoreCriteria">
@@ -93,10 +72,6 @@ const EvaluationForm = ({
                                                             { criteria, label },
                                                             index,
                                                         ) => {
-                                                            console.log(
-                                                                'Field value at evaluationForm',
-                                                                field.value,
-                                                            )
                                                             return (
                                                                 <RadioScore
                                                                     key={
@@ -126,10 +101,6 @@ const EvaluationForm = ({
                                                                         )
                                                                         const updatedField =
                                                                             field.value
-                                                                        console.log(
-                                                                            'From updated field at eval form',
-                                                                            updatedField,
-                                                                        )
                                                                         if (
                                                                             !updatedField[
                                                                                 index
@@ -230,6 +201,8 @@ const EvaluationForm = ({
                                             onBlur={() =>
                                                 form.setFieldTouched(field.name)
                                             }
+                                            minRows={2}
+                                            maxLength={500}
                                         />
                                     </FormControl>
                                 )}
diff --git a/frontend/src/pages/_projects/slug/view/projectId/index.js b/frontend/src/pages/_projects/slug/view/projectId/index.js
index c6060cba3..75ebee171 100644
--- a/frontend/src/pages/_projects/slug/view/projectId/index.js
+++ b/frontend/src/pages/_projects/slug/view/projectId/index.js
@@ -1,77 +1,22 @@
 import React, { useState, useEffect, useCallback } from 'react'
 import { goBack } from 'connected-react-router'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { useRouteMatch } from 'react-router'
 import PageWrapper from 'components/layouts/PageWrapper'
 import ProjectDetail from 'components/projects/ProjectDetail'
 import ShareProject from 'components/projects/ProjectDetail/ShareProject'
-import ScoreForm from './ScoreForm'
-import Container from 'components/generic/Container'
-import * as AuthSelectors from 'redux/auth/selectors'
-import * as UserSelectors from 'redux/user/selectors'
 import moment from 'moment-timezone'
 import { EventHelpers } from '@hackjunction/shared'
-
-import * as SnackbarActions from 'redux/snackbar/actions'
-
 import ProjectsService from 'services/projects'
-import ProjectScoresService from 'services/projectScores'
-import { set } from 'object-path'
-import EvaluationForm from './EvaluationForm'
 import _ from 'lodash'
 
 export default ({ event, showFullTeam }) => {
-    const scoreCriteriaBase = event.scoreCriteriaSettings?.scoreCriteria
     const dispatch = useDispatch()
-    const userId = useSelector(AuthSelectors.getUserId)
     const match = useRouteMatch()
-    const { projectId, token } = match.params
-    const { slug } = event
-    const [scoreExists, setScoreExists] = useState(false)
+    const { projectId } = match.params
     const [project, setProject] = useState()
     const [loading, setLoading] = useState(true)
     const [error, setError] = useState(false)
-    const [validToken, setValidToken] = useState(false)
-
-    useEffect(() => {
-        if (token && project && event) {
-            ProjectsService.validateToken(slug, token).then(v => {
-                if (v) setValidToken(v)
-            })
-        }
-    }, [event, project, slug, token])
-
-    const [projectScore, setProjectScore] = useState({
-        project: '',
-        event: '',
-        status: 'submitted',
-        score: 0,
-        maxScore: 10,
-        message: '',
-        scoreCriteria: [],
-        reviewers: [],
-    })
-
-    useEffect(() => {
-        if (token && project && event) {
-            ProjectScoresService.getScoreByEventSlugAndProjectIdAndPartnerToken(
-                token,
-                event.slug,
-                project._id,
-            ).then(score => {
-                console.log('Score', score)
-                if (score[0]) {
-                    setProjectScore(score[0])
-                    setScoreExists(true)
-                } else {
-                    setProjectScore({
-                        ...projectScore,
-                        scoreCriteria: scoreCriteriaBase,
-                    })
-                }
-            })
-        }
-    }, [event, token, project])
 
     const fetchProject = useCallback(async () => {
         setLoading(true)
@@ -79,7 +24,6 @@ export default ({ event, showFullTeam }) => {
             const project = await ProjectsService.getPublicProjectById(
                 projectId,
             )
-            console.log('Project details', project)
             setProject(project)
         } catch (err) {
             setError(true)
@@ -88,45 +32,6 @@ export default ({ event, showFullTeam }) => {
         }
     }, [projectId])
 
-    const handleSubmit = async (values, { setSubmitting, resetForm }) => {
-        values.project = project._id
-        values.event = event._id
-        console.log('values', values)
-        try {
-            if (userId) {
-                _.includes(values.reviewers, userId)
-                    ? console.log('User already in reviewers list')
-                    : values.reviewers.push(userId)
-            }
-            if (scoreExists) {
-                await ProjectScoresService.updateScoreByEventSlugAndPartnerToken(
-                    token,
-                    event.slug,
-                    values,
-                )
-                setProjectScore(values)
-            } else {
-                await ProjectScoresService.addScoreByEventSlugAndPartnerToken(
-                    token,
-                    event.slug,
-                    values,
-                )
-                setProjectScore(values)
-            }
-
-            dispatch(SnackbarActions.success(`Score saved.`))
-            resetForm()
-        } catch (e) {
-            dispatch(
-                SnackbarActions.error(
-                    `Score could not be saved. Error: ${e.message}`,
-                ),
-            )
-        } finally {
-            setSubmitting(false)
-        }
-    }
-
     const onBack = useCallback(() => {
         dispatch(goBack())
     }, [dispatch])
@@ -143,26 +48,7 @@ export default ({ event, showFullTeam }) => {
                 showFullTeam={showFullTeam}
                 showTableLocation={!EventHelpers.isEventOver(event, moment)}
             />
-            {validToken ? (
-                <Container>
-                    {scoreCriteriaBase && scoreCriteriaBase.length > 0 ? (
-                        <EvaluationForm
-                            event={event}
-                            project={project}
-                            submit={handleSubmit}
-                            score={projectScore}
-                            scoreCriteria={scoreCriteriaBase}
-                        />
-                    ) : (
-                        <ScoreForm
-                            event={event}
-                            project={project}
-                            submit={handleSubmit}
-                            score={projectScore}
-                        />
-                    )}
-                </Container>
-            ) : null}
+
             <ShareProject project={project} event={event} />
         </PageWrapper>
     )
diff --git a/frontend/src/redux/dashboard/actions.js b/frontend/src/redux/dashboard/actions.js
index 4fef90bf9..4e693d0d9 100644
--- a/frontend/src/redux/dashboard/actions.js
+++ b/frontend/src/redux/dashboard/actions.js
@@ -480,15 +480,11 @@ export const updateProjects = slug => async (dispatch, getState) => {
 export const createProject = (slug, data) => async (dispatch, getState) => {
     try {
         const idToken = AuthSelectors.getIdToken(getState())
-        const fileData = await fileAttachmentFinder(data, idToken)
+        // const fileData = await fileAttachmentFinder(data, idToken)
 
-        if (fileData) {
-            await ProjectsService.createProjectForEventAndTeam(
-                idToken,
-                slug,
-                fileData,
-            )
-        }
+        // if (fileData) {
+        // }
+        await ProjectsService.createProjectForEventAndTeam(idToken, slug, data)
         const projects = await ProjectsService.getProjectsForEventAndTeam(
             idToken,
             slug,
@@ -656,15 +652,11 @@ export const deleteFileForProject = fileId => async (dispatch, getState) => {
 export const editProject = (slug, data) => async (dispatch, getState) => {
     try {
         const idToken = AuthSelectors.getIdToken(getState())
-        const fileData = await fileAttachmentFinder(data, idToken)
+        // const fileData = await fileAttachmentFinder(data, idToken)
 
-        if (fileData) {
-            await ProjectsService.updateProjectForEventAndTeam(
-                idToken,
-                slug,
-                fileData,
-            )
-        }
+        // if (fileData) {
+        // }
+        await ProjectsService.updateProjectForEventAndTeam(idToken, slug, data)
         const projects = await ProjectsService.getProjectsForEventAndTeam(
             idToken,
             slug,
diff --git a/frontend/src/redux/dashboard/reducer.js b/frontend/src/redux/dashboard/reducer.js
index 4d8f0e4ff..6fe5db813 100644
--- a/frontend/src/redux/dashboard/reducer.js
+++ b/frontend/src/redux/dashboard/reducer.js
@@ -51,12 +51,12 @@ const initialState = {
         error: false,
         updated: 0,
     },
-    project_scores: {
-        data: [],
-        loading: true,
-        error: false,
-        updated: 0,
-    },
+    // project_scores: {
+    //     data: [],
+    //     loading: true,
+    //     error: false,
+    //     updated: 0,
+    // },
 }
 
 const updateEventHandler = buildHandler('event')
@@ -66,7 +66,7 @@ const eventRecruitersHandler = buildHandler('recruiters', 'userId')
 const updateTeamHandler = buildHandler('team')
 const updateProjectsHandler = buildHandler('projects', '_id')
 const updateAnnotatorHandler = buildHandler('annotator')
-const updateProjectScoresHandler = buildHandler('project_scores')
+// const updateProjectScoresHandler = buildHandler('project_scores')
 const updateTeamsHandler = buildHandler('teams')
 const updateSelectedTeamHandler = buildHandler('selected_team')
 // const updateSeletecUserHandler = buildHandler('selected_candidate')
@@ -95,9 +95,9 @@ export default function reducer(state = initialState, action) {
         case ActionTypes.UPDATE_ANNOTATOR: {
             return updateAnnotatorHandler(state, action)
         }
-        case ActionTypes.UPDATE_PROJECT_SCORES: {
-            return updateProjectScoresHandler(state, action)
-        }
+        // case ActionTypes.UPDATE_PROJECT_SCORES: {
+        //     // return updateProjectScoresHandler(state, action)
+        // }
         case ActionTypes.EDIT_REGISTRATION: {
             return editRegistration(state, action.payload)
         }
diff --git a/frontend/src/redux/dashboard/selectors.js b/frontend/src/redux/dashboard/selectors.js
index b79c6cb05..78bd16784 100644
--- a/frontend/src/redux/dashboard/selectors.js
+++ b/frontend/src/redux/dashboard/selectors.js
@@ -58,12 +58,12 @@ export const annotatorLoading = state => state.dashboard.annotator.loading
 export const annotatorError = state => state.dashboard.annotator.error
 export const annotatorUpdated = state => state.dashboard.annotator.updated
 
-export const projectScores = state => state.dashboard.project_scores.data
-export const projectScoresLoading = state =>
-    state.dashboard.project_scores.loading
-export const projectScoresError = state => state.dashboard.project_scores.error
-export const projectScoresUpdated = state =>
-    state.dashboard.project_scores.updated
+// export const projectScores = state => state.dashboard.project_scores.data
+// export const projectScoresLoading = state =>
+//     state.dashboard.project_scores.loading
+// export const projectScoresError = state => state.dashboard.project_scores.error
+// export const projectScoresUpdated = state =>
+//     state.dashboard.project_scores.updated
 
 export const annotatorVoteCount = createSelector(annotator, annotator => {
     if (!annotator) return 0
@@ -146,7 +146,7 @@ export const isTeamValid = createSelector(team, team => {
 export const lockedPages = createSelector(event, event => {
     return {
         submissions: !EventHelpers.isSubmissionsOpen(event, moment),
-        reviewing: EventHelpers.isVotingPast(event, moment),
+        reviewing: !EventHelpers.isReviewingOpen(event, moment),
         team: EventHelpers.isSubmissionsPast(event, moment),
         finalistVoting: !EventHelpers.isFinalistVotingOpen(event, moment),
     }
@@ -161,7 +161,8 @@ export const shownPages = createSelector(
         return {
             submissions: registration?.status === STATUSES.checkedIn.id,
             eventID:
-                event?.eventType === EventTypes.physical.id &&
+                (event?.eventType === EventTypes.physical.id ||
+                    event?.eventType === EventTypes.hybrid.id) &&
                 [
                     STATUSES.confirmed.id,
                     STATUSES.confirmedToHub.id,
@@ -177,12 +178,14 @@ export const shownPages = createSelector(
                 registration?.status === STATUSES.checkedIn.id &&
                 event?.overallReviewMethod !== 'noOverallWinner',
             hackerPack:
+                (event?.hackerpacksEnabled ?? false) &&
                 [
                     STATUSES.checkedIn.id,
                     STATUSES.confirmed.id,
                     STATUSES.confirmedToHub.id,
                 ].indexOf(registration?.status) !== -1,
             meetings: EventHelpers.areMeetingsEnabled(event),
+            challengesEnabled: event?.challengesEnabled,
             reviewingByScoreCriteria:
                 event?.reviewMethod === ReviewingMethods.manualReview.id,
             //Experimental
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 9979dc7c2..cb8465f48 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -18,14 +18,18 @@ import RequiresRole from 'hocs/RequiresRole'
 
 /** Lazy-load the access-restricted pages */
 const DashboardRouter = lazy(() => import('./pages/_dashboard'))
-const OrganiserRouter = lazy(() => import('./pages/_dashboard/renderDashboard/organiser/router'))
+const OrganiserRouter = lazy(() =>
+    import('./pages/_dashboard/renderDashboard/organiser/router'),
+)
 const AccountRouter = lazy(() => import('./pages/_account'))
 //TODO: switch the recruitment view and router
-const RecruitmentRouter = lazy(() => import('./pages/_dashboard/renderDashboard/partner/partnerrecruitment'))//import('./pages/_recruitment'))//
+const RecruitmentRouter = lazy(() =>
+    import('./pages/_dashboard/renderDashboard/partner/partnerrecruitment'),
+) //import('./pages/_recruitment'))//
 const ProjectsRouter = lazy(() => import('./pages/_projects'))
 const AdminRouter = lazy(() => import('./pages/_admin'))
 const SandboxRouter = lazy(() => import('./pages/_sandbox'))
-const FilesRouter = lazy(() => import('./pages/_sandbox/files'))
+// const FilesRouter = lazy(() => import('./pages/_sandbox/files'))
 
 const routes = [
     {
@@ -76,7 +80,8 @@ const routes = [
         ]),*/
         exact: false,
     },
-    {//default after login
+    {
+        //default after login
         path: '/dashboard',
         component: RequiresPermission(DashboardRouter),
         exact: false,
diff --git a/frontend/src/services/projects.js b/frontend/src/services/projects.js
index 4ca7541be..552061bc2 100644
--- a/frontend/src/services/projects.js
+++ b/frontend/src/services/projects.js
@@ -13,6 +13,10 @@ ProjectsService.getProjectsByEvent = eventSlug => {
     return _axios.get(`/projects/${eventSlug}`)
 }
 
+ProjectsService.getProjectsByEventAsPartner = (idToken, eventSlug) => {
+    return _axios.get(`/projects/${eventSlug}/partner-review`, config(idToken))
+}
+
 ProjectsService.getPublicProjectById = projectId => {
     return _axios.get(`/projects/id/${projectId}`)
 }
diff --git a/frontend/src/services/registrations.js b/frontend/src/services/registrations.js
index fc612675d..36f0f019a 100644
--- a/frontend/src/services/registrations.js
+++ b/frontend/src/services/registrations.js
@@ -215,11 +215,12 @@ RegistrationsService.adminNotifyAcceptedTravelGrants = (idToken, slug) => {
     )
 }
 
-RegistrationsService.addPartnerToRegistrated = (idToken,
-    user,
-    slug,
-    data) => {
+RegistrationsService.addPartnerToRegistrated = (idToken, user, slug, data) => {
     return _axios.post(`${BASE_ROUTE}/${slug}/partner`, user, config(idToken))
 }
 
+RegistrationsService.addGavelLoginToRegistrations = (idToken, slug, data) => {
+    return _axios.post(`${BASE_ROUTE}/${slug}/gavel`, data, config(idToken))
+}
+
 export default RegistrationsService
diff --git a/frontend/src/utils/dataModifiers.js b/frontend/src/utils/dataModifiers.js
index bb7fa0713..da7eee689 100644
--- a/frontend/src/utils/dataModifiers.js
+++ b/frontend/src/utils/dataModifiers.js
@@ -18,3 +18,13 @@ export const removeNumbers = (str, replace = '') => {
 export const generateSlug = (str, replaceNumValue = '') => {
     return getSlug(removeNumbers(str, replaceNumValue))
 }
+
+export const projectURLgenerator = (eventSlug, projectId) => {
+    //Utility to generate public project URL, with the shape /projects/:eventSlug/view/:projectId
+    const originURL = window.location.origin
+    let projectURL
+    if (!!projectId && !!eventSlug && !!originURL) {
+        projectURL = `${originURL}/projects/${eventSlug}/view/${projectId}`
+    }
+    return projectURL
+}
diff --git a/shared/constants/event-types.js b/shared/constants/event-types.js
index 5959aeefc..c00aa9d0e 100644
--- a/shared/constants/event-types.js
+++ b/shared/constants/event-types.js
@@ -7,6 +7,10 @@ const EventTypes = {
         id: 'online',
         label: 'Online event',
     },
+    hybrid: {
+        id: 'hybrid',
+        label: 'Hybrid event',
+    },
 }
 
 module.exports = EventTypes
diff --git a/shared/constants/project-schema.js b/shared/constants/project-schema.js
index 70466d731..755e3a7cd 100644
--- a/shared/constants/project-schema.js
+++ b/shared/constants/project-schema.js
@@ -35,6 +35,7 @@ const ProjectSchema = {
         yup
             .object()
             .shape({
+                label: yup.string(),
                 section: yup.string(),
                 key: yup.string(),
                 value: yup.string(),
@@ -96,7 +97,10 @@ const buildProjectSchema = event => {
         )
     }
 
-    if (event.eventType === EventTypes.physical.id) {
+    if (
+        event.eventType === EventTypes.physical.id ||
+        event.eventType === EventTypes.hybrid.id
+    ) {
         schema.location = yup.string().max(100).label('Table location')
     }
 
diff --git a/shared/constants/registration-fields-custom.js b/shared/constants/registration-fields-custom.js
index 31b49b10c..5df7b3c34 100644
--- a/shared/constants/registration-fields-custom.js
+++ b/shared/constants/registration-fields-custom.js
@@ -23,6 +23,17 @@ const RegistrationFieldsCustom = {
             return required ? base.required() : base
         },
     },
+    link: {
+        id: 'link',
+        validationSchema: (required, question) => {
+            const base = yup
+                .string()
+                .min(required ? 1 : 0)
+                .max(300)
+                .label(question.label)
+            return required ? base.required() : base
+        },
+    },
     boolean: {
         id: 'boolean',
         validationSchema: (required, question) => {
diff --git a/shared/helpers/events.js b/shared/helpers/events.js
index e30fea153..855e6345b 100644
--- a/shared/helpers/events.js
+++ b/shared/helpers/events.js
@@ -52,7 +52,7 @@ const EventHelpers = {
         if (!event) return false
         return !nowIsBefore(event.submissionsEndTime, moment)
     },
-    isVotingOpen: (event, moment) => {
+    isReviewingOpen: (event, moment) => {
         if (!event) return false
         return nowIsBetween(
             event.reviewingStartTime,
@@ -67,7 +67,7 @@ const EventHelpers = {
             event.finalsActive
         )
     },
-    isVotingPast: (event, moment) => {
+    isReviewingPast: (event, moment) => {
         if (!event) return true
         return !nowIsBefore(event.reviewingEndTime, moment)
     },
@@ -112,6 +112,10 @@ const EventHelpers = {
         if (!event) return true
         return event.meetingsEnabled
     },
+    areChallengesEnabled: event => {
+        if (!event) return false
+        return event.challengesEnabled
+    },
 }
 
 module.exports = EventHelpers
diff --git a/shared/schemas/Challenge.js b/shared/schemas/Challenge.js
index ab17e3311..ee6bdd2e2 100644
--- a/shared/schemas/Challenge.js
+++ b/shared/schemas/Challenge.js
@@ -11,7 +11,7 @@ const ChallengeSchema = new mongoose.Schema({
     name: {
         type: String,
         required: true,
-        length: 100,
+        length: 50,
     },
     partner: {
         type: String,
diff --git a/shared/schemas/CustomAnswer.js b/shared/schemas/CustomAnswer.js
index 6ad309f95..7fac85246 100644
--- a/shared/schemas/CustomAnswer.js
+++ b/shared/schemas/CustomAnswer.js
@@ -2,6 +2,9 @@ const mongoose = require('mongoose')
 const { GraphQLObjectType, GraphQLString } = require('graphql')
 
 const mongooseSchema = new mongoose.Schema({
+    label: {
+        type: String,
+    },
     section: {
         type: String,
     },
@@ -16,6 +19,9 @@ const mongooseSchema = new mongoose.Schema({
 const graphqlSchema = new GraphQLObjectType({
     name: 'CustomAnswer',
     fields: () => ({
+        label: {
+            type: GraphQLString,
+        },
         section: {
             type: GraphQLString,
         },