[#29891] Begin using reusable layouts