add cons
changed css
merge conflicts