Accessibility changes for BH ticket 304