Performance and accessibility improvements