WIP for bus stop schedule
fixed storyboard merge conflicts