use better styling
Merge branch 'develop'