[#56227988] layout changes