Better breadcrumbs Closes #2882