New color scheme, layout change, data clean