Removed hardcoded URLS in templates