CAPX-6 | Fixes to page layouts so they all use the render array