Correct Device UI issue