updated labels, badges to use button colors