Add badges and labels