[#65314468] layout changes