Encapsulate the span into a link so it is clickable

The old method seemed to add an href to the span tag. I encapsulated the whole span in an a tag so it was all clickable, and should work with images as well.