Improve badge, label, glyph helper