fixed some styling problems
Merge branch 'dev'