refactored templates to use url template tags