fix styles ordering
Merge branch 'dev'