refactored hard-coded URLs out of templates