change to style
Merge branch 'feature/newcss'