updated templates and partials