[#60527756] layout fixes