rework build layout