Added column 'Total subjects'

Removed '16-18 students' and 'APS per student'. Both are less relevant
than the current columns.