style and wording tweaks
Merge branch 'refs/heads/layout'
art: tiles with extras
Merge branch 'refs/heads/art'