Fix user interface glitches