correct some visual effect.
Still some problem remains