Improved reliability of UI basic/advanced toggling