layout rework