Added boxes, links and words