Layout rework