Add view of stops with data, some cleanup