Made changes to menu switcher