Critical Flipswitch fix! and began moving Advanced Options into their System Icon tabs