UI fixes for addAsm switches, etc