CSS fine-tuning.
Merge branch 'master' into development