More css changes
Merge - favoured copy from upstream