more changes in layout and color changed