Fix forms and breadcrumbs