Fix UI switches