Add links, fix location