change layout, use spans