@nschonni: I'm not going to fix any accessibility stuff in this PR. You are welcome to fix those issues yourself after this PR is merged.