more work on segregating CSS