Reordered layout of class list