CSS fine-tuning and name parsing update for related entities.
Merge branch 'master' into development