"Switch" menu title now inclues the current setting without having to open the menu to see, eg "Switch (CS)", "Switch (C)", "Switch (S)"