Accessibility changes for BH ticket 251