Made a few changes to some templates