Minor styling fixes
Merge branch 'origin/master'