MDL-39814 tweaking styles and last minute tidy up