Breadcrumbs improvements
Mostly syntax improvements