FLUID-5261: More styling