FLUID-5289: Move consistent text into component defaults, clean up other small things.