improve colors, organization