rework layout