style fixes
Merge branch 'newStyles'