changed colors and colunm order
Merge branch 'joe'