lots of layout changes, not sure abt new color scheme