Refactored templates to use url name instead of hard coded paths