Added spans for content