css class changes to be less intrusive in other systems
Merge branch '1.x'