Fix some graphic bugs