Added accessibility upgrades to switch cell