Change green to orange, rearrange where columns