Add links to various places, remove empty links