removed Shuttle and SI subways; readjust UI