Layout
Fix enrolment counts