refactored hardcoded urls out of templates