More minor additions
- Changes breadcrumb
- Cleanup for map