Added formatting, breadcrumbs and polishing