style and wording tweaks
Merge branch 'refs/heads/layout'