FLUID-5289: Fixes to text, styling