Revert "Changing roles to be more compatible with screen readers"

This reverts commit 7751cdf65c5fc87154bb6364a7bbe7a2ccfad64c.
Revert "Revert "Changing roles to be more compatible with screen readers""

This reverts commit 027f4a269e20b6419736b5d7a2aeb9de2945ac5e.