Added ugly stopID to list, plus shuffled UI around