Add links and update location