Added templates and partials