FLUID-5451 - Implementing new site design