style tweak
text tweaks
Merge branch 'master' into user-accounts