cfd0950 layout changes