Modifications to templates and files

Top