Fixed breadcrumbs and code cleanup.