Template changes to work with validator according to current link validation rules. Also update HTML output.