Changed the urls in the templates to use the url tag