CSS fixes: improved compatibility with previous CDF versions
Merge branch 'master' into release