Get rid of preventShow
Accessibility improvements
Small fixes