Added second stops menu, adjusted layout.