Linted.
Formatting tidyup.
Bring HTML in line with what's in prod.
Merge branch 'v3.1.1-branch'