[#64183470] copy and layout changes