layout rework 2