Reworked enrolment view