Minor formatting and adding breadcrumbs back in.

Closes #137.