Link all button tested
Merge conflict fixed
Merge branch 'add_links'