Made a few changes on the templates