Fixed several graphic bugs, more to be fixed!