Layout: second pass