clean up css file
Merge branch 'sb-16c'
Merge Styling