Tweak breadcrumbs a bit, still not perfect in Nightly