Refactored to use proper MVC. Ish. Next bus is now in the list of buses, as yet not highlighted.