More portal template work
Add some linking facilities