A little refactoring & bugfixes.
Breadcrumb path fix & minor style changes.