styling updates
Merge branch 'styling-fix'