Added a few changes in the templates