Updated controller and added breadcrumbs