breadcrumb rework part 2 of 2