Made some stylistic changes to templates, DRYing it up sometime this week