Changed colors and minor bug fix