Worked on the templates some more