ESSENTIALS-377: additional HTML changes to adopt new styling.