fixed some styling
Merge branch 'styling-3'