Fixed some display glitches