Factor out a bus data source for collections.
Get rid of storyboard.
Directly observe buses on bus service.
Map should be driven by a data source.
Code style and import cleanup.