Manual merge simpler breadcrumbs/navbar ds125v