Merge "Improve color picker layout / cleaned up some of the code" into p9.0