Extended layout changes.  Fixed a bug related to CSS class name change