#8 Add links to locations