Put kicker text inside link if the kicker is not a link

Also refactors out some duplication