FLUID-5540: Improvement to some pages