Changed colors and borders

Messing around with colors and borders