Refactored hard coded urls in templates