Add some extra links
Remove reference to module within module