Fixed some minor bug for green color and others fix