Add breadcrumbs and handling of display names