CSS changes
fixed conflicts