Removed hardcoded urls from templates