SWC-778: use a span instead of an anchor, and style the span
Merge pull request #504 from jay-hodgson/release-8

SWC-778: use a span instead of an anchor, and style the span