general styling part 3.0
Merge branch 'styling' into develop