CAPX-28 | Page rendering fixes