Fix colors, small border issues