Minor clean-up and fixes breadcrumb link