Adjust #breadcrumbs structure.

Also fix minor issue with #layout.