Update with new templates

Includes breadcrumbs