Updates to link output to put count text in a span outside of the anchor...

... tag. Request for change from Mo for theme changes.