Fixed accessibility issues
Improved performance