Merge "Fixing several issues with accessibility" into nyc-dev