more restyling
Merge branch 'develop'