Style tweaks
Merge branch 'styles' into staging