More class support

The class can now be collapsed.  Tweaked the CSS.