more fixes to improve the accessibility