Some new changes made to the templates
Cleaning it up