Rework breadcrumbs, various other tweaks