New style css
Solved merge issues
Merge branch 'css'

Merged with css