[#64388118] Layout refinements