change links to link & remove underscore dependency