Fixed Some Visual Glitches