New draft for colors, removed buttons from header