Adding new template files and lots of changes