improve colors and spacing