Removed hardcoded URL structure in templates