Fixed broken links and removed need to pass URL to template