Changed layout colors
Modified css changes
Merge branch 'sonya'
details review
Fixed conflicts