Add breadcrumbs, more refactoring