565: Merge pull request #334 from aaronbrethorst/develop-/slightly-unbork-header-layout

Kinda sorta fix the header layout on the stop view controller.