This PR addresses https://github.com/a11yproject/a11yproject.com/issues/778 and https://github.com/a11yproject/a11yproject.com/issues/780.