FLUID-5261: More styling, some text changes