Some tweaks to renderling links