DRY'd up some templates
Brought back tag support