[#56227442] few layout changes