layout changes

[#67501316] WIP