Fixing dispaly glitches