Fixed some visual glitches