Added templates and layouts to the tool