fixing url bug, updating similar links to use url template tag