more layout work on current class page