Fix UI issues