ENHANCEMENT: Hardcoded Links moved to templates.

Rebase and fix for #14 - require some assistance on the failing functional test. Perhaps this test it is no longer relevant?