Changed Color and minor fixes