change color and some logic

change color and some logic