switched a few tabs to new combined device list