UI fixes, master switch (part of 2.10)