Adding templates and layouts