Rearrange to add breadcrumbs