collapsed labels

-Removed some hard coding of IDs that I think was problematic.