Make check box list abstract

Now shows the correct classes in the class selection dialog for each subject
Tidy up a little