Added Breadcrumbs and minor bug fixes