Initial work towards fixing the stop name editing view