Improved option menu and accessibility fixes