added colors, improved labels