Fix bug using next/previous stop buttons and reformat header