Continuing merge from master
Break out breadcrumbs and linear navigation