Rework layout