Add Aesthetic refinements
These aesthetic refinements are in lined with deliverables from ticket: [ CE-1970](https://jira.esss.lu.se/browse/CE-1970)