Add slug to proposal url tags
Merge template changes