Refactor styles
Merge branch 'develop'